fix date filters for recurringdonation stats (#1872)

Giveth · Nov 12, 2024 · 6dc5c77 · 6dc5c77
1 parent be46140
commit 6dc5c77
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/repositories/recurringDonationRepository.ts b/src/repositories/recurringDonationRepository.ts
@@ -106,7 +106,8 @@ export const updateRecurringDonationFromTheStreamDonations = async (
         SELECT COALESCE(SUM(d."amount"), 0)
         FROM donation as d
         WHERE d."recurringDonationId" = $1
-      )
+      ),
+      "updatedAt" = NOW()
       WHERE "id" = $1
     `,
       [recurringDonationId],

diff --git a/src/services/recurringDonationService.ts b/src/services/recurringDonationService.ts
@@ -529,13 +529,13 @@ export const recurringDonationsStreamedCUsdTotal = async (
   ).select('COALESCE(SUM(recurringDonation.totalUsdStreamed), 0)', 'total');
 
   if (fromDate) {
-    query.andWhere('recurringDonation.createdAt >= :fromDate', {
+    query.andWhere('recurringDonation.updatedAt >= :fromDate', {
       fromDate: new Date(fromDate),
     });
   }
 
   if (toDate) {
-    query.andWhere('recurringDonation.createdAt <= :toDate', {
+    query.andWhere('recurringDonation.updatedAt <= :toDate', {
       toDate: new Date(toDate),
     });
   }
@@ -572,16 +572,16 @@ export const recurringDonationsStreamedCUsdTotalPerMonth = async (
 ): Promise<ResourcesTotalPerMonthAndYear[]> => {
   const query = RecurringDonation.createQueryBuilder('recurringDonation')
     .select('SUM(recurringDonation.totalUsdStreamed)', 'total')
-    .addSelect("TO_CHAR(recurringDonation.createdAt, 'YYYY/MM')", 'date');
+    .addSelect("TO_CHAR(recurringDonation.updatedAt, 'YYYY/MM')", 'date');
 
   if (fromDate) {
-    query.andWhere('recurringDonation.createdAt >= :fromDate', {
+    query.andWhere('recurringDonation.updatedAt >= :fromDate', {
       fromDate: new Date(fromDate),
     });
   }
 
   if (toDate) {
-    query.andWhere('recurringDonation.createdAt <= :toDate', {
+    query.andWhere('recurringDonation.updatedAt <= :toDate', {
       toDate: new Date(toDate),
     });
   }
@@ -627,13 +627,13 @@ export const recurringDonationsTotalPerToken = async (params: {
     .having('SUM(recurringDonation.totalUsdStreamed) > 0');
 
   if (fromDate) {
-    query.andWhere('recurringDonation.createdAt >= :fromDate', {
+    query.andWhere('recurringDonation.updatedAt >= :fromDate', {
       fromDate: new Date(fromDate),
     });
   }
 
   if (toDate) {
-    query.andWhere('recurringDonation.createdAt <= :toDate', {
+    query.andWhere('recurringDonation.updatedAt <= :toDate', {
       toDate: new Date(toDate),
     });
   }