Merge pull request #182 from RJ-SMTR/hotfix/#177-remove-bs-me-day

Hotfix/#177 Remover endpoint de Valor diário

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

@@ -11,7 +11,6 @@ import { IBankStatement } from './interfaces/bank-statement.interface';
 import { IBSCounts } from './interfaces/bs-counts.interface';
 import { IBSGetMePreviousDaysValidArgs } from './interfaces/bs-get-me-previous-days-args.interface';
 import { IBSGetMePreviousDaysResponse } from './interfaces/bs-get-me-previous-days-response.interface';
-import { IBSGetMeDayValidArgs } from './interfaces/bs-get-me-day-args.interface';
 import { TicketRevenuesService } from 'src/ticket-revenues/ticket-revenues.service';
 
 /**
@@ -127,18 +126,4 @@ export class BankStatementsRepositoryService {
     }
     return statusCounts;
   }
-
-  async getMeDay(validArgs: IBSGetMeDayValidArgs): Promise<number> {
-    const revenues = await this.ticketRevenuesService.getMe(
-      {
-        startDate: validArgs.endDate,
-        endDate: validArgs.endDate,
-        userId: validArgs.user.id,
-        groupBy: 'day',
-      },
-      { limit: 9999, page: 1 },
-      'ticket-revenues',
-    );
-    return revenues.amountSum;
-  }
 }

src/bank-statements/bank-statements.controller.ts

@@ -3,29 +3,27 @@ import {
   Get,
   HttpCode,
   HttpStatus,
-  Param,
   Query,
   Request,
   SerializeOptions,
   UseGuards,
 } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { ApiBearerAuth, ApiParam, ApiQuery, ApiTags } from '@nestjs/swagger';
+import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
 import { User } from 'src/users/entities/user.entity';
 import { CommonApiParams } from 'src/utils/api-param/common-api-params';
 import { DateApiParams } from 'src/utils/api-param/date-api-param';
 import { PaginationApiParams } from 'src/utils/api-param/pagination.api-param';
 import { TimeIntervalEnum } from 'src/utils/enums/time-interval.enum';
-import { IRequest } from 'src/utils/interfaces/request.interface';
 import { getPagination } from 'src/utils/get-pagination';
+import { IRequest } from 'src/utils/interfaces/request.interface';
 import { ParseNumberPipe } from 'src/utils/pipes/parse-number.pipe';
 import { DateQueryParams } from 'src/utils/query-param/date.query-param';
 import { PaginationQueryParams } from 'src/utils/query-param/pagination.query-param';
 import { Pagination } from 'src/utils/types/pagination.type';
 import { BankStatementsService } from './bank-statements.service';
 import { BSMePrevDaysTimeIntervalEnum } from './enums/bs-me-prev-days-time-interval.enum';
 import { BSMeTimeIntervalEnum } from './enums/bs-me-time-interval.enum';
-import { IBSGetMeDayResponse } from './interfaces/bs-get-me-day-response.interface';
 import { IBSGetMePreviousDaysResponse } from './interfaces/bs-get-me-previous-days-response.interface';
 import { IBSGetMeResponse } from './interfaces/bs-get-me-response.interface';
 
@@ -68,28 +66,6 @@ export class BankStatementsController {
     });
   }
 
-  @SerializeOptions({
-    groups: ['me'],
-  })
-  @ApiBearerAuth()
-  @UseGuards(AuthGuard('jwt'))
-  @Get('me/day/:date')
-  @ApiParam({ name: 'date', example: '2023-01-12' })
-  @ApiQuery(CommonApiParams.userId)
-  @HttpCode(HttpStatus.OK)
-  async getMeDayDate(
-    @Request() request: IRequest,
-    @Param('date') date: string,
-    @Query('userId', new ParseNumberPipe({ min: 1, required: false }))
-    userId?: number | null,
-  ): Promise<IBSGetMeDayResponse> {
-    const isUserIdParam = userId !== null && !isNaN(Number(userId));
-    return this.bankStatementsService.getMeDay({
-      endDate: date,
-      userId: isUserIdParam ? userId : (request.user as User).id,
-    });
-  }
-
   @SerializeOptions({
     groups: ['me'],
   })

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

@@ -12,11 +12,6 @@ import { Pagination } from 'src/utils/types/pagination.type';
 import { BankStatementsRepositoryService } from './bank-statements-repository.service';
 import { IBankStatement } from './interfaces/bank-statement.interface';
 import { IBSGetMeArgs } from './interfaces/bs-get-me-args.interface';
-import {
-  IBSGetMeDayArgs,
-  IBSGetMeDayValidArgs,
-} from './interfaces/bs-get-me-day-args.interface';
-import { IBSGetMeDayResponse } from './interfaces/bs-get-me-day-response.interface';
 import {
   IBSGetMePreviousDaysArgs,
   IBSGetMePreviousDaysValidArgs,
@@ -194,27 +189,6 @@ export class BankStatementsService {
     return { todaySum, allSum, countSum, statements: newStatements };
   }
 
-  public async getMeDay(args: IBSGetMeDayArgs): Promise<IBSGetMeDayResponse> {
-    const validArgs = await this.validateGetMeDay(args);
-    const amount = await this.bankStatementsRepository.getMeDay(validArgs);
-    return {
-      valueToReceive: amount,
-    };
-  }
-
-  private async validateGetMeDay(
-    args: IBSGetMeDayArgs,
-  ): Promise<IBSGetMeDayValidArgs> {
-    if (isNaN(args?.userId as number)) {
-      throw CommonHttpException.argNotType('userId', 'number', args?.userId);
-    }
-    const user = await this.usersService.getOne({ id: args?.userId });
-    return {
-      endDate: args?.endDate,
-      user: user,
-    };
-  }
-
   public async getMePreviousDays(
     args: IBSGetMePreviousDaysArgs,
     paginationOptions: PaginationOptions,

src/database/seeds/mail-history/mail-history-seed.service.ts

@@ -50,8 +50,12 @@ export class MailHistorySeedService {
         await this.mailHistoryRepository.save(
           this.mailHistoryRepository.create(newItem),
         );
-        itemUser.hash = newItem.hash;
-        await this.usersRepository.save(this.usersRepository.create(itemUser));
+        await this.usersRepository.save(
+          this.usersRepository.create({
+            id: itemUser.id,
+            hash: newItem.hash,
+          }),
+        );
       }
     }
   }

src/database/seeds/run-seed.ts

@@ -27,12 +27,19 @@ const runSeed = async () => {
   ];
 
   const FORCE_PARAM = '__force';
-  const force = process.argv.slice(2).includes(FORCE_PARAM);
-  global.force = force;
-  const nameFilters = process.argv.slice(2).filter((i) => i !== FORCE_PARAM);
+  const EXCLUDE_PARAM = '__exclude';
+  const isForce = process.argv.slice(2).includes(FORCE_PARAM);
+  const isExclude = process.argv.slice(2).includes(EXCLUDE_PARAM);
+  global.force = isForce;
+  const nameFilters = process.argv
+    .slice(2)
+    .filter((i) => ![FORCE_PARAM, EXCLUDE_PARAM].includes(i));
   if (nameFilters.length > 0) {
-    services = services.filter((s) =>
-      nameFilters.some((j) => s.name.toLowerCase().includes(j.toLowerCase())),
+    services = services.filter(
+      (s) =>
+        nameFilters.some((n) =>
+          s.name.toLowerCase().includes(n.toLowerCase()),
+        ) !== isExclude,
     );
   }
 
@@ -45,7 +52,7 @@ const runSeed = async () => {
       .join(', ')}`,
   );
   for (const module of services) {
-    if (!(await app.get(module).validateRun()) && !force) {
+    if (!(await app.get(module).validateRun()) && !isForce) {
       console.log(`[${module.name}]: Database is not empty, aborting seed...`);
       console.log(
         `Tip: Use '${FORCE_PARAM}' parameter to ignore this message.`,

src/database/seeds/user/user-seed-data.service.ts

@@ -32,8 +32,8 @@ export class UserSeedDataService {
             `
             SELECT
               DISTINCT o.documento,
-            FROM \`rj-smtr.cadastro.operadoras\` o
-            LEFT JOIN \`rj-smtr.br_rj_riodejaneiro_bilhetagem.transacao\` t ON t.id_operadora = o.id_operadora
+            FROM \`rj-smtr-dev.cadastro.operadoras\` o
+            LEFT JOIN \`rj-smtr-dev.br_rj_riodejaneiro_bilhetagem_cct.transacao\` t ON t.id_operadora = o.id_operadora
             WHERE t.modo = 'Van'
             LIMIT 5
           `,
@@ -47,8 +47,8 @@ export class UserSeedDataService {
             `
             SELECT
               DISTINCT c.cnpj,
-            FROM \`rj-smtr.cadastro.consorcios\` c
-            LEFT JOIN \`rj-smtr.br_rj_riodejaneiro_bilhetagem.transacao\` t ON t.id_consorcio = c.id_consorcio
+            FROM \`rj-smtr-dev.cadastro.consorcios\` c
+            LEFT JOIN \`rj-smtr-dev.br_rj_riodejaneiro_bilhetagem_cct.transacao\` t ON t.id_consorcio = c.id_consorcio
             WHERE t.modo != 'Van' AND c.cnpj IS NOT NULL
             LIMIT 5
           `,

test/ticket-revenues/ticket-revenues.e2e-spec.ts

@@ -3,18 +3,24 @@ import * as request from 'supertest';
 import { getDateYMDString } from '../../src/utils/date-utils';
 import {
   APP_URL,
+  BQ_JSON_CREDENTIALS,
   LICENSEE_CNPJ_PASSWORD,
   LICENSEE_CNPJ_PERMIT_CODE,
   LICENSEE_CPF_PASSWORD,
   LICENSEE_CPF_PERMIT_CODE,
 } from '../utils/constants';
+import { BigQuery } from '@google-cloud/bigquery';
 
 describe('Ticket revenues (e2e)', () => {
   const app = APP_URL;
+  let bq: BigQuery;
   let cpfApiToken: any;
   let cnpjApiToken: any;
+  let licenseeCnpj: string;
+  let licenseeCnpjMaxDate: Date;
 
   beforeAll(async () => {
+    // Login CPF and CNPJ users
     await request(app)
       .post('/api/v1/auth/licensee/login')
       .send({
@@ -25,6 +31,7 @@ describe('Ticket revenues (e2e)', () => {
       .then(({ body }) => {
         cpfApiToken = body.token;
       });
+
     await request(app)
       .post('/api/v1/auth/licensee/login')
       .send({
@@ -34,7 +41,25 @@ describe('Ticket revenues (e2e)', () => {
       .expect(200)
       .then(({ body }) => {
         cnpjApiToken = body.token;
+        licenseeCnpj = body.user.cpfCnpj;
+      });
+
+    // get licenseeMaxDate
+    bq = new BigQuery({ credentials: BQ_JSON_CREDENTIALS() });
+    await bq
+      .query(
+        `
+SELECT
+  CAST(t.data AS STRING) AS partitionDate,
+  FROM \`rj-smtr-dev.br_rj_riodejaneiro_bilhetagem_cct.transacao\` t
+  LEFT JOIN \`rj-smtr.cadastro.consorcios\` c ON c.id_consorcio = t.id_consorcio
+WHERE c.cnpj = '${licenseeCnpj}' ORDER BY data DESC, hora DESC LIMIT 1
+    `,
+      )
+      .then((value) => {
+        licenseeCnpjMaxDate = new Date(value[0][0]?.['partitionDate']);
       });
+    expect(Number(licenseeCnpjMaxDate)).not.toBeNaN();
   });
 
   it('should match result in /ticket-revenues/me with /ticket-revenues/me/individual', /**
@@ -86,7 +111,7 @@ describe('Ticket revenues (e2e)', () => {
    * Requirement: 2024/01/26 {@link https://github.com/RJ-SMTR/api-cct/issues/167#issuecomment-1912764312 #167, item 4 - GitHub}
    */ async () => {
     // Arrange
-    const startDate = subDays(new Date(), 366);
+    const startDate = subDays(licenseeCnpjMaxDate, 366);
 
     // Act
     let ticketRevenuesMe: any;
@@ -97,7 +122,7 @@ describe('Ticket revenues (e2e)', () => {
       })
       .query({
         startDate: getDateYMDString(startDate),
-        endDate: getDateYMDString(new Date()),
+        endDate: getDateYMDString(licenseeCnpjMaxDate),
       })
       .expect(200)
       .then(({ body }) => {