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

13
app/models/notification.rb
View File

@@ -44,12 +44,13 @@ class Notification < ApplicationRecord
PRIMARY_ACTORS = ['Conversation'].freeze
def push_event_data
# Secondary actor could be nil for cases like system assigning conversation
{
id: id,
notification_type: notification_type,
primary_actor_type: primary_actor_type,
primary_actor_id: primary_actor_id,
primary_actor: primary_actor&.push_event_data,
primary_actor: primary_actor.push_event_data,
read_at: read_at,
secondary_actor: secondary_actor&.push_event_data,
user: user&.push_event_data,
@@ -59,7 +60,6 @@ class Notification < ApplicationRecord
end
# TODO: move to a data presenter
# rubocop:disable Metrics/CyclomaticComplexity
def push_message_title
case notification_type
when 'conversation_creation'
@@ -69,19 +69,18 @@ class Notification < ApplicationRecord
when 'assigned_conversation_new_message'
I18n.t(
'notifications.notification_title.assigned_conversation_new_message',
display_id: primary_actor.display_id,
content: primary_actor&.messages&.incoming&.last&.content
display_id: conversation.display_id,
content: primary_actor.content.truncate_words(10)
)
when 'conversation_mention'
I18n.t('notifications.notification_title.conversation_mention', display_id: primary_actor.conversation.display_id, name: secondary_actor.name)
I18n.t('notifications.notification_title.conversation_mention', display_id: conversation.display_id, name: secondary_actor.name)
else
''
end
end
# rubocop:enable Metrics/CyclomaticComplexity
def conversation
return primary_actor.conversation if ['conversation_mention'].include? notification_type
return primary_actor.conversation if %w[assigned_conversation_new_message conversation_mention].include? notification_type
primary_actor
end