Merge pull request #1587 from alphagov/update-draft-deleted-assets

Allow updates to draft deleted assets

app/controllers/assets_controller.rb

@@ -2,7 +2,7 @@ class AssetsController < BaseAssetsController
   before_action :restrict_request_format
 
   def update
-    @asset = find_asset
+    @asset = Asset.undeleted.or(Asset.where(draft: true)).find(params[:id])
 
     if @asset.update(asset_params)
       render json: AssetPresenter.new(@asset, view_context).as_json(status: :success)

spec/controllers/assets_controller_spec.rb

@@ -392,6 +392,22 @@
 
           expect(body["draft"]).to be_truthy
         end
+
+        it "changes draft state for draft deleted asset" do
+          asset.update!(deleted_at: 1.hour.ago, draft: true)
+
+          put :update, params: { id: asset.id, asset: attributes.merge(draft: false) }
+
+          expect(asset.reload).not_to be_draft
+        end
+
+        it "preserves draft state for live deleted asset" do
+          asset.update!(deleted_at: 1.hour.ago, draft: false)
+
+          put :update, params: { id: asset.id, asset: attributes.merge(draft: true) }
+
+          expect(asset.reload).not_to be_draft
+        end
       end
     end
   end