Merge pull request #1388 from dmitry-sinina/invoice_fix3

fix invoice generation
yeti-switch · Dec 9, 2023 · 441065e · 441065e
2 parents e43ef62 + d477c79
commit 441065e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/app/models/billing/invoice.rb b/app/models/billing/invoice.rb
@@ -92,10 +92,10 @@ def last_end_date(account_id:)
   has_many :full_terminated_destinations, class_name: 'Billing::InvoiceTerminatedDestination', foreign_key: :invoice_id, dependent: :delete_all
   has_many :full_originated_networks, class_name: 'Billing::InvoiceOriginatedNetwork', foreign_key: :invoice_id, dependent: :delete_all
   has_many :full_terminated_networks, class_name: 'Billing::InvoiceTerminatedNetwork', foreign_key: :invoice_id, dependent: :delete_all
-  has_many :originated_destinations, -> { successful_calls }, class_name: 'Billing::InvoiceOriginatedDestination', foreign_key: :invoice_id
-  has_many :terminated_destinations, -> { successful_calls }, class_name: 'Billing::InvoiceTerminatedDestination', foreign_key: :invoice_id
-  has_many :originated_networks, -> { successful_calls }, class_name: 'Billing::InvoiceOriginatedNetwork', foreign_key: :invoice_id
-  has_many :terminated_networks, -> { successful_calls }, class_name: 'Billing::InvoiceTerminatedNetwork', foreign_key: :invoice_id
+  has_many :originated_destinations, class_name: 'Billing::InvoiceOriginatedDestination', foreign_key: :invoice_id
+  has_many :terminated_destinations, class_name: 'Billing::InvoiceTerminatedDestination', foreign_key: :invoice_id
+  has_many :originated_networks, class_name: 'Billing::InvoiceOriginatedNetwork', foreign_key: :invoice_id
+  has_many :terminated_networks, class_name: 'Billing::InvoiceTerminatedNetwork', foreign_key: :invoice_id
 
   validates :contractor,
             :account,

diff --git a/app/services/billing_invoice/fill.rb b/app/services/billing_invoice/fill.rb
@@ -36,7 +36,7 @@ def generate_originated_data
             first_call_at,
             last_call_at
           ) SELECT
-            dialpeer_prefix, dst_country_id, dst_network_id, dialpeer_next_rate,
+            destination_prefix, dst_country_id, dst_network_id, destination_next_rate,
             COUNT(id),  -- calls count
             COUNT(NULLIF(success,false)),  -- successful_calls_count
             SUM(duration), -- calls_duration
@@ -51,7 +51,8 @@ def generate_originated_data
             is_last_cdr AND
             time_start>=? AND
             time_start<?
-          GROUP BY dialpeer_prefix, dst_country_id, dst_network_id, dialpeer_next_rate",
+          GROUP BY
+            destination_prefix, dst_country_id, dst_network_id, destination_next_rate",
           invoice.id,
           invoice.account_id,
           invoice.start_date,
@@ -81,7 +82,8 @@ def generate_originated_data
             MAX(last_call_at)
           FROM billing.invoice_originated_destinations
           WHERE invoice_id=?
-          GROUP BY country_id, network_id, rate",
+          GROUP BY
+            country_id, network_id, rate",
           invoice.id,
           invoice.id
         )
@@ -101,7 +103,7 @@ def generate_terminated_data
             first_call_at,
             last_call_at
           ) SELECT
-            destination_prefix, dst_country_id, dst_network_id, destination_next_rate,
+            dialpeer_prefix, dst_country_id, dst_network_id, dialpeer_next_rate,
             COUNT(*), -- calls_count
             COUNT(NULLIF((success),false)),  -- successful_calls_count
             SUM(duration), -- calls_duration
@@ -115,7 +117,8 @@ def generate_terminated_data
             vendor_acc_id =? AND
             time_start >=? AND
             time_start < ?
-          GROUP BY destination_prefix, dst_country_id, dst_network_id, destination_next_rate",
+          GROUP BY
+            dialpeer_prefix, dst_country_id, dst_network_id, dialpeer_next_rate",
           invoice.id,
           invoice.account_id,
           invoice.start_date,
@@ -145,7 +148,8 @@ def generate_terminated_data
             MAX(last_call_at)
           FROM billing.invoice_terminated_destinations
           WHERE invoice_id=?
-          GROUP BY country_id, network_id, rate",
+          GROUP BY
+            country_id, network_id, rate",
           invoice.id,
           invoice.id
         )