Merge pull request #205 from RJ-SMTR/feature/#196-cnab-jae-2

Feature/#196 cnab jae 2
RJ-SMTR · Mar 7, 2024 · 5e53e72 · 5e53e72
2 parents 2bbffd9 + ab1994c
commit 5e53e72
Show file tree

Hide file tree

Showing 48 changed files with 11,269 additions and 9,403 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,19 +30,19 @@
     "prepare": "is-ci || husky install"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.525.0",
+    "@aws-sdk/client-s3": "3.350.0",
     "@google-cloud/bigquery": "^7.3.0",
-    "@nestjs-modules/mailer": "^1.11.2",
+    "@nestjs-modules/mailer": "1.8.1",
     "@nestjs/axios": "^3.0.0",
     "@nestjs/common": "9.4.2",
     "@nestjs/config": "2.3.2",
-    "@nestjs/core": "^7.5.5",
+    "@nestjs/core": "9.4.2",
     "@nestjs/jwt": "10.0.3",
     "@nestjs/passport": "9.0.3",
     "@nestjs/platform-express": "9.4.2",
-    "@nestjs/schedule": "^2.2.3",
-    "@nestjs/swagger": "^5.0.8",
-    "@nestjs/typeorm": "^7.1.5",
+    "@nestjs/schedule": "^3.0.4",
+    "@nestjs/swagger": "6.3.0",
+    "@nestjs/typeorm": "9.0.1",
     "@types/multer-s3": "^3.0.0",
     "apple-signin-auth": "1.7.5",
     "aws-sdk": "^2.1470.0",
@@ -59,9 +59,8 @@
     "handlebars": "4.7.7",
     "multer": "1.4.4",
     "multer-s3": "3.0.1",
-    "nest-sftp": "^3.0.0",
     "nestjs-i18n": "10.2.6",
-    "nodemailer": "^6.9.11",
+    "nodemailer": "6.9.3",
     "passport": "0.6.0",
     "passport-anonymous": "1.0.1",
     "passport-jwt": "4.0.1",
@@ -70,8 +69,10 @@
     "rimraf": "5.0.1",
     "rxjs": "7.8.1",
     "source-map-support": "0.5.21",
+    "ssh2": "^1.15.0",
+    "ssh2-sftp-client": "^10.0.3",
     "swagger-ui-express": "4.6.3",
-    "twitter": "^1.1.0",
+    "twitter": "1.7.1",
     "typeorm": "0.3.16",
     "typeorm-aurora-data-api-driver": "^2.4.4",
     "validations-br": "^1.3.0",
@@ -80,7 +81,7 @@
   "devDependencies": {
     "@nestjs/cli": "9.5.0",
     "@nestjs/schematics": "9.2.0",
-    "@nestjs/testing": "^7.5.5",
+    "@nestjs/testing": "9.4.2",
     "@types/bcryptjs": "2.4.2",
     "@types/express": "4.17.17",
     "@types/facebook-js-sdk": "3.3.6",

diff --git a/src/app.module.ts b/src/app.module.ts
@@ -40,16 +40,16 @@ import { CronJobsModule } from './cron-jobs/cron-jobs.module';
 import { BigqueryModule } from './bigquery/bigquery.module';
 import { TestModule } from './test/test.module';
 import { CnabModule } from './cnab/cnab.module';
-import { SftpModule } from 'nest-sftp';
+import { SftpModule } from './sftp/sftp.module';
 
 @Module({
   imports: [
     SftpModule.forRoot(
       {
-        host: '34.123.217.7',
-        port: 23,
-        username: 'cct_devs',
-        password: 'EzKWSiqqchX3xdF' 
+        host: '',
+        port: 0,
+        username: '',
+        password: '' 
       },
       false,
     ),
@@ -119,6 +119,7 @@ import { SftpModule } from 'nest-sftp';
     TestModule,
     CnabModule,
     SftpModule,
+    // SftpModule,
   ],
 })
 export class AppModule {}
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -17,7 +17,7 @@ import { Status } from 'src/statuses/entities/status.entity';
 import { StatusEnum } from 'src/statuses/statuses.enum';
 import { UsersService } from 'src/users/users.service';
 import { HttpStatusMessage } from 'src/utils/enums/http-error-message.enum';
-import { formatLog } from 'src/utils/logging';
+import { formatLog } from 'src/utils/log-utils';
 import { User } from '../users/entities/user.entity';
 import { LoginResponseType } from '../utils/types/auth/login-response.type';
 import { Nullable } from '../utils/types/nullable.type';
@@ -37,7 +37,7 @@ export class AuthService {
     private forgotService: ForgotService,
     private mailService: MailService,
     private mailHistoryService: MailHistoryService,
-  ) {}
+  ) { }
 
   async validateLogin(
     loginDto: AuthEmailLoginDto,
@@ -397,7 +397,7 @@ export class AuthService {
         this.logger.log(
           formatLog(
             'Email redefinir senha enviado com sucesso.' +
-              `\n    - Detalhes: ${JSON.stringify({ mailSentInfo })}`,
+            `\n    - Detalhes: ${JSON.stringify({ mailSentInfo })}`,
             'forgotPassword()',
           ),
         );

diff --git a/src/bigquery/entities/ordem-pagamento.bigquery-entity.ts b/src/bigquery/entities/ordem-pagamento.bigquery-entity.ts
@@ -1,20 +1,33 @@
 import { HttpStatus } from "@nestjs/common";
 import { CommonHttpException } from "src/utils/http-exception/common-http-exception";
 
+/**
+ * Logic:
+ * - It has 1 `id_ordem_pagamento` per day.
+ * - id_ordem_pagamento repeats by combination of id_consorcio (CNPJ), id_operadora (CPF), servico (vehicle)
+ */
 export class BigqueryOrdemPagamento {
   /** Data da ordem de pagamento (partição) */
   data_ordem: string | null;
 
   /** Data de pagamento da ordem */
   data_pagamento: string | null;
 
-  /** Nome  cadastro.consorcios */
+  /**
+   *  Id de cadastro.consorcios
+   * 
+   * id_consorcio.cnpj = CNPJ
+   */
   id_consorcio: string | null;
 
   /** Nome do consórcio */
   consorcio: string | null;
 
-  /** Identificador da operadora na tabela cadastro.operadoras */
+  /** 
+   * Identificador da operadora na tabela cadastro.operadoras
+   * 
+   * id_operadora.documento = CPF
+   */
   id_operadora: string | null;
 
   /** Nome da operadora */

diff --git a/src/cnab/dto/cliente-favorecido.dto.ts b/src/cnab/dto/cliente-favorecido.dto.ts
@@ -13,57 +13,57 @@ export class SaveClienteFavorecidoDTO {
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  cpf_cnpj?: string;
+  cpf_cnpj?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  cod_banco?: string;
+  cod_banco?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  agencia?: string;
+  agencia?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  dv_agencia?: string;
+  dv_agencia?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  conta_corrente?: string;
+  conta_corrente?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  dv_conta_corrente?: string;
+  dv_conta_corrente?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  logradouro?: string;
+  logradouro?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  numero?: string;
+  numero?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  complemento?: string;
+  complemento?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  bairro?: string;
+  bairro?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  cidade?: string;
+  cidade?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  cep?: string;
+  cep?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  complemento_cep?: string;
+  complemento_cep?: string | null;
 
   @ValidateIf(isCreate)
   @IsNotEmpty()
-  uf?: string;
+  uf?: string | null;
 }
diff --git a/src/cnab/entity/cliente-favorecido.entity.ts b/src/cnab/entity/cliente-favorecido.entity.ts
@@ -19,46 +19,46 @@ export class ClienteFavorecido extends EntityHelper {
   nome: string;
 
   @Column({ type: String, unique: false, nullable: true, length: 14 })
-  cpf_cnpj: string;
+  cpf_cnpj: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 10 })
-  cod_banco: string;
+  cod_banco: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 5 })
-  agencia: string;
+  agencia: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 2 })
-  dv_agencia: string;
+  dv_agencia: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 12 })
-  conta_corrente: string;
+  conta_corrente: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 2 })
-  dv_conta_corrente: string;
+  dv_conta_corrente: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 200 })
-  logradouro: string;
+  logradouro: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 15 })
-  numero: string;
+  numero: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 100 })
-  complemento: string;
+  complemento: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 150 })
-  bairro: string;
+  bairro: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 150 })
-  cidade: string;
+  cidade: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 5 })
-  cep: string;
+  cep: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 3 })
-  complemento_cep: string;
+  complemento_cep: string | null;
 
   @Column({ type: String, unique: false, nullable: true, length: 2 })
-  uf: string;
+  uf: string | null;
 
   public getLogInfo(showName?: boolean): string {
     if (showName === undefined) {

diff --git a/src/cnab/entity/header-arquivo.entity.ts b/src/cnab/entity/header-arquivo.entity.ts
@@ -1,5 +1,5 @@
 import { EntityHelper } from 'src/utils/entity-helper';
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity()
 export class HeaderArquivo extends EntityHelper {
@@ -33,4 +33,6 @@ export class HeaderArquivo extends EntityHelper {
   hr_geracao: Date;
   @Column({ type: Number, unique: false, nullable: true })
   id_transacao: number;
+  @CreateDateColumn()
+  createdAt: Date;
 }
diff --git a/src/cnab/entity/transacao.entity.ts b/src/cnab/entity/transacao.entity.ts
@@ -43,7 +43,7 @@ export class Transacao extends EntityHelper {
   })
   vlr_rateio_credito: number;
 
-  @Column({ type: Number, unique: false, nullable: true, length: 150 })
+  @Column({ type: Number, unique: false, nullable: true })
   qtde_transacao_rateio_debito: number;
 
   @Column({

diff --git a/src/cnab/enums/header-arquivo/header-arquivo-tipo-arquivo.enum.ts b/src/cnab/enums/header-arquivo/header-arquivo-tipo-arquivo.enum.ts
@@ -0,0 +1,4 @@
+export enum HeaderArquivoTipoArquivo {
+  Remessa = 'remessa',
+  Retorno = 'retorno',
+}
diff --git a/src/cnab/interfaces/cnab-all/cnab-field-map-detalhe.interface.ts b/src/cnab/interfaces/cnab-all/cnab-field-map-detalhe.interface.ts
@@ -2,5 +2,5 @@ import { ICnabFieldMap } from './cnab-field-map.interface';
 
 export interface ICnabFieldMapDetalhe extends ICnabFieldMap {
   detalheLoteRegistroSequenceField: string;
-  detalheSegmentoNameField: string;
+  detalheSegmentoCodeField: string;
 }
diff --git a/src/cnab/interfaces/cnab-all/cnab-field-map.interface.ts b/src/cnab/interfaces/cnab-all/cnab-field-map.interface.ts
@@ -69,7 +69,7 @@ export interface ICnabFieldMap {
    *
    * @example "A", "B", "J"
    */
-  detalheSegmentoNameField?: string;
+  detalheSegmentoCodeField?: string;
 
   // TRAILER ARQUIVO FIELDS