# Pull Request Template ## Description Blocked contacts are now excluded from SLA assignment, processing, reports, and conversation SLA UI while they remain blocked. Existing SLA records are preserved, and SLA behavior resumes if the contact is unblocked. Fixes https://linear.app/chatwoot/issue/CW-7435/sla-should-not-trigger-for-blocked-contacts ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? - `bundle exec rspec spec/enterprise/models/conversation_spec.rb spec/enterprise/models/applied_sla_spec.rb spec/enterprise/services/enterprise/action_service_spec.rb spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb spec/enterprise/controllers/api/v1/accounts/conversations_controller_spec.rb spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb spec/enterprise/presenters/conversations/event_data_presenter_spec.rb` — 78 examples, 0 failures - `bundle exec rubocop enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb enterprise/app/jobs/sla/process_account_applied_slas_job.rb enterprise/app/models/applied_sla.rb enterprise/app/models/enterprise/concerns/conversation.rb enterprise/app/presenters/enterprise/conversations/event_data_presenter.rb enterprise/app/services/enterprise/action_service.rb enterprise/app/services/sla/evaluate_applied_sla_service.rb lib/tasks/apply_sla.rake spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb spec/enterprise/controllers/api/v1/accounts/conversations_controller_spec.rb spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb spec/enterprise/models/applied_sla_spec.rb spec/enterprise/models/conversation_spec.rb spec/enterprise/presenters/conversations/event_data_presenter_spec.rb spec/enterprise/services/enterprise/action_service_spec.rb spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb` — no offenses - `pnpm exec vitest --no-watch --no-cache --no-coverage app/javascript/dashboard/components/widgets/conversation/specs/ConversationCard.spec.js` — 2 tests passed - `pnpm exec eslint app/javascript/dashboard/components-next/Conversation/ConversationCard/CardMessagePreviewWithMeta.vue app/javascript/dashboard/components-next/Conversation/ConversationCard/ConversationCardExpanded.vue app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue app/javascript/dashboard/components/widgets/conversation/specs/ConversationCard.spec.js` — passed with existing raw-text warnings in `ConversationHeader.vue` - `git diff --cached --check` — clean ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules --------- Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
64 lines
2.7 KiB
Ruby
64 lines
2.7 KiB
Ruby
# TODO: Move this into models jbuilder
|
|
# Currently the file there is used only for search endpoint.
|
|
# Everywhere else we use conversation builder in partials folder
|
|
|
|
json.meta do
|
|
json.sender do
|
|
json.partial! 'api/v1/models/contact', formats: [:json], resource: conversation.contact
|
|
end
|
|
json.channel conversation.inbox.try(:channel_type)
|
|
if conversation.assigned_entity.is_a?(AgentBot)
|
|
json.assignee do
|
|
json.partial! 'api/v1/models/agent_bot_slim', formats: [:json], resource: conversation.assigned_entity
|
|
end
|
|
json.assignee_type 'AgentBot'
|
|
elsif conversation.assigned_entity&.account
|
|
json.assignee do
|
|
json.partial! 'api/v1/models/agent', formats: [:json], resource: conversation.assigned_entity
|
|
end
|
|
json.assignee_type 'User'
|
|
end
|
|
if conversation.team.present?
|
|
json.team do
|
|
json.partial! 'api/v1/models/team', formats: [:json], resource: conversation.team
|
|
end
|
|
end
|
|
json.hmac_verified conversation.contact_inbox&.hmac_verified
|
|
end
|
|
|
|
json.id conversation.display_id
|
|
if conversation.messages.where(account_id: conversation.account_id).last.blank?
|
|
json.messages []
|
|
else
|
|
json.messages [
|
|
conversation.messages.where(account_id: conversation.account_id)
|
|
.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last.try(:push_event_data)
|
|
]
|
|
end
|
|
|
|
json.account_id conversation.account_id
|
|
json.uuid conversation.uuid
|
|
json.additional_attributes conversation.additional_attributes
|
|
json.agent_last_seen_at conversation.agent_last_seen_at.to_i
|
|
json.assignee_last_seen_at conversation.assignee_last_seen_at.to_i
|
|
json.can_reply conversation.can_reply?
|
|
json.contact_last_seen_at conversation.contact_last_seen_at.to_i
|
|
json.custom_attributes conversation.custom_attributes
|
|
json.inbox_id conversation.inbox_id
|
|
json.labels conversation.cached_label_list_array
|
|
json.muted conversation.muted?
|
|
json.snoozed_until conversation.snoozed_until
|
|
json.status conversation.status
|
|
json.created_at conversation.created_at.to_i
|
|
json.updated_at conversation.updated_at.to_f
|
|
json.timestamp conversation.last_activity_at.to_i
|
|
json.first_reply_created_at conversation.first_reply_created_at.to_i
|
|
json.unread_count conversation.unread_incoming_messages.count
|
|
json.last_non_activity_message conversation.messages.where(account_id: conversation.account_id).non_activity_messages.first.try(:push_event_data)
|
|
json.last_activity_at conversation.last_activity_at.to_i
|
|
json.priority conversation.priority
|
|
json.waiting_since conversation.waiting_since.to_i.to_i
|
|
sla_applicable = !conversation.respond_to?(:sla_applicable?) || conversation.sla_applicable?
|
|
json.sla_policy_id sla_applicable ? conversation.sla_policy_id : nil
|
|
json.partial! 'enterprise/api/v1/conversations/partials/conversation', conversation: conversation if ChatwootApp.enterprise?
|