Merge pull request #482 from godunno/bugfix/reload-after-delete-media

Re-fetch medias after deleting one

app/assets/javascripts/angular/apps/teachers/controllers/MediasIndexCtrl.js.coffee

@@ -18,7 +18,9 @@ MediasIndexCtrl = ($scope, Media, Utils, MediaSearcher)->
   $scope.removeMedia = (media)->
     if confirm("Deseja remover este anexo? Ele também será removida dos diários. Esta operação não poderá ser desfeita.")
       media.remove().then ->
-        Utils.remove($scope.medias, media)
+        last = $scope.medias.length == 1
+        page = if last then $scope.previous_page else $scope.current_page
+        $scope.fetch(page: page)
 
 MediasIndexCtrl.$inject = ['$scope', 'Media', 'Utils', 'MediaSearcher']
 DunnoApp.controller 'MediasIndexCtrl', MediasIndexCtrl

app/behaviors/has_file.rb

@@ -3,7 +3,8 @@ module HasFile
   extend ActiveSupport::Concern
 
   included do
-    before_destroy :delete_file
+    after_commit :delete_file, on: [:destroy], if: :file?
+
     def file
       AwsFile.new(file_url) if file?
     end
@@ -20,6 +21,6 @@ def file?
   private
 
   def delete_file
-    file.try(:delete)
+    DeleteAwsFileWorker.perform_async(:delete, file_url)
   end
 end

app/controllers/api/v1/teacher/medias_controller.rb

@@ -2,7 +2,7 @@ class Api::V1::Teacher::MediasController < Api::V1::TeacherApplicationController
   respond_to :json
 
   def index
-    @result = Media.search(params.merge(
+    @result = Media.search(media_search_params.merge(
       filter: {
         teacher_id: current_teacher.id
       }
@@ -58,6 +58,10 @@ def media_params
     params.require(:media).permit(:title, :tag_list, tag_list: [])
   end
 
+  def media_search_params
+    params.permit(:page, :q)
+  end
+
   def media_create_params
     params.require(:media).permit(:url, :file_url, :original_filename)
   end

app/workers/delete_aws_file_worker.rb

@@ -0,0 +1,9 @@
+class DeleteAwsFileWorker
+  include Sidekiq::Worker
+  sidekiq_options queue: 's3'
+
+  def perform(file_url)
+    logger.debug ["deleting aws file", "File URL: #{file_url}"]
+    AwsFile.new(file_url).delete
+  end
+end

config/sidekiq.yml

@@ -2,3 +2,4 @@
 :queues:
   - default
   - elasticsearch
+  - s3