Align 14 month reports with Angular

CruGlobal · Sep 13, 2024 · a567ac4 · a567ac4
1 parent 0712f37
commit a567ac4
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/pages/api/graphql-rest.page.ts b/pages/api/graphql-rest.page.ts
@@ -5,7 +5,7 @@ import {
   Response,
 } from 'apollo-datasource-rest';
 import { ApolloServer } from 'apollo-server-micro';
-import { DateTime, Duration, Interval } from 'luxon';
+import { DateTime } from 'luxon';
 import Cors from 'micro-cors';
 import {
   ExportFormatEnum,
@@ -443,12 +443,9 @@ class MpdxRestApi extends RESTDataSource {
         currencyType === 'salary'
           ? 'salary_currency_donations'
           : 'donor_currency_donations'
-      }?filter[account_list_id]=${accountListId}${designationAccountFilter}&filter[month_range]=${Interval.before(
-        DateTime.now().endOf('month'),
-        Duration.fromObject({ months: 14 }).minus({ day: 1 }),
-      )
-        .toISODate()
-        .replace('/', '...')}`,
+      }?filter[account_list_id]=${accountListId}${designationAccountFilter}&filter[month_range]=${DateTime.now()
+        .minus({ months: 13 })
+        .toISODate()}...${DateTime.now().toISODate()}`,
     );
     return mapFourteenMonthReport(data, currencyType);
   }