From cb2c4a0d0b5002c60e515a3f424f892bcf0b707a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Semp=C3=A9?= Date: Fri, 12 Jul 2024 13:12:56 +0200 Subject: [PATCH] fix(analytics): Prevent fetching deleted customer analytics --- app/models/analytics/gross_revenue.rb | 2 +- app/models/analytics/invoice_collection.rb | 2 +- app/models/analytics/overdue_balance.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/analytics/gross_revenue.rb b/app/models/analytics/gross_revenue.rb index 32ee80eaf64..8832c457341 100644 --- a/app/models/analytics/gross_revenue.rb +++ b/app/models/analytics/gross_revenue.rb @@ -8,7 +8,7 @@ class << self def query(organization_id, **args) if args[:external_customer_id].present? and_external_customer_id_sql = sanitize_sql( - ['AND c.external_id = :external_customer_id', args[:external_customer_id]] + ["AND c.external_id = :external_customer_id AND c.deleted_at IS NULL", args[:external_customer_id]] ) end diff --git a/app/models/analytics/invoice_collection.rb b/app/models/analytics/invoice_collection.rb index fa5e977d0e2..91fa1830241 100644 --- a/app/models/analytics/invoice_collection.rb +++ b/app/models/analytics/invoice_collection.rb @@ -8,7 +8,7 @@ class << self def query(organization_id, **args) if args[:external_customer_id].present? and_external_customer_id_sql = sanitize_sql( - ["AND c.external_id = :external_customer_id", args[:external_customer_id]] + ["AND c.external_id = :external_customer_id AND c.deleted_at IS NULL", args[:external_customer_id]] ) end diff --git a/app/models/analytics/overdue_balance.rb b/app/models/analytics/overdue_balance.rb index b6afdfd429f..a90eeed2efb 100644 --- a/app/models/analytics/overdue_balance.rb +++ b/app/models/analytics/overdue_balance.rb @@ -8,7 +8,7 @@ class << self def query(organization_id, **args) if args[:external_customer_id].present? and_external_customer_id_sql = sanitize_sql( - ["AND c.external_id = :external_customer_id", args[:external_customer_id]] + ["AND c.external_id = :external_customer_id AND c.deleted_at IS NULL", args[:external_customer_id]] ) end