From cebdeb78fe1ef3cc7797dfcbd374e8fe63c8e880 Mon Sep 17 00:00:00 2001
From: Vladless <curov2014@yandex.ru>
Date: Sat, 14 Jun 2025 07:01:42 +0300
Subject: [PATCH] minor improvements to UTM tracking accuracy

---
 database/tracking_sources.py | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/database/tracking_sources.py b/database/tracking_sources.py
index aed98754..26423f8a 100644
--- a/database/tracking_sources.py
+++ b/database/tracking_sources.py
@@ -74,15 +74,31 @@ async def get_all_tracking_sources(session: AsyncSession) -> list[dict]:
 
 
 async def get_tracking_source_stats(session: AsyncSession, code: str) -> dict | None:
+    source_result = await session.execute(
+        select(TrackingSource.created_at).where(TrackingSource.code == code)
+    )
+    created_at_row = source_result.first()
+    if not created_at_row:
+        return None
+
+    created_at = created_at_row[0]
+
     reg_subq = (
         select(func.count(func.distinct(User.tg_id)))
-        .where(User.source_code == code)
+        .where(
+            (User.source_code == code) &
+            (User.created_at >= created_at)
+        )
         .scalar_subquery()
     )
 
     trial_subq = (
         select(func.count(func.distinct(User.tg_id)))
-        .where((User.source_code == code) & (User.trial == 1))
+        .where(
+            (User.source_code == code) &
+            (User.trial == 1) &
+            (User.created_at >= created_at)
+        )
         .scalar_subquery()
     )
 
@@ -90,9 +106,10 @@ async def get_tracking_source_stats(session: AsyncSession, code: str) -> dict |
         select(func.count(func.distinct(Payment.tg_id)))
         .join(User, Payment.tg_id == User.tg_id)
         .where(
-            (User.source_code == code)
-            & (Payment.status == "success")
-            & not_(Payment.payment_system.in_(["coupon", "referral"]))
+            (User.source_code == code) &
+            (Payment.status == "success") &
+            not_(Payment.payment_system.in_(["coupon", "referral", "cashback"])) &
+            (Payment.created_at >= created_at)
         )
         .scalar_subquery()
     )
@@ -101,9 +118,10 @@ async def get_tracking_source_stats(session: AsyncSession, code: str) -> dict |
         select(func.coalesce(func.sum(Payment.amount), 0))
         .join(User, Payment.tg_id == User.tg_id)
         .where(
-            (User.source_code == code)
-            & (Payment.status == "success")
-            & not_(Payment.payment_system.in_(["coupon", "referral"]))
+            (User.source_code == code) &
+            (Payment.status == "success") &
+            not_(Payment.payment_system.in_(["coupon", "referral", "cashback"])) &
+            (Payment.created_at >= created_at)
         )
         .scalar_subquery()
     )