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.
110 lines
3.3 KiB
Ruby
110 lines
3.3 KiB
Ruby
class Crm::Leadsquared::SetupService
|
|
def initialize(hook)
|
|
@hook = hook
|
|
credentials = @hook.settings
|
|
|
|
@access_key = credentials['access_key']
|
|
@secret_key = credentials['secret_key']
|
|
|
|
@client = Crm::Leadsquared::Api::BaseClient.new(@access_key, @secret_key, 'https://api.leadsquared.com/v2/')
|
|
@activity_client = Crm::Leadsquared::Api::ActivityClient.new(@access_key, @secret_key, 'https://api.leadsquared.com/v2/')
|
|
end
|
|
|
|
def setup
|
|
setup_endpoint
|
|
setup_activity
|
|
rescue Crm::Leadsquared::Api::BaseClient::ApiError => e
|
|
ChatwootExceptionTracker.new(e, account: @hook.account).capture_exception
|
|
Rails.logger.error "LeadSquared API error in setup: #{e.message}"
|
|
rescue StandardError => e
|
|
ChatwootExceptionTracker.new(e, account: @hook.account).capture_exception
|
|
Rails.logger.error "Error during LeadSquared setup: #{e.message}"
|
|
end
|
|
|
|
def setup_endpoint
|
|
response = @client.get('Authentication.svc/UserByAccessKey.Get')
|
|
endpoint_host = response['LSQCommonServiceURLs']['api']
|
|
app_host = response['LSQCommonServiceURLs']['app']
|
|
timezone = response['TimeZone']
|
|
|
|
endpoint_url = "https://#{endpoint_host}/v2/"
|
|
app_url = "https://#{app_host}/"
|
|
|
|
update_hook_settings({ :endpoint_url => endpoint_url, :app_url => app_url, :timezone => timezone })
|
|
|
|
# replace the clients
|
|
@client = Crm::Leadsquared::Api::BaseClient.new(@access_key, @secret_key, endpoint_url)
|
|
@activity_client = Crm::Leadsquared::Api::ActivityClient.new(@access_key, @secret_key, endpoint_url)
|
|
end
|
|
|
|
private
|
|
|
|
def setup_activity
|
|
existing_types = @activity_client.fetch_activity_types
|
|
return if existing_types.blank?
|
|
|
|
activity_codes = setup_activity_types(existing_types)
|
|
return if activity_codes.blank?
|
|
|
|
update_hook_settings(activity_codes)
|
|
|
|
activity_codes
|
|
end
|
|
|
|
def setup_activity_types(existing_types)
|
|
activity_codes = {}
|
|
|
|
activity_types.each do |activity_type|
|
|
activity_id = find_or_create_activity_type(activity_type, existing_types)
|
|
|
|
if activity_id.present?
|
|
activity_codes[activity_type[:setting_key]] = activity_id.to_i
|
|
else
|
|
Rails.logger.error "Failed to find or create activity type: #{activity_type[:name]}"
|
|
end
|
|
end
|
|
|
|
activity_codes
|
|
end
|
|
|
|
def find_or_create_activity_type(activity_type, existing_types)
|
|
existing = existing_types.find { |t| t['ActivityEventName'] == activity_type[:name] }
|
|
|
|
if existing
|
|
existing['ActivityEvent'].to_i
|
|
else
|
|
@activity_client.create_activity_type(
|
|
name: activity_type[:name],
|
|
score: activity_type[:score],
|
|
direction: activity_type[:direction]
|
|
)
|
|
end
|
|
end
|
|
|
|
def update_hook_settings(params)
|
|
@hook.settings = @hook.settings.merge(params.stringify_keys)
|
|
@hook.save!
|
|
end
|
|
|
|
def activity_types
|
|
[
|
|
{
|
|
name: "#{brand_name} Conversation Started",
|
|
score: @hook.settings['conversation_activity_score'].to_i || 0,
|
|
direction: 0,
|
|
setting_key: 'conversation_activity_code'
|
|
},
|
|
{
|
|
name: "#{brand_name} Conversation Transcript",
|
|
score: @hook.settings['transcript_activity_score'].to_i || 0,
|
|
direction: 0,
|
|
setting_key: 'transcript_activity_code'
|
|
}
|
|
].freeze
|
|
end
|
|
|
|
def brand_name
|
|
::GlobalConfig.get('BRAND_NAME')['BRAND_NAME'].presence || 'Chatwoot'
|
|
end
|
|
end
|