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

chore: Clean up assignment logic (#3763)

Browse Source
This commit is contained in:
Sojan Jose
2022-01-13 21:38:10 -08:00
committed by Sojan
parent 346d89ecc0
commit 1749b4eb61
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/concerns/assignment_handler.rb
View File

@@ -4,7 +4,7 @@ module AssignmentHandler
included do included do
before_save :ensure_assignee_is_from_team before_save :ensure_assignee_is_from_team
after_update :notify_assignment_change, :process_assignment_activities after_commit :notify_assignment_change, :process_assignment_activities
end end
private private

6
app/models/notification.rb
View File

@@ -71,6 +71,7 @@ class Notification < ApplicationRecord
end end
# TODO: move to a data presenter # TODO: move to a data presenter
# rubocop:disable Metrics/CyclomaticComplexity
def push_message_title def push_message_title
case notification_type case notification_type
when 'conversation_creation' when 'conversation_creation'
@@ -81,14 +82,15 @@ class Notification < ApplicationRecord
I18n.t( I18n.t(
'notifications.notification_title.assigned_conversation_new_message', 'notifications.notification_title.assigned_conversation_new_message',
display_id: conversation.display_id, display_id: conversation.display_id,
content: primary_actor.content&.truncate_words(10) content: primary_actor&.content&.truncate_words(10)
) )
when 'conversation_mention' when 'conversation_mention'
"[##{conversation.display_id}] #{transform_user_mention_content primary_actor.content}" "[##{conversation&.display_id}] #{transform_user_mention_content primary_actor&.content}"
else else
'' ''
end end
end end
# rubocop:enable Metrics/CyclomaticComplexity
def conversation def conversation
return primary_actor.conversation if %w[assigned_conversation_new_message conversation_mention].include? notification_type return primary_actor.conversation if %w[assigned_conversation_new_message conversation_mention].include? notification_type