diff --git a/app/views/notifications/_notification.json.jbuilder b/app/views/notifications/_notification.json.jbuilder index d2fadfa1b..2b0cb3549 100644 --- a/app/views/notifications/_notification.json.jbuilder +++ b/app/views/notifications/_notification.json.jbuilder @@ -6,11 +6,16 @@ json.cache! notification do json.partial! "notifications/notification/#{notification.source_type.underscore}/body", notification: notification - json.creator notification.creator, partial: "users/user", as: :user + json.creator do + json.partial! "users/user", user: notification.creator + json.avatar_url user_avatar_url(notification.creator) + end json.card do - json.(notification.card, :id, :title, :status) + json.(notification.card, :id, :number, :title, :status) + json.board_name notification.card.board.name json.url card_url(notification.card) + json.column notification.card.column, partial: "columns/column", as: :column if notification.card.column end json.url notification_url(notification) diff --git a/test/controllers/notifications_controller_test.rb b/test/controllers/notifications_controller_test.rb index 0d0565f24..aa9c283a5 100644 --- a/test/controllers/notifications_controller_test.rb +++ b/test/controllers/notifications_controller_test.rb @@ -22,5 +22,9 @@ class NotificationsControllerTest < ActionDispatch::IntegrationTest assert_not_nil notification["card"] assert_not_nil notification["creator"] assert_not_nil notification["unread_count"] + assert_not_nil notification.dig("creator", "avatar_url") + assert_not_nil notification.dig("card", "number") + assert_not_nil notification.dig("card", "board_name") + assert_not_nil notification.dig("card", "column") end end