Merge pull request #63 from MozillaSocial/fixDelete

Delete attachment async when the admin status API is triggered

app/controllers/api/v1/admin/statuses_controller.rb

@@ -28,7 +28,7 @@ def destroy
       if @status.with_media?
         # Immediately remove public copy of media instead of waiting for
         # the vacuum_orphaned_records job to take care of it later on
-        Admin::MediaAttachmentDeletionWorker.perform_inline(@status.media_attachments)
+        Admin::MediaAttachmentDeletionWorker.perform_async(@status.media_attachments.map(&:id))
       end
     end
 

app/workers/admin/media_attachment_deletion_worker.rb

@@ -5,7 +5,8 @@ class Admin::MediaAttachmentDeletionWorker
 
   sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.week.to_i
 
-  def perform(media_attachments)
+  def perform(media_attachment_ids)
+    media_attachments = MediaAttachment.where(id: media_attachment_ids)
     AttachmentBatch.new(MediaAttachment, media_attachments).clear
   end
 end

spec/workers/admin/media_attachment_deletion_worker_spec.rb

@@ -12,12 +12,12 @@
     let!(:local_media) { Fabricate(:media_attachment, status: local_status) }
 
     it 'deletes remote media attachments' do
-      subject.perform([remote_media])
+      subject.perform([remote_media.id])
       expect(remote_media.reload.file).to be_blank
     end
 
     it 'deletes local media attachments' do
-      subject.perform([local_media])
+      subject.perform([local_media.id])
       expect(local_media.reload.file).to be_blank
     end
   end