お知らせ通知用のジョブに例外処理を追加

app/jobs/post_announcement_job.rb

@@ -5,7 +5,31 @@ class PostAnnouncementJob < ApplicationJob
 
   def perform(announcement, receivers)
     receivers.each do |receiver|
-      ActivityDelivery.with(announcement:, receiver:).notify!(:post_announcement)
+      send_mail_notification(announcement, receiver)
+      send_on_site_notification(announcement, receiver)
     end
   end
+
+  private
+
+  def send_mail_notification(announcement, receiver)
+    ActivityMailer.post_announcement(announcement:, receiver:).deliver_now
+  rescue Postmark::InactiveRecipientError => e
+    Rails.logger.warn "[Postmark] 受信者由来のエラーのためメールを送信できませんでした。：#{e.message}"
+  rescue StandardError => e
+    Rails.logger.warn(e)
+  end
+
+  def send_on_site_notification(announcement, receiver)
+    Notification.create!(
+      kind: Notification.kinds[:announced],
+      user: receiver,
+      sender: announcement.sender,
+      link: Rails.application.routes.url_helpers.polymorphic_path(announcement),
+      message: "お知らせ「#{announcement.title}」",
+      read: false
+    )
+  rescue StandardError => e
+    Rails.logger.warn(e)
+  end
 end

app/notifiers/activity_notifier.rb

@@ -126,21 +126,6 @@ def first_report(params = {})
     )
   end
 
-  def post_announcement(params = {})
-    params.merge!(@params)
-    announce = params[:announcement]
-    receiver = params[:receiver]
-
-    notification(
-      body: "お知らせ「#{announce.title}」",
-      kind: :announced,
-      sender: announce.user,
-      receiver:,
-      link: Rails.application.routes.url_helpers.polymorphic_path(announce),
-      read: false
-    )
-  end
-
   def retired(params = {})
     params.merge!(@params)
     sender = params[:sender]

test/jobs/post_announcement_job_test.rb

@@ -5,14 +5,13 @@
 class PostAnnouncementJobTest < ActiveJob::TestCase
   teardown do
     ActionMailer::Base.deliveries.clear
-    AbstractNotifier::Testing::Driver.deliveries.clear
   end
 
   test '#perform' do
     announcement = announcements(:announcement1)
     receivers = [users(:machida), users(:adminonly), users(:sotugyou_with_job)]
 
-    assert_difference [-> { ActionMailer::Base.deliveries.count }, -> { AbstractNotifier::Testing::Driver.deliveries.count }], 3 do
+    assert_difference [-> { ActionMailer::Base.deliveries.count }, -> { Notification.count }], 3 do
       perform_enqueued_jobs do
         PostAnnouncementJob.perform_later(announcement, receivers)
       end

test/notifiers/activity_notifier_test.rb

@@ -62,18 +62,6 @@ class ActivityNotifierTest < ActiveSupport::TestCase
     end
   end
 
-  test '#announcement' do
-    notification = ActivityNotifier.with(announcement: announcements(:announcement1), receiver: users(:kimura)).post_announcement
-
-    assert_difference -> { AbstractNotifier::Testing::Driver.deliveries.count }, 1 do
-      notification.notify_now
-    end
-
-    assert_difference -> { AbstractNotifier::Testing::Driver.enqueued_deliveries.count }, 1 do
-      notification.notify_later
-    end
-  end
-
   test '#hibernated' do
     notification = ActivityNotifier.with(sender: users(:kimura), receiver: users(:komagata)).hibernated