From f14d06c349efb460b3e0249a18f79951e29b8308 Mon Sep 17 00:00:00 2001
From: harold <tihon414@gmail.com>
Date: Mon, 19 May 2025 12:27:15 +0500
Subject: [PATCH] add fix for donate stats

---
 internal/model/sql/query.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/internal/model/sql/query.go b/internal/model/sql/query.go
index 00b01c1..e7bf134 100644
--- a/internal/model/sql/query.go
+++ b/internal/model/sql/query.go
@@ -400,6 +400,7 @@ FROM
 WHERE 
     streamer_id = @streamer_id
     AND created_at >= NOW() - INTERVAL '24 hours'
+	AND paid_time IS NOT NULL
 GROUP BY 
     DATE_TRUNC('hour', created_at) -- Группировка по часам
 ORDER BY 
@@ -416,6 +417,8 @@ FROM
 WHERE 
     streamer_id = @streamer_id
     AND created_at >= NOW() - INTERVAL '7 days'
+	AND paid_time IS NOT NULL
+
 GROUP BY 
     DATE(created_at) -- Группировка по дням
 ORDER BY 
@@ -432,6 +435,7 @@ FROM
 WHERE 
     streamer_id = @streamer_id
     AND created_at >= NOW() - INTERVAL '1 month'
+	AND paid_time IS NOT NULL
 GROUP BY 
     DATE(created_at) -- Группировка по дням
 ORDER BY 
@@ -448,6 +452,7 @@ FROM
 WHERE 
     streamer_id = @streamer_id
     AND created_at >= NOW() - INTERVAL '1 year'
+	AND paid_time IS NOT NULL
 GROUP BY 
     DATE_TRUNC('month', created_at) -- Группировка по месяцам
 ORDER BY 
@@ -462,7 +467,8 @@ FROM
     public.donats
 WHERE 
     streamer_id = @streamer_id
-    AND created_at >= NOW() - INTERVAL '24 hours';
+    AND created_at >= NOW() - INTERVAL '24 hours'
+	AND paid_time IS NOT NULL;
 `
 
 const GetDonationsSummaryLast7Days = `
@@ -473,7 +479,8 @@ FROM
     public.donats
 WHERE 
     streamer_id = @streamer_id
-    AND created_at >= NOW() - INTERVAL '7 days';
+    AND created_at >= NOW() - INTERVAL '7 days'
+	AND paid_time IS NOT NULL;
 `
 
 const GetDonationsSummaryLastMonth = `
@@ -484,7 +491,8 @@ FROM
     public.donats
 WHERE 
     streamer_id = @streamer_id
-    AND created_at >= NOW() - INTERVAL '1 month';
+    AND created_at >= NOW() - INTERVAL '1 month'
+	AND paid_time IS NOT NULL;
 `
 
 const GetDonationsSummaryLastYear = `
@@ -495,7 +503,8 @@ FROM
     public.donats
 WHERE 
     streamer_id = @streamer_id
-    AND created_at >= NOW() - INTERVAL '1 year';
+    AND created_at >= NOW() - INTERVAL '1 year'
+	AND paid_time IS NOT NULL;
 `
 
 const GetLastModeration = `