Add queue configuration for notifications in various notifiers

Author: rsmithlal

app/notifiers/better_together/event_invitation_notifier.rb

@@ -2,32 +2,37 @@
 
 module BetterTogether
   class EventInvitationNotifier < ApplicationNotifier # rubocop:todo Style/Documentation
-    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message
-    deliver_by :email, mailer: 'BetterTogether::EventInvitationsMailer', method: :invite, params: :email_params
+    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message,
+                              queue: :notifications
+    deliver_by :email, mailer: 'BetterTogether::EventInvitationsMailer', method: :invite, params: :email_params,
+                       queue: :mailers
 
-    param :invitation
+    required_param :invitation
 
-    notification_methods do
-      def invitation = params[:invitation]
-      def event = invitation.invitable
+    def event
+      params[:invitation].invitable
     end
 
     def title
-      I18n.t('better_together.notifications.event_invitation.title',
-             event_name: event&.name, default: 'You have been invited to an event')
+      I18n.with_locale(params[:invitation].locale) do
+        I18n.t('better_together.notifications.event_invitation.title',
+               event_name: event&.name, default: 'You have been invited to an event')
+      end
     end
 
     def body
-      I18n.t('better_together.notifications.event_invitation.body',
-             event_name: event&.name, default: 'Invitation to %<event_name>s')
+      I18n.with_locale(params[:invitation].locale) do
+        I18n.t('better_together.notifications.event_invitation.body',
+               event_name: event&.name, default: 'Invitation to %<event_name>s')
+      end
     end
 
     def build_message(_notification)
-      { title:, body:, url: invitation.url_for_review }
+      { title:, body:, url: params[:invitation].url_for_review }
     end
 
     def email_params(_notification)
-      { invitation: }
+      params[:invitation]
     end
   end
 end

app/notifiers/better_together/event_reminder_notifier.rb

@@ -3,10 +3,12 @@
 module BetterTogether
   # Notifies attendees when an event is approaching
   class EventReminderNotifier < ApplicationNotifier
-    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message do |config|
+    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message,
+                              queue: :notifications do |config|
       config.if = -> { should_notify? }
     end
-    deliver_by :email, mailer: 'BetterTogether::EventMailer', method: :event_reminder, params: :email_params do |config|
+    deliver_by :email, mailer: 'BetterTogether::EventMailer', method: :event_reminder, params: :email_params,
+                       queue: :mailers do |config|
       config.wait = 15.minutes
       config.if = -> { send_email_notification? }
     end

app/notifiers/better_together/event_update_notifier.rb

@@ -3,10 +3,12 @@
 module BetterTogether
   # Notifies attendees when an event is updated
   class EventUpdateNotifier < ApplicationNotifier
-    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message do |config|
+    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message,
+                              queue: :notifications do |config|
       config.if = -> { should_notify? }
     end
-    deliver_by :email, mailer: 'BetterTogether::EventMailer', method: :event_update, params: :email_params do |config|
+    deliver_by :email, mailer: 'BetterTogether::EventMailer', method: :event_update, params: :email_params,
+                       queue: :mailers do |config|
       config.if = -> { recipient_has_email? && should_notify? }
     end
 

app/notifiers/better_together/joatu/agreement_notifier.rb

@@ -4,11 +4,12 @@ module BetterTogether
   module Joatu
     # Sends notifications when a new agreement is created
     class AgreementNotifier < ApplicationNotifier
-      deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message
+      deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message,
+                                queue: :notifications
       deliver_by :email,
                  mailer: 'BetterTogether::JoatuMailer',
                  method: :agreement_created,
-                 params: :email_params do |config|
+                 params: :email_params, queue: :mailers do |config|
         config.if = -> { recipient.email.present? && recipient.notification_preferences['notify_by_email'] }
       end
 

app/notifiers/better_together/joatu/agreement_status_notifier.rb

@@ -4,10 +4,11 @@ module BetterTogether
   module Joatu
     # Notifies offer and request creators when an agreement status changes
     class AgreementStatusNotifier < ApplicationNotifier
-      deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message
+      deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message,
+                                queue: :notifications
 
       deliver_by :email, mailer: 'BetterTogether::JoatuMailer', method: :agreement_status_changed,
-                         params: :email_params do |config|
+                         params: :email_params, queue: :mailers do |config|
         config.if = -> { send_email_notification? }
       end
 

app/notifiers/better_together/joatu/match_notifier.rb

@@ -4,10 +4,12 @@ module BetterTogether
   module Joatu
     # Notifies creators when a new offer or request matches
     class MatchNotifier < ApplicationNotifier
-      deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message do |config|
+      deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message,
+                                queue: :notifications do |config|
         config.if = -> { should_notify? }
       end
-      deliver_by :email, mailer: 'BetterTogether::JoatuMailer', method: :new_match, params: :email_params do |config|
+      deliver_by :email, mailer: 'BetterTogether::JoatuMailer', method: :new_match, params: :email_params,
+                         queue: :mailers do |config|
         config.if = -> { recipient_has_email? && should_notify? }
       end
 

app/notifiers/better_together/new_message_notifier.rb

@@ -3,10 +3,11 @@
 module BetterTogether
   # Uses Noticed gem to create and dispatch notifications for new messages
   class NewMessageNotifier < ApplicationNotifier
-    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message
+    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message,
+                              queue: :notifications
     # deliver_by :action_cable, channel: 'BetterTogether::MessagesChannel', message: :build_message
     deliver_by :email, mailer: 'BetterTogether::ConversationMailer', method: :new_message_notification,
-                       params: :email_params do |config|
+                       params: :email_params, queue: :mailers do |config|
       config.wait = 15.minutes
       config.if = -> { send_email_notification? }
     end

app/notifiers/better_together/page_authorship_notifier.rb

@@ -3,12 +3,13 @@
 module BetterTogether
   # Notifies a person when added to or removed from a Page as an author
   class PageAuthorshipNotifier < ApplicationNotifier
-    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message
+    deliver_by :action_cable, channel: 'BetterTogether::NotificationsChannel', message: :build_message,
+                              queue: :notifications
 
     deliver_by :email,
                mailer: 'BetterTogether::AuthorshipMailer',
                method: :authorship_changed_notification,
-               params: :email_params do |config|
+               params: :email_params, queue: :mailers do |config|
       config.wait = 15.minutes
       config.if = -> { send_email_notification? }
     end