Merge pull request #2137 from DFE-Digital/purge-later

DFE-Digital · Apr 10, 2024 · 3b79aeb · 3b79aeb
2 parents c1280cc + 001172b
commit 3b79aeb
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 60 deletions.
diff --git a/app/jobs/remove_malware_blob_job.rb b/app/jobs/remove_malware_blob_job.rb
diff --git a/app/services/fetch_malware_scan_result.rb b/app/services/fetch_malware_scan_result.rb
@@ -26,9 +26,7 @@ def call
         upload.update!(
           malware_scan_result: malware_scan_result_from_response(response),
         )
-        if upload.scan_result_suspect?
-          RemoveMalwareBlobJob.perform_later(upload_id: upload.id)
-        end
+        upload.attachment.purge_later if upload.scan_result_suspect?
       end
     else
       upload.update!(malware_scan_result: "error")

diff --git a/app/services/remove_malware_blob.rb b/app/services/remove_malware_blob.rb
diff --git a/spec/services/fetch_malware_scan_result_spec.rb b/spec/services/fetch_malware_scan_result_spec.rb
@@ -56,9 +56,7 @@
       end
 
       it "enqueues a job to remove the file" do
-        expect(RemoveMalwareBlobJob).to receive(:perform_later).with(
-          upload_id: upload.id,
-        )
+        expect(ActiveStorage::PurgeJob).to receive(:perform_later)
         fetch_malware_scan_result
       end
     end

diff --git a/spec/services/remove_malware_blob_spec.rb b/spec/services/remove_malware_blob_spec.rb