Refactor Conversation model (#134)
* Add Conversation factory with dependent factories * Include FactoryBot methods in rspec config * Add unit tests for public methods of Conversation model * Move Current model into a separate file in lib folder * Disable Metrics/BlockLength rule for db/migrate and spec folders * Get rid of global $dispatcher variable * Create Message#unread_since scope * Refactor callback methods in Conversation model * Create Conversations::EventDataPresenter * Add translation keys for activity messages * Add pry-rails gem * Refactor Conversation#notify_status_change * Add mock_redis for test env
This commit is contained in:
committed by
Sojan Jose
parent
43e54a7bfb
commit
4768aca484
@@ -8,6 +8,8 @@ class Message < ApplicationRecord
|
||||
enum message_type: [ :incoming, :outgoing, :activity ]
|
||||
enum status: [ :sent, :delivered, :read, :failed ]
|
||||
|
||||
# .succ is a hack to avoid https://makandracards.com/makandra/1057-why-two-ruby-time-objects-are-not-equal-although-they-appear-to-be
|
||||
scope :unread_since, ->(datetime) { where('EXTRACT(EPOCH FROM created_at) > (?)', datetime.to_i.succ) }
|
||||
scope :chat, -> { where.not(message_type: :activity, private: true) }
|
||||
default_scope { order(created_at: :asc) }
|
||||
|
||||
@@ -42,10 +44,10 @@ class Message < ApplicationRecord
|
||||
private
|
||||
|
||||
def dispatch_event
|
||||
$dispatcher.dispatch(MESSAGE_CREATED, Time.zone.now, message: self) unless self.conversation.messages.count == 1
|
||||
Rails.configuration.dispatcher.dispatch(MESSAGE_CREATED, Time.zone.now, message: self) unless self.conversation.messages.count == 1
|
||||
|
||||
if outgoing? && self.conversation.messages.outgoing.count == 1
|
||||
$dispatcher.dispatch(FIRST_REPLY_CREATED, Time.zone.now, message: self)
|
||||
Rails.configuration.dispatcher.dispatch(FIRST_REPLY_CREATED, Time.zone.now, message: self)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -56,7 +58,7 @@ class Message < ApplicationRecord
|
||||
def reopen_conversation
|
||||
if incoming? && self.conversation.resolved?
|
||||
self.conversation.toggle_status
|
||||
$dispatcher.dispatch(CONVERSATION_REOPENED, Time.zone.now, conversation: self.conversation)
|
||||
Rails.configuration.dispatcher.dispatch(CONVERSATION_REOPENED, Time.zone.now, conversation: self.conversation)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user