Merge pull request #1991 from dmitry-sinina/disable_email_balance_notifications

Disable email balance notifications

Author: dmitry-sinina

app/admin/system/infos.rb

@@ -38,6 +38,7 @@
               row :keep_expired_destinations_days
               row :keep_expired_dialpeers_days
               row :keep_balance_notifications_days
+              row :disable_balance_notification_emails
               row :calls_monitoring do
                 attributes_table_for(YetiConfig.calls_monitoring) do
                   row :write_account_stats

app/assets/stylesheets/active_admin.css.scss

@@ -130,14 +130,17 @@ body.active_admin.index #active_admin_content {
 
 .cdr-stat-grid {
   display: grid;
-  grid-template-columns: 1fr 1fr;
+  grid-template-columns: 1fr;
   gap: 4px 6px;
   font-size: 1.05em;
   padding: 2px 0;
 
   .cdr-stat-cell {
     display: flex;
-    flex-direction: column;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: baseline;
+    gap: 8px;
 
     .cdr-stat-label {
       color: #888;
@@ -149,30 +152,12 @@ body.active_admin.index #active_admin_content {
     .cdr-stat-value {
       font-weight: 600;
       line-height: 1.3;
-    }
-  }
-
-  .cdr-stat-full {
-    grid-column: 1 / -1;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: baseline;
-    gap: 8px;
-
-    .cdr-stat-value {
       text-align: right;
       white-space: nowrap;
     }
   }
 
-.cdr-stat-separator {
-    grid-column: 1 / -1;
-    border-top: 1px solid #e8e8e8;
-    margin: 1px 0;
-  }
-
   .cdr-stat-by-currency {
-    grid-column: 1 / -1;
     padding: 0 0 1px 8px;
 
     .cdr-stat-currency-row {

app/domain/notification_event.rb

@@ -24,7 +24,7 @@ def low_threshold_reached(account)
       System::EventSubscription::CONST::EVENT_ACCOUNT_LOW_THRESHOLD_REACHED,
       subject: "Account with id #{account.id} low balance",
       message: account_threshold_message(account),
-      additional_contacts: account_contacts(account),
+      additional_contacts: account_email_recipients(account),
       event_data: account_threshold_data(account)
     )
   end
@@ -34,7 +34,7 @@ def high_threshold_reached(account)
       System::EventSubscription::CONST::EVENT_ACCOUNT_HIGH_THRESHOLD_REACHED,
       subject: "Account with id #{account.id} high balance",
       message: account_threshold_message(account),
-      additional_contacts: account_contacts(account),
+      additional_contacts: account_email_recipients(account),
       event_data: account_threshold_data(account)
     )
   end
@@ -44,7 +44,7 @@ def low_threshold_cleared(account)
       System::EventSubscription::CONST::EVENT_ACCOUNT_LOW_THRESHOLD_CLEARED,
       subject: "Account with id #{account.id} low balance cleared",
       message: account_threshold_message(account),
-      additional_contacts: account_contacts(account),
+      additional_contacts: account_email_recipients(account),
       event_data: account_threshold_data(account)
     )
   end
@@ -54,7 +54,7 @@ def high_threshold_cleared(account)
       System::EventSubscription::CONST::EVENT_ACCOUNT_HIGH_THRESHOLD_CLEARED,
       subject: "Account with id #{account.id} high balance cleared",
       message: account_threshold_message(account),
-      additional_contacts: account_contacts(account),
+      additional_contacts: account_email_recipients(account),
       event_data: account_threshold_data(account)
     )
   end
@@ -153,6 +153,12 @@ def account_contacts(account)
     account.balance_notification_setting.contacts.preload(contractor: :smtp_connection).to_a
   end
 
+  def account_email_recipients(account)
+    return [] if YetiConfig.disable_balance_notification_emails
+
+    account_contacts(account)
+  end
+
   def destination_contacts(destination)
     contact_ids = destination.rateplans.pluck(:send_quality_alarms_to).flatten.compact.uniq
     Billing::Contact.where(id: contact_ids).preload(contractor: :smtp_connection).to_a

config/initializers/config.rb

@@ -67,6 +67,8 @@ def self.setting_files(config_root, _env)
 
     optional(:partition_detach_before_drop).filled(:bool)
 
+    optional(:disable_balance_notification_emails).filled(:bool)
+
     required(:prometheus).schema do
       required(:enabled).value(:bool?)
       required(:host).maybe(:string)

config/yeti_web.yml.distr

@@ -79,6 +79,11 @@ s3_storage:
 
 tmpdir: 'tmp'
 
+# When true, suppresses balance-threshold emails to addresses configured on
+# Account Balance Notification Settings (send_balance_notifications_to).
+# HTTP webhooks and emails to System::EventSubscription contacts are unaffected.
+#disable_balance_notification_emails: false
+
 # Admin UI session expiration configuration (optional)
 # If not set, sessions will not expire (current behavior)
 # If set, sessions will expire after the specified number of seconds of inactivity

lib/resource_dsl/acts_as_cdr_stat.rb

@@ -6,7 +6,7 @@ def acts_as_cdr_stat
       section = ActiveAdmin::SidebarSection.new 'Statistic', class: 'toggle', only: :index do
         div id: 'cdr_statistic', class: 'loader'
         div id: 'cdr_statistic_placeholder', class: 'cdr-stat-grid', style: 'display: none;' do
-          div class: 'cdr-stat-cell cdr-stat-full' do
+          div class: 'cdr-stat-cell' do
             span 'Originated calls', class: 'cdr-stat-label'
             strong id: :cdr_stat_originated_calls_count, class: 'cdr-stat-value'
           end
@@ -18,7 +18,6 @@ def acts_as_cdr_stat
             span 'Rerouted', class: 'cdr-stat-label'
             strong id: :cdr_stat_rerouted_calls_count, class: 'cdr-stat-value'
           end
-          div class: 'cdr-stat-separator'
           div class: 'cdr-stat-cell' do
             span 'Duration', class: 'cdr-stat-label'
             strong id: :cdr_stat_calls_duration, class: 'cdr-stat-value'
@@ -35,17 +34,16 @@ def acts_as_cdr_stat
             span 'Term ASR', class: 'cdr-stat-label'
             strong id: :cdr_stat_termination_asr, class: 'cdr-stat-value'
           end
-          div class: 'cdr-stat-separator'
-          div class: 'cdr-stat-cell cdr-stat-full' do
+          div class: 'cdr-stat-cell' do
             span 'Profit', class: 'cdr-stat-label'
             strong id: :cdr_stat_profit, class: 'cdr-stat-value'
           end
-          div class: 'cdr-stat-cell cdr-stat-full' do
+          div class: 'cdr-stat-cell' do
             span 'Origination cost', class: 'cdr-stat-label'
             strong id: :cdr_stat_origination_cost, class: 'cdr-stat-value'
           end
           div id: :cdr_stat_origination_cost_by_currency, class: 'cdr-stat-by-currency'
-          div class: 'cdr-stat-cell cdr-stat-full' do
+          div class: 'cdr-stat-cell' do
             span 'Termination cost', class: 'cdr-stat-label'
             strong id: :cdr_stat_termination_cost, class: 'cdr-stat-value'
           end

spec/domain/notification_event_spec.rb

@@ -99,6 +99,45 @@
     end
 
     context 'when event_subscription has url'
+
+    context 'when YetiConfig.disable_balance_notification_emails is true' do
+      before do
+        allow(YetiConfig).to receive(:disable_balance_notification_emails).and_return(true)
+      end
+
+      let(:expected_contacts) { subscription_contacts }
+
+      include_examples :sends_email_to_contacts
+      include_examples :does_not_enqueue_send_http_job
+
+      context 'when event_subscription has url filled' do
+        before do
+          event_subscription.update! url: 'http://example.com/cb'
+        end
+
+        include_examples :sends_email_to_contacts
+        # expected_event_data still carries the account's send_balance_notifications_to emails
+        include_examples :enqueues_send_http_job
+      end
+
+      context 'when event_subscription has no contacts' do
+        before do
+          event_subscription.update! send_to: []
+        end
+
+        include_examples :does_not_send_email
+        include_examples :does_not_enqueue_send_http_job
+
+        context 'when event_subscription has url filled' do
+          before do
+            event_subscription.update! url: 'http://example.com/cb'
+          end
+
+          include_examples :does_not_send_email
+          include_examples :enqueues_send_http_job
+        end
+      end
+    end
   end
 
   shared_examples :send_destination_quality_alarm_emails do
@@ -173,6 +212,17 @@
       include_examples :sends_email_to_contacts
       include_examples :enqueues_send_http_job
     end
+
+    context 'when YetiConfig.disable_balance_notification_emails is true' do
+      # Regression guard: the flag must only suppress account balance emails,
+      # not destination quality alarm emails to rateplan-configured contacts.
+      before do
+        allow(YetiConfig).to receive(:disable_balance_notification_emails).and_return(true)
+      end
+
+      include_examples :sends_email_to_contacts
+      include_examples :does_not_enqueue_send_http_job
+    end
   end
 
   shared_examples :send_events_to_event_subscription_contacts do