ef6ba8aabd
Upgrade rails to 7.2.2 so that we can proceed with the rails 8 upgrade afterwards # Changelog - `.circleci/config.yml` — align CI DB setup with GitHub Actions (`db:create` + `db:schema:load`) to avoid trigger-dependent prep steps. - `.rubocop.yml` — add `rubocop-rspec_rails` and disable new cops that don't match existing spec style. - `AGENTS.md` — document that specs should run without `.env` (rename temporarily when present). - `Gemfile` — upgrade to Rails 7.2, switch Azure storage gem, pin `commonmarker`, bump `sidekiq-cron`, add `rubocop-rspec_rails`, and relax some gem pins. - `Gemfile.lock` — dependency lockfile updates from the Rails 7.2 and gem changes. - `app/controllers/api/v1/accounts/integrations/linear_controller.rb` — stringify params before passing to the Linear service to keep key types stable. - `app/controllers/super_admin/instance_statuses_controller.rb` — use `MigrationContext` API for migration status in Rails 7.2. - `app/models/installation_config.rb` — add commentary on YAML serialization and future JSONB migration (no behavior change). - `app/models/integrations/hook.rb` — ensure hook type is set on create only and guard against missing app. - `app/models/user.rb` — update enum syntax for Rails 7.2 deprecation, serialize OTP backup codes with JSON, and use Ruby `alias`. - `app/services/crm/leadsquared/setup_service.rb` — stringify hook settings keys before merge to keep JSON shape consistent. - `app/services/macros/execution_service.rb` — remove macro-specific assignee activity workaround; rely on standard assignment handlers. - `config/application.rb` — load Rails 7.2 defaults. - `config/storage.yml` — update Azure Active Storage service name to `AzureBlob`. - `db/migrate/20230515051424_update_article_image_keys.rb` — use credentials `secret_key_base` with fallback to legacy secrets. - `docker/Dockerfile` — add `yaml-dev` and `pkgconf` packages for native extensions (Ruby 3.4 / psych). - `lib/seeders/reports/message_creator.rb` — add parentheses for clarity in range calculation. - `package.json` — pin Vite version and bump `vite-plugin-ruby`. - `pnpm-lock.yaml` — lockfile changes from JS dependency updates. - `spec/builders/v2/report_builder_spec.rb` — disable transactional fixtures; truncate tables per example via Rails `truncate_tables` so after_commit callbacks run with clean isolation; keep builder spec metadata minimal. - `spec/builders/v2/reports/label_summary_builder_spec.rb` — disable transactional fixtures + truncate tables via Rails `truncate_tables`; revert to real `resolved!`/`open!`/`resolved!` flow for multiple resolution events; align date range to `Time.zone` to avoid offset gaps; keep builder spec metadata minimal. - `spec/controllers/api/v1/accounts/macros_controller_spec.rb` — assert `assignee_id` instead of activity message to avoid transaction-timing flakes. - `spec/services/telegram/incoming_message_service_spec.rb` — reference the contact tied to the created conversation instead of `Contact.all.first` to avoid order-dependent failures when other specs leave data behind. - `spec/mailers/administrator_notifications/shared/smtp_config_shared.rb` — use `with_modified_env` instead of stubbing mailer internals. - `spec/services/account/sign_up_email_validation_service_spec.rb` — compare error `class.name` for parallel/reload-safe assertions.
488 lines
17 KiB
Ruby
488 lines
17 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe V2::ReportBuilder do
|
|
include ActiveJob::TestHelper
|
|
self.use_transactional_tests = false
|
|
|
|
def truncate_test_data
|
|
connection = ActiveRecord::Base.connection
|
|
connection.truncate_tables(*connection.tables)
|
|
end
|
|
|
|
before { truncate_test_data }
|
|
|
|
let(:account) { create(:account) }
|
|
let!(:label_1) { create(:label, title: 'Label_1', account: account) }
|
|
let!(:label_2) { create(:label, title: 'Label_2', account: account) }
|
|
|
|
describe '#timeseries' do
|
|
before do
|
|
travel_to(Time.zone.today) do
|
|
user = create(:user, account: account)
|
|
inbox = create(:inbox, account: account)
|
|
create(:inbox_member, user: user, inbox: inbox)
|
|
|
|
gravatar_url = 'https://www.gravatar.com'
|
|
stub_request(:get, /#{gravatar_url}.*/).to_return(status: 404)
|
|
|
|
perform_enqueued_jobs do
|
|
10.times do
|
|
conversation = create(:conversation, account: account,
|
|
inbox: inbox,
|
|
created_at: Time.zone.today)
|
|
create_list(:message, 5, message_type: 'outgoing',
|
|
account: account, inbox: inbox,
|
|
conversation: conversation, created_at: Time.zone.today + 2.hours)
|
|
create_list(:message, 2, message_type: 'incoming',
|
|
account: account, inbox: inbox,
|
|
conversation: conversation,
|
|
created_at: Time.zone.today + 3.hours)
|
|
conversation.update_labels('label_1')
|
|
conversation.label_list
|
|
conversation.save!
|
|
end
|
|
|
|
5.times do
|
|
conversation = create(:conversation, account: account,
|
|
inbox: inbox,
|
|
created_at: (Time.zone.today - 2.days))
|
|
create_list(:message, 3, message_type: 'outgoing',
|
|
account: account, inbox: inbox,
|
|
conversation: conversation,
|
|
created_at: (Time.zone.today - 2.days))
|
|
create_list(:message, 1, message_type: 'incoming',
|
|
account: account, inbox: inbox,
|
|
conversation: conversation,
|
|
created_at: (Time.zone.today - 2.days))
|
|
conversation.update_labels('label_2')
|
|
conversation.label_list
|
|
conversation.save!
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when report type is account' do
|
|
it 'return conversations count' do
|
|
params = {
|
|
metric: 'conversations_count',
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
expect(metrics[Time.zone.today]).to be 10
|
|
expect(metrics[Time.zone.today - 2.days]).to be 5
|
|
end
|
|
|
|
it 'return incoming messages count' do
|
|
params = {
|
|
metric: 'incoming_messages_count',
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
expect(metrics[Time.zone.today]).to be 20
|
|
expect(metrics[Time.zone.today - 2.days]).to be 5
|
|
end
|
|
|
|
it 'return outgoing messages count' do
|
|
params = {
|
|
metric: 'outgoing_messages_count',
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
expect(metrics[Time.zone.today]).to be 50
|
|
expect(metrics[Time.zone.today - 2.days]).to be 15
|
|
end
|
|
|
|
it 'return resolutions count' do
|
|
travel_to(Time.zone.today) do
|
|
params = {
|
|
metric: 'resolutions_count',
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
conversations = account.conversations.where('created_at < ?', 1.day.ago)
|
|
perform_enqueued_jobs do
|
|
# Resolve all 5 conversations
|
|
conversations.each(&:resolved!)
|
|
|
|
# Reopen 1 conversation
|
|
conversations.first.open!
|
|
end
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
# 5 resolution events occurred (even though 1 was later reopened)
|
|
expect(metrics[Time.zone.today]).to be 5
|
|
expect(metrics[Time.zone.today - 2.days]).to be 0
|
|
end
|
|
end
|
|
|
|
it 'return resolutions count with multiple resolutions of same conversation' do
|
|
travel_to(Time.zone.today) do
|
|
params = {
|
|
metric: 'resolutions_count',
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
conversations = account.conversations.where('created_at < ?', 1.day.ago)
|
|
perform_enqueued_jobs do
|
|
# Resolve all 5 conversations (first round)
|
|
conversations.each(&:resolved!)
|
|
|
|
# Reopen 2 conversations and resolve them again
|
|
conversations.first(2).each do |conversation|
|
|
conversation.open!
|
|
conversation.resolved!
|
|
end
|
|
end
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
# 7 total resolution events: 5 initial + 2 re-resolutions
|
|
expect(metrics[Time.zone.today]).to be 7
|
|
expect(metrics[Time.zone.today - 2.days]).to be 0
|
|
end
|
|
end
|
|
|
|
it 'returns bot_resolutions count' do
|
|
travel_to(Time.zone.today) do
|
|
params = {
|
|
metric: 'bot_resolutions_count',
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
create(:agent_bot_inbox, inbox: account.inboxes.first)
|
|
conversations = account.conversations.where('created_at < ?', 1.day.ago)
|
|
conversations.each do |conversation|
|
|
conversation.messages.outgoing.all.update(sender: nil)
|
|
end
|
|
|
|
perform_enqueued_jobs do
|
|
# Resolve all 5 conversations
|
|
conversations.each(&:resolved!)
|
|
|
|
# Reopen 1 conversation
|
|
conversations.first.open!
|
|
end
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
summary = builder.bot_summary
|
|
|
|
# 5 bot resolution events occurred (even though 1 was later reopened)
|
|
expect(metrics[Time.zone.today]).to be 5
|
|
expect(metrics[Time.zone.today - 2.days]).to be 0
|
|
expect(summary[:bot_resolutions_count]).to be 5
|
|
end
|
|
end
|
|
|
|
it 'return bot_handoff count' do
|
|
travel_to(Time.zone.today) do
|
|
params = {
|
|
metric: 'bot_handoffs_count',
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
create(:agent_bot_inbox, inbox: account.inboxes.first)
|
|
conversations = account.conversations.where('created_at < ?', 1.day.ago)
|
|
conversations.each do |conversation|
|
|
conversation.pending!
|
|
conversation.messages.outgoing.all.update(sender: nil)
|
|
end
|
|
|
|
perform_enqueued_jobs do
|
|
# Resolve all 5 conversations
|
|
conversations.each(&:bot_handoff!)
|
|
|
|
# Reopen 1 conversation
|
|
conversations.first.open!
|
|
end
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
summary = builder.bot_summary
|
|
|
|
# 4 conversations are resolved
|
|
expect(metrics[Time.zone.today]).to be 5
|
|
expect(metrics[Time.zone.today - 2.days]).to be 0
|
|
expect(summary[:bot_handoffs_count]).to be 5
|
|
end
|
|
end
|
|
|
|
it 'returns average first response time' do
|
|
params = {
|
|
metric: 'avg_first_response_time',
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
expect(metrics[Time.zone.today].to_f).to be 0.48e4
|
|
end
|
|
|
|
it 'returns summary' do
|
|
params = {
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.summary
|
|
|
|
expect(metrics[:conversations_count]).to be 15
|
|
expect(metrics[:incoming_messages_count]).to be 25
|
|
expect(metrics[:outgoing_messages_count]).to be 65
|
|
expect(metrics[:avg_resolution_time]).to be 0
|
|
expect(metrics[:resolutions_count]).to be 0
|
|
end
|
|
|
|
it 'returns argument error for incorrect group by' do
|
|
params = {
|
|
type: :account,
|
|
metric: 'avg_first_response_time',
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s,
|
|
group_by: 'test'.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
expect { builder.timeseries }.to raise_error(ArgumentError)
|
|
end
|
|
|
|
it 'logs error when metric is nil' do
|
|
params = {
|
|
metric: nil, # Set metric to nil to test this case
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
|
|
expect(Rails.logger).to receive(:error).with('ReportBuilder: Invalid metric - ')
|
|
builder.timeseries
|
|
end
|
|
|
|
it 'calls the appropriate metric method for a valid metric' do
|
|
params = {
|
|
metric: 'not_conversation_count', # Provide a invalid metric
|
|
type: :account,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
expect(Rails.logger).to receive(:error).with('ReportBuilder: Invalid metric - not_conversation_count')
|
|
|
|
builder.timeseries
|
|
end
|
|
end
|
|
|
|
context 'when report type is label' do
|
|
it 'return conversations count' do
|
|
params = {
|
|
metric: 'conversations_count',
|
|
type: :label,
|
|
id: label_2.id,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
expect(metrics[Time.zone.today - 2.days]).to be 5
|
|
end
|
|
|
|
it 'return incoming messages count' do
|
|
params = {
|
|
metric: 'incoming_messages_count',
|
|
type: :label,
|
|
id: label_1.id,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: (Time.zone.today + 1.day).to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
expect(metrics[Time.zone.today]).to be 20
|
|
expect(metrics[Time.zone.today - 2.days]).to be 0
|
|
end
|
|
|
|
it 'return outgoing messages count' do
|
|
params = {
|
|
metric: 'outgoing_messages_count',
|
|
type: :label,
|
|
id: label_1.id,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: (Time.zone.today + 1.day).to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
expect(metrics[Time.zone.today]).to be 50
|
|
expect(metrics[Time.zone.today - 2.days]).to be 0
|
|
end
|
|
|
|
it 'return resolutions count' do
|
|
travel_to(Time.zone.today) do
|
|
params = {
|
|
metric: 'resolutions_count',
|
|
type: :label,
|
|
id: label_2.id,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: (Time.zone.today + 1.day).to_time.to_i.to_s
|
|
}
|
|
|
|
conversations = account.conversations.where('created_at < ?', 1.day.ago)
|
|
|
|
perform_enqueued_jobs do
|
|
# ensure 5 reporting events are created
|
|
conversations.each(&:resolved!)
|
|
|
|
# open one of the conversations to check if it is not counted
|
|
conversations.last.open!
|
|
end
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
# this should count all 5 resolution events (even though 1 was later reopened)
|
|
expect(metrics[Time.zone.today]).to be 5
|
|
expect(metrics[Time.zone.today - 2.days]).to be 0
|
|
end
|
|
end
|
|
|
|
it 'return resolutions count with multiple resolutions of same conversation' do
|
|
travel_to(Time.zone.today) do
|
|
params = {
|
|
metric: 'resolutions_count',
|
|
type: :label,
|
|
id: label_2.id,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: (Time.zone.today + 1.day).to_time.to_i.to_s
|
|
}
|
|
|
|
conversations = account.conversations.where('created_at < ?', 1.day.ago)
|
|
|
|
perform_enqueued_jobs do
|
|
# Resolve all 5 conversations (first round)
|
|
conversations.each(&:resolved!)
|
|
|
|
# Reopen 3 conversations and resolve them again
|
|
conversations.first(3).each do |conversation|
|
|
conversation.open!
|
|
conversation.resolved!
|
|
end
|
|
end
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
|
|
# 8 total resolution events: 5 initial + 3 re-resolutions
|
|
expect(metrics[Time.zone.today]).to be 8
|
|
expect(metrics[Time.zone.today - 2.days]).to be 0
|
|
end
|
|
end
|
|
|
|
it 'returns average first response time' do
|
|
label_2.reporting_events.update(value: 1.5)
|
|
|
|
params = {
|
|
metric: 'avg_first_response_time',
|
|
type: :label,
|
|
id: label_2.id,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.timeseries
|
|
expect(metrics[Time.zone.today].to_f).to be 0.15e1
|
|
end
|
|
|
|
it 'returns summary' do
|
|
params = {
|
|
type: :label,
|
|
id: label_2.id,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.summary
|
|
|
|
expect(metrics[:conversations_count]).to be 5
|
|
expect(metrics[:incoming_messages_count]).to be 5
|
|
expect(metrics[:outgoing_messages_count]).to be 15
|
|
expect(metrics[:avg_resolution_time]).to be 0
|
|
expect(metrics[:resolutions_count]).to be 0
|
|
end
|
|
|
|
it 'returns summary for correct group by' do
|
|
params = {
|
|
type: :label,
|
|
id: label_2.id,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s,
|
|
group_by: 'week'.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
metrics = builder.summary
|
|
|
|
expect(metrics[:conversations_count]).to be 5
|
|
expect(metrics[:incoming_messages_count]).to be 5
|
|
expect(metrics[:outgoing_messages_count]).to be 15
|
|
expect(metrics[:avg_resolution_time]).to be 0
|
|
expect(metrics[:resolutions_count]).to be 0
|
|
end
|
|
|
|
it 'returns argument error for incorrect group by' do
|
|
params = {
|
|
metric: 'avg_first_response_time',
|
|
type: :label,
|
|
id: label_2.id,
|
|
since: (Time.zone.today - 3.days).to_time.to_i.to_s,
|
|
until: Time.zone.today.end_of_day.to_time.to_i.to_s,
|
|
group_by: 'test'.to_s
|
|
}
|
|
|
|
builder = described_class.new(account, params)
|
|
expect { builder.timeseries }.to raise_error(ArgumentError)
|
|
end
|
|
end
|
|
end
|
|
end
|