Merge pull request #15378 from danidoni/implement-notifications-for-r…

…eported-request-events Implement notifications for reported request events
openSUSE · Dec 19, 2023 · 524d1a2 · 524d1a2
2 parents 23d8831 + 1a68fd0
commit 524d1a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/api/app/components/notification_action_description_component.rb b/src/api/app/components/notification_action_description_component.rb
@@ -47,6 +47,8 @@ def description_text
     # TODO: Remove `Event::CreateReport` after all existing records are migrated to the new STI classes
     when 'Event::CreateReport', 'Event::ReportForProject', 'Event::ReportForPackage', 'Event::ReportForUser'
       "'#{@notification.notifiable.user.login}' created a report for a #{@notification.event_payload['reportable_type'].downcase}. This is the reason:"
+    when 'Event::ReportForRequest'
+      "'#{@notification.notifiable.user.login}' created a report for a request. This is the reason:"
     when 'Event::ReportForComment'
       "'#{@notification.notifiable.user.login}' created a report for a comment from #{@notification.event_payload['commenter']}. This is the reason:"
     when 'Event::ClearedDecision'

diff --git a/src/api/app/components/notification_notifiable_link_component.rb b/src/api/app/components/notification_notifiable_link_component.rb
@@ -57,6 +57,8 @@ def notifiable_link_text
       end
     when 'Event::ReportForProject', 'Event::ReportForPackage'
       @notification.event_type.constantize.notification_link_text(@notification.event_payload)
+    when 'Event::ReportForRequest'
+      "Report for Request ##{@notification.notifiable.reportable.number}"
     when 'Event::ClearedDecision'
       # All reports should point to the same reportable. We will take care of that here:
       # https://trello.com/c/xrjOZGa7/45-ensure-all-reports-of-a-decision-point-to-the-same-reportable
@@ -122,6 +124,9 @@ def notifiable_link_path
       @notification.event_type.constantize.notification_link_path(@notification)
     when 'Event::ReportForUser'
       Rails.application.routes.url_helpers.user_path(@notification.event_payload['user_login'])
+    when 'Event::ReportForRequest'
+      bs_request = @notification.notifiable.reportable
+      Rails.application.routes.url_helpers.request_show_path(bs_request.number, notification_id: @notification.id)
     when 'Event::ClearedDecision', 'Event::FavoredDecision'
       reportable = @notification.notifiable.reports.first.reportable
       link_for_reportables(reportable)

diff --git a/src/api/app/services/notification_service/notifier.rb b/src/api/app/services/notification_service/notifier.rb
@@ -15,6 +15,7 @@ class Notifier
                         'Event::ReportForPackage',
                         'Event::ReportForComment',
                         'Event::ReportForUser',
+                        'Event::ReportForRequest',
                         'Event::ClearedDecision',
                         'Event::FavoredDecision',
                         'Event::WorkflowRunFail',
@@ -40,6 +41,7 @@ class Notifier
                         'Event::ReportForPackage',
                         'Event::ReportForComment',
                         'Event::ReportForUser',
+                        'Event::ReportForRequest',
                         'Event::ClearedDecision',
                         'Event::FavoredDecision',
                         'Event::WorkflowRunFail'].freeze