Merge pull request #891 from senid231/820-calls_monitoring_future_calls

calls monitoring future calls calculation
yeti-switch · Feb 18, 2021 · cabecf2 · cabecf2
2 parents fd63e07 + 54ff49b
commit cabecf2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/jobs/jobs/calls_monitoring.rb b/app/jobs/jobs/calls_monitoring.rb
@@ -5,6 +5,8 @@
 module Jobs
   class CallsMonitoring < ::BaseJob
     class CallCollection
+      MONITORING_INTERVAL = 60
+
       attr_reader :collection,
                   :key,
                   :balance, :min_balance, :max_balance
@@ -83,7 +85,8 @@ def balance_after_calls
       def call_price(attrs)
         i_per_second_rate = attrs.fetch("#{key}_initial_rate").to_f / 60.0
         n_per_second_rate = attrs.fetch("#{key}_next_rate").to_f / 60.0
-        duration = attrs.fetch('duration').to_i # TODO: check if needed cast to int
+        # duration that will be on next calls monitoring run
+        duration = attrs.fetch('duration').to_i + MONITORING_INTERVAL # TODO: check if needed cast to int
         initial_interval = attrs.fetch("#{key}_initial_interval").to_i # TODO: check if needed cast to int
         next_interval = attrs.fetch("#{key}_next_interval").to_i # TODO: check if needed cast to int
         connect_fee = attrs.fetch("#{key}_fee").to_f

diff --git a/spec/models/jobs/jobs/calls_monitoring_spec.rb b/spec/models/jobs/jobs/calls_monitoring_spec.rb
@@ -203,7 +203,7 @@
                                         account_originated: 2,
                                         account_originated_unique_src: 2,
                                         account_originated_unique_dst: 2,
-                                        account_price_originated: -3.98,
+                                        account_price_originated: -3.96, # +1.04 normal call -5 reverse call
                                         metric_labels: {
                                           account_id: account.id,
                                           account_external_id: account.external_id
@@ -212,7 +212,7 @@
             .with(
                                         type: 'yeti_ac',
                                         account_terminated: 2,
-                                        account_price_terminated: 5.0,
+                                        account_price_terminated: 5.0, # +9 normal call -4 reverse call
                                         metric_labels: {
                                           account_id: vendor_acc.id,
                                           account_external_id: vendor_acc.external_id
@@ -262,7 +262,8 @@
         super().select { |c| c['local_tag'] == 'normal-call' }
       end
       let(:account_balance) do
-        1.02
+        # active calls cost on next calls monitoring run (after 1 min)
+        2.04 # 1.02 * 2
       end
 
       include_examples :keep_calls