Merge pull request #101 from RJ-SMTR/develop

Develop to prd

src/bank-statements/bank-statements.service.ts

@@ -67,11 +67,13 @@ export class BankStatementsService {
     const amountSum = Number(
       treatedData.reduce((sum, item) => sum + item.amount, 0).toFixed(2),
     );
+    const ticketCount = insertedData.countSum;
 
     return {
       amountSum,
       todaySum,
       count: treatedData.length,
+      ticketCount,
       data: treatedData,
     };
   }
@@ -85,6 +87,7 @@ export class BankStatementsService {
     statements: ICoreBankStatements[];
     todaySum: number;
     allSum: number;
+    countSum: number;
   }> {
     const statementsDates = getPaymentDates(
       'ticket-revenues',
@@ -106,7 +109,7 @@ export class BankStatementsService {
     );
 
     const todaySum = revenuesResponse.todaySum;
-    let sumAll = 0;
+    let allSum = 0;
     const newStatements: ICoreBankStatements[] = [];
 
     // for each week in month (bank-statements)
@@ -130,9 +133,10 @@ export class BankStatementsService {
         ...statement,
         amount: newAmount,
       });
-      sumAll += newAmount;
+      allSum += newAmount;
     }
-    return { todaySum, allSum: sumAll, statements: newStatements };
+    const countSum = revenuesResponse.ticketCount;
+    return { todaySum, allSum, countSum, statements: newStatements };
   }
 
   //#endregion mockData

src/bank-statements/interfaces/bank-statements-response.interface.ts

@@ -4,5 +4,6 @@ export interface IBankStatementsResponse {
   amountSum: number;
   todaySum: number;
   count: number;
+  ticketCount: number;
   data: ICoreBankStatements[];
 }

src/core-bank/data/core-bank-data.service.ts

@@ -132,10 +132,7 @@ export class CoreBankDataService implements OnModuleInit {
     const { paymentWeekday, nextPaymentWeekday } = this.bankStatementsArgs;
     for (const profile of this.getProfiles()) {
       let id = 1;
-      if (
-        now.getUTCDay() !== paymentWeekday &&
-        nextPaymentWeekday(now) <= lastDayOfMonth(now)
-      ) {
+      if (nextPaymentWeekday(now) <= lastDayOfMonth(now)) {
         bankStatements.push(
           this.generateBankStatement({
             id: id,

src/ticket-revenues/interfaces/ticket-revenues-grouped-response.interface.ts

@@ -4,5 +4,6 @@ export interface ITicketRevenuesGroupedResponse {
   amountSum: number;
   todaySum: number;
   count: number;
+  ticketCount: number;
   data: ITicketRevenuesGroup[];
 }

src/ticket-revenues/ticket-revenues.service.ts

@@ -1,5 +1,5 @@
 import { HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
-import { isToday, startOfDay } from 'date-fns';
+import { endOfDay, isToday, startOfDay } from 'date-fns';
 import {
   BigqueryService,
   BigqueryServiceInstances,
@@ -75,6 +75,15 @@ export class TicketRevenuesService {
       return new TicketRevenuesGroup().toInterface();
     }
     const ticketRevenuesGroupSum = this.getGroupSum(ticketRevenuesResponse);
+    console.log({
+      message: 'GET GROUPED',
+      groupSum: ticketRevenuesGroupSum.transactionValueSum,
+      individualSum: Number(
+        ticketRevenuesResponse
+          .reduce((sum, i) => sum + (i?.transactionValue || 0), 0)
+          .toFixed(2),
+      ),
+    });
 
     return ticketRevenuesGroupSum;
   }
@@ -117,6 +126,7 @@ export class TicketRevenuesService {
         amountSum: 0,
         todaySum: 0,
         count: 0,
+        ticketCount: 0,
         data: [],
       };
     }
@@ -144,7 +154,7 @@ export class TicketRevenuesService {
     const mostRecentResponseDate = startOfDay(
       new Date(ticketRevenuesResponse[0].partitionDate),
     );
-    if (GET_TODAY && mostRecentResponseDate > startOfDay(endDate)) {
+    if (GET_TODAY && mostRecentResponseDate > endOfDay(endDate)) {
       ticketRevenuesResponse = this.removeTicketRevenueToday(
         ticketRevenuesResponse,
       ) as ITicketRevenue[];
@@ -159,10 +169,16 @@ export class TicketRevenuesService {
         .toFixed(2),
     );
 
+    const ticketCount = ticketRevenuesGroups.reduce(
+      (sum, i) => sum + i.count,
+      0,
+    );
+
     return {
       amountSum,
       todaySum: transactionValueLastDay,
       count: ticketRevenuesGroups.length,
+      ticketCount,
       data: ticketRevenuesGroups,
     };
   }

src/utils/payment-date-utils.ts

@@ -138,15 +138,14 @@ export function getPaymentMonth(
       endDate: endOfMonth(fridayDate),
     };
   } else {
-    // get first and last friday of month
+    // if ticket-revenues
+    // get first friday of month and friday
     let startDate = startOfMonth(new Date(fridayDate));
-    if (!isFriday(startDate)) {
-      startDate = nextFriday(startDate);
-    }
-    let endDate = endOfMonth(new Date(fridayDate));
-    if (!isFriday(endDate) && isSameMonth(endDate, nextFriday(endDate))) {
+    startDate = nextFriday(startDate);
+    let endDate = new Date(fridayDate);
+    if (isSameMonth(endDate, nextFriday(endDate))) {
       endDate = nextFriday(endDate);
-    } else if (!isFriday(endDate)) {
+    } else {
       endDate = previousFriday(endDate);
     }
 

test/bank-statements/bank-statements.e2e-spec.ts

@@ -1,4 +1,4 @@
-import { isFriday, nextFriday } from 'date-fns';
+import { isFriday, isSameMonth, nextFriday, previousFriday } from 'date-fns';
 import * as request from 'supertest';
 import { getDateYMDString } from '../../src/utils/date-utils';
 import { configE2E } from '../utils/config';
@@ -119,10 +119,11 @@ describe('Bank statements (e2e)', () => {
   it('Should match amountSum in /bank-statements with /ticket-revenues/me in the same week', async () => {
     // Arrange
     let friday = new Date();
-    if (!isFriday(friday)) {
+    if (isSameMonth(friday, nextFriday(friday))) {
       friday = nextFriday(friday);
+    } else {
+      friday = previousFriday(friday);
     }
-    friday.setDate(friday.getDate() - 7);
     const fridayStr = getDateYMDString(friday);
 
     // Act
@@ -156,13 +157,14 @@ describe('Bank statements (e2e)', () => {
       });
 
     // Assert
-    const bsFriday = bankStatements.data.filter(
+    const bankStatementsFriday = bankStatements.data.filter(
       (i: any) => i.date === fridayStr,
     )?.[0];
-    expect(bsFriday.amount).toEqual(ticketRevenuesMe.amountSum);
+    expect(bankStatements.data[0].date).toEqual(fridayStr);
+    expect(bankStatementsFriday.amount).toEqual(ticketRevenuesMe.amountSum);
   }, 60000);
 
-  it('Should match amountSum in /bank-statements with transactionValueSum in ticket-revenues/grouped/me', async () => {
+  it('Should match amountSum in /bank-statements/me with transactionValueSum in ticket-revenues/grouped/me', async () => {
     // Arrange
     const requestArgs = {
       timeInterval: 'lastMonth',
@@ -198,4 +200,39 @@ describe('Bank statements (e2e)', () => {
       revenuesMeGrouped.transactionValueSum,
     );
   }, 60000);
+
+  it('Should match ticketCounts in /bank-statements with counts in ticket-revenues/grouped/me', async () => {
+    // Arrange
+    const requestArgs = {
+      timeInterval: 'lastMonth',
+    };
+
+    // Act
+    let bankStatements;
+    await request(app)
+      .get('/api/v1/bank-statements/me')
+      .auth(apiToken, {
+        type: 'bearer',
+      })
+      .query(requestArgs)
+      .expect(200)
+      .then(({ body }) => {
+        bankStatements = body;
+      });
+
+    let revenuesMeGrouped;
+    await request(app)
+      .get('/api/v1/ticket-revenues/me/grouped')
+      .auth(apiToken, {
+        type: 'bearer',
+      })
+      .query(requestArgs)
+      .expect(200)
+      .then(({ body }) => {
+        revenuesMeGrouped = body;
+      });
+
+    // Assert
+    expect(bankStatements.ticketCount).toEqual(revenuesMeGrouped.count);
+  }, 60000);
 });