Fix group mentions in notifications

decidim-comments/app/services/decidim/comments/new_comment_notification_creator.rb

@@ -56,7 +56,7 @@ def notify_mentioned_groups
           affected_users = group.accepted_users - already_notified_users
           @already_notified_users += affected_users
 
-          notify(:user_group_mentioned, affected_users: affected_users, extra: { group: group })
+          notify(:user_group_mentioned, affected_users: affected_users, extra: { group_id: group.id })
         end
       end
 

decidim-comments/spec/events/decidim/comments/user_group_mentioned_event_spec.rb

@@ -10,7 +10,7 @@
   let(:extra) do
     {
       comment_id: comment.id,
-      group: group
+      group_id: group.id
     }
   end
 

decidim-comments/spec/services/decidim/comments/new_comment_notification_creator_spec.rb

@@ -146,7 +146,7 @@
             affected_users: a_collection_containing_exactly(*affected_group_users),
             extra: {
               comment_id: comment.id,
-              group: group
+              group_id: group.id
             }
           )
         expect(Decidim::EventsManager)
@@ -198,7 +198,7 @@
               affected_users: a_collection_containing_exactly(*affected_group_users),
               extra: {
                 comment_id: comment.id,
-                group: group
+                group_id: group.id
               }
             )
           expect(Decidim::EventsManager)
@@ -232,7 +232,7 @@
               affected_users: a_collection_containing_exactly(*affected_group_users),
               extra: {
                 comment_id: comment.id,
-                group: group
+                group_id: group.id
               }
             )
 

decidim-core/lib/decidim/core/test/factories.rb

@@ -600,6 +600,12 @@ def generate_localized_title
         some_extra_data: "1"
       }
     end
+
+    trait :user_group_mentioned_notification do
+      event_class { "Decidim::Comments::UserGroupMentionedEvent" }
+      event_name { "decidim.events.comments.user_group_mentioned" }
+      extra { { comment_id: create(:comment).id, group_id: create(:user_group).id } }
+    end
   end
 
   factory :action_log, class: "Decidim::ActionLog" do

decidim-core/lib/decidim/events/user_group_event.rb

@@ -35,9 +35,15 @@ def group_presenter
         end
 
         def group
-          return unless extra[:group].is_a?(Decidim::UserGroup)
+          @group ||= fetch_group
+        end
+
+        private
+
+        def fetch_group
+          return extra[:group] if extra[:group].is_a?(Decidim::UserGroup)
 
-          extra[:group]
+          Decidim::UserGroup.find_by(id: extra[:group_id]) if extra[:group_id]
         end
       end
     end

decidim-core/spec/system/notifications_spec.rb

@@ -111,4 +111,20 @@
       end
     end
   end
+
+  context "with user group mentioned notifications" do
+    let!(:notification) { create :notification, :user_group_mentioned_notification, user: user }
+
+    before do
+      page.visit decidim.notifications_path
+    end
+
+    it "shows the notification with the group mentioned" do
+      group = Decidim::UserGroup.find(notification.extra["group_id"])
+      element = page.find(".card-data__item--expand")
+      notification_text = element.text
+
+      expect(notification_text).to end_with("as a member of #{group.name} @#{group.nickname}")
+    end
+  end
 end