LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chore: Fix issues with notification actors (#1807)

Browse Source
This commit is contained in:
Sojan Jose
2021-02-19 18:35:21 +05:30
committed by GitHub
parent eec90a1319
commit 1612f515b0
6 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/api/v1/accounts/notifications/index.json.jbuilder
View File

@@ -11,18 +11,19 @@ json.data do
json.notification_type notification.notification_type
json.push_message_title notification.push_message_title
# TODO: front end assumes primary actor to be conversation. should fix in future
if notification.notification_type == 'conversation_mention'
if %w[assigned_conversation_new_message conversation_mention].include? notification.notification_type
json.primary_actor_type 'Conversation'
json.primary_actor_id notification.primary_actor.conversation_id
json.primary_actor notification.primary_actor&.conversation&.push_event_data
json.primary_actor_id notification.conversation.id
json.primary_actor notification.conversation.push_event_data
else
json.primary_actor_type notification.primary_actor_type
json.primary_actor_id notification.primary_actor_id
json.primary_actor notification.primary_actor&.push_event_data
json.primary_actor notification.primary_actor.push_event_data
end
json.read_at notification.read_at
# Secondary actor could be nil for cases like system assigning conversation
json.secondary_actor notification.secondary_actor&.push_event_data
json.user notification.user&.push_event_data
json.user notification.user.push_event_data
json.created_at notification.created_at.to_i
end
end