Remove Notifications::RemoveAllByActionJob and Handle inline (#5690)

forem · Jan 28, 2020 · ca0770d · ca0770d
1 parent 3b3d2be
commit ca0770d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 37 deletions.
diff --git a/app/jobs/notifications/remove_all_by_action_job.rb b/app/jobs/notifications/remove_all_by_action_job.rb
diff --git a/app/models/notification.rb b/app/models/notification.rb
@@ -93,16 +93,10 @@ def send_milestone_notification(type:, article_id:)
       Notifications::MilestoneWorker.perform_async(type, article_id)
     end
 
-    def remove_all_by_action(notifiable_ids:, notifiable_type:, action: nil)
-      return unless %w[Article Comment Mention].include?(notifiable_type) && notifiable_ids.present?
-
-      Notifications::RemoveAllByActionJob.perform_later(notifiable_ids, notifiable_type, action)
-    end
-
     def remove_all_by_action_without_delay(notifiable_ids:, notifiable_type:, action: nil)
       return unless %w[Article Comment Mention].include?(notifiable_type) && notifiable_ids.present?
 
-      Notifications::RemoveAllByActionJob.perform_now(notifiable_ids, notifiable_type, action)
+      Notifications::RemoveAllByAction.call(Array.wrap(notifiable_ids), notifiable_type, action)
     end
 
     def remove_all(notifiable_ids:, notifiable_type:)

diff --git a/spec/jobs/notifications/remove_all_by_action_job_spec.rb b/spec/jobs/notifications/remove_all_by_action_job_spec.rb