Merge pull request #202 from RJ-SMTR/feat/#196-integracao-views-jae

Feat/#196 integracao views jae

.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
   plugins: ['@typescript-eslint/eslint-plugin'],
   extends: [
     'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended',
+  //  'plugin:prettier/recommended',
   ],
   root: true,
   env: {

package.json

@@ -30,19 +30,19 @@
     "prepare": "is-ci || husky install"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.350.0",
+    "@aws-sdk/client-s3": "^3.525.0",
     "@google-cloud/bigquery": "^7.3.0",
-    "@nestjs-modules/mailer": "1.8.1",
+    "@nestjs-modules/mailer": "^1.11.2",
     "@nestjs/axios": "^3.0.0",
     "@nestjs/common": "9.4.2",
     "@nestjs/config": "2.3.2",
-    "@nestjs/core": "9.4.2",
+    "@nestjs/core": "^7.5.5",
     "@nestjs/jwt": "10.0.3",
     "@nestjs/passport": "9.0.3",
     "@nestjs/platform-express": "9.4.2",
-    "@nestjs/schedule": "^3.0.4",
-    "@nestjs/swagger": "6.3.0",
-    "@nestjs/typeorm": "9.0.1",
+    "@nestjs/schedule": "^2.2.3",
+    "@nestjs/swagger": "^5.0.8",
+    "@nestjs/typeorm": "^7.1.5",
     "@types/multer-s3": "^3.0.0",
     "apple-signin-auth": "1.7.5",
     "aws-sdk": "^2.1470.0",
@@ -59,8 +59,9 @@
     "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.3",
+    "nodemailer": "^6.9.11",
     "passport": "0.6.0",
     "passport-anonymous": "1.0.1",
     "passport-jwt": "4.0.1",
@@ -70,7 +71,7 @@
     "rxjs": "7.8.1",
     "source-map-support": "0.5.21",
     "swagger-ui-express": "4.6.3",
-    "twitter": "1.7.1",
+    "twitter": "^1.1.0",
     "typeorm": "0.3.16",
     "typeorm-aurora-data-api-driver": "^2.4.4",
     "validations-br": "^1.3.0",
@@ -79,7 +80,7 @@
   "devDependencies": {
     "@nestjs/cli": "9.5.0",
     "@nestjs/schematics": "9.2.0",
-    "@nestjs/testing": "9.4.2",
+    "@nestjs/testing": "^7.5.5",
     "@types/bcryptjs": "2.4.2",
     "@types/express": "4.17.17",
     "@types/facebook-js-sdk": "3.3.6",

src/app.module.ts

@@ -40,9 +40,19 @@ 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';
 
 @Module({
   imports: [
+    SftpModule.forRoot(
+      {
+        host: '34.123.217.7',
+        port: 23,
+        username: 'cct_devs',
+        password: 'EzKWSiqqchX3xdF' 
+      },
+      false,
+    ),
     ConfigModule.forRoot({
       isGlobal: true,
       load: [
@@ -108,6 +118,7 @@ import { CnabModule } from './cnab/cnab.module';
     BigqueryModule,
     TestModule,
     CnabModule,
+    SftpModule,
   ],
 })
 export class AppModule {}

src/cnab/dto/item-transacao.dto.ts

@@ -4,10 +4,5 @@ export class ItemTransacaoDTO {
   dt_processamento;
   dt_captura;
   modo: string;
-  nome_consorcio: string;
-  id_tipo_pagamento: number;
-  tipo_transacao: string;
-  valor_item_transacao: number;
-  id_transacao: number;
-  id_cliente_favorecido: number;
-}
+  id_cliente_favorecido:number;
+}

src/cnab/dto/transacao.dto.ts

@@ -77,4 +77,5 @@ export class TransacaoDTO {
   @ValidateIf(isCreate)
   @IsNotEmpty()
   id_pagador?: number;
-}
+
+}

src/cnab/entity/item-transacao.entity.ts

@@ -1,22 +1,19 @@
-import { EntityHelper } from 'src/utils/entity-helper';
+import { EntityHelper} from 'src/utils/entity-helper';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity()
 export class ItemTransacao extends EntityHelper {
+  @PrimaryGeneratedColumn()
   id_item_transacao: number;
-  dt_transacao: Date;
-  dt_processamento: Date;
-  dt_captura: Date;
+
+  @Column({ type: String, unique: false, nullable: true })
+  dt_transacao: string;
+  @Column({ type: String, unique: false, nullable: true })
+  dt_processamento: string;
+  @Column({ type: Date, unique: false, nullable: true })
+  dt_captura: Date; 
+  @Column({ type: String, unique: false, nullable: true })
   modo: string;
-  nome_consorcio: string;
-  id_tipo_pagamento: number;
-  tipo_transacao: string;
-  valor_item_transacao: number;
+  @Column({ type: String, unique: false, nullable: true })
   id_cliente_favorecido: number;
-  id_transacao: number;
-}
-
-function Entity(): (
-  target: typeof ItemTransacao,
-) => void | typeof ItemTransacao {
-  throw new Error('Function not implemented.');
-}
+}

src/cnab/repository/cliente-favorecido.repository.ts

@@ -1,7 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { EntityCondition } from 'src/utils/types/entity-condition.type';
-import { Nullable } from 'src/utils/types/nullable.type';
 import { Repository, UpdateResult } from 'typeorm';
 import { SaveClienteFavorecidoDTO } from '../dto/cliente-favorecido.dto';
 import { ClienteFavorecido } from '../entity/cliente-favorecido.entity';
@@ -57,13 +56,13 @@ export class ClienteFavorecidoRepository {
     fields:
       | EntityCondition<ClienteFavorecido>
       | EntityCondition<ClienteFavorecido>[],
-  ): Promise<Nullable<ClienteFavorecido>> {
+  ): Promise<ClienteFavorecido> {
     return await this.clienteFavorecidoRepository.findOne({
       where: fields,
     });
   }
 
-  public async findMany(
+  public async findAll(
     fields:
       | EntityCondition<ClienteFavorecido>
       | EntityCondition<ClienteFavorecido>[],

src/cnab/repository/item-transacao.repository.ts

@@ -8,33 +8,30 @@ import { ItemTransacaoDTO } from '../dto/item-transacao.dto';
 
 @Injectable()
 export class ItemTransacaoRepository {
-  [x: string]: any;
+
   private logger: Logger = new Logger('ItemTransacaoRepository', {
     timestamp: true,
   });
 
   constructor(
     @InjectRepository(ItemTransacao)
-    private ItemTransacaoRepository: Repository<ItemTransacao>,
+    private itemtransacaoRepository: Repository<ItemTransacao>,
   ) {}
 
-  public async save(dto: ItemTransacaoDTO): Promise<ItemTransacao> {
-    return await this.ItemTransacaoRepository.save(dto);
+  public async save(itemTransacao: ItemTransacaoDTO): Promise<ItemTransacao> {
+    return await this.itemtransacaoRepository.save(itemTransacao);
   }
 
   public async findOne(
     fields: EntityCondition<ItemTransacao> | EntityCondition<ItemTransacao>[],
   ): Promise<Nullable<ItemTransacao>> {
-    return await this.ItemTransacaoRepository.findOne({
+    return await this.itemtransacaoRepository.findOne({
       where: fields,
     });
   }
 
-  public async findAll(
-    fields: EntityCondition<ItemTransacao> | EntityCondition<ItemTransacao>[],
-  ): Promise<ItemTransacao[]> {
-    return await this.ItemTransacaoRepository.find({
-      where: fields,
-    });
+
+  public async findAll(): Promise<ItemTransacao[]> {
+    return await this.itemtransacaoRepository.find();
   }
-}
+}

src/cnab/repository/pagador.repository.ts

@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { EntityCondition } from 'src/utils/types/entity-condition.type';
 import { Nullable } from 'src/utils/types/nullable.type';
-import { Repository, UpdateResult } from 'typeorm';
+import { Repository } from 'typeorm';
 import { Pagador } from '../entity/pagador.entity';
 import { PagadorDTO } from '../dto/pagador.dto';
 
@@ -15,34 +15,11 @@ export class PagadorRepository {
     private PagadorRepository: Repository<Pagador>,
   ) {}
 
-  public async save(dto: PagadorDTO): Promise<void> {
-    if (dto.id_pagador === undefined) {
-      await this.create(dto);
-    } else {
-      await this.update(dto.id_pagador, dto);
-    }
-  }
-
-  public async create(createProfileDto: PagadorDTO): Promise<Pagador> {
-    const createdItem = await this.PagadorRepository.save(
-      this.PagadorRepository.create(createProfileDto),
-    );
-    this.logger.log(`Pagador criado: ${createdItem[0].getLogInfo()}`);
-    return createdItem;
-  }
+
+   public async create(pagadorDTO: PagadorDTO): Promise<Pagador> {
+    return  await this.PagadorRepository.save(pagadorDTO);
+   }
 
-  public async update(
-    id: number,
-    updateDto: PagadorDTO,
-  ): Promise<UpdateResult> {
-    const updatePayload = await this.PagadorRepository.update(
-      { id_pagador: id },
-      updateDto,
-    );
-    const updatedItem = new Pagador({ id_pagador: id, ...updateDto });
-    this.logger.log(`Pagador atualizado: ${updatedItem.getLogInfo()}`);
-    return updatePayload;
-  }
 
   public async findOne(
     fields: EntityCondition<Pagador> | EntityCondition<Pagador>[],
@@ -52,11 +29,7 @@ export class PagadorRepository {
     });
   }
 
-  public async findMany(
-    fields: EntityCondition<Pagador> | EntityCondition<Pagador>[],
-  ): Promise<Pagador[]> {
-    return await this.PagadorRepository.find({
-      where: fields,
-    });
+  public async findAll(): Promise<Pagador[]> {
+    return await this.PagadorRepository.find();
   }
-}
+}

src/cnab/repository/transacao.repository.ts

@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { EntityCondition } from 'src/utils/types/entity-condition.type';
 import { Nullable } from 'src/utils/types/nullable.type';
-import { DeepPartial, Repository, UpdateResult } from 'typeorm';
+import { Repository } from 'typeorm';
 import { Transacao } from '../entity/transacao.entity';
 import { TransacaoDTO } from '../dto/transacao.dto';
 
@@ -17,35 +17,9 @@ export class TransacaoRepository {
     private transacaoRepository: Repository<Transacao>,
   ) {}
 
-  public async save(dto: TransacaoDTO): Promise<number> {
-    if (dto.id_transacao === undefined) {
-      const createdItem = await this.create(dto);
-      return createdItem.id_transacao;
-    } else {
-      await this.update(dto.id_transacao, dto);
-      return dto.id_transacao;
-    }
-  }
-
-  private async create(dto: TransacaoDTO): Promise<Transacao> {
-    const createdItem = await this.transacaoRepository.save(
-      this.transacaoRepository.create(dto as DeepPartial<Transacao>),
-    );
-    this.logger.log(`Transacao criado: ${createdItem.getLogInfo()}`);
-    return createdItem;
-  }
+  public async save(transacaoDTO: TransacaoDTO): Promise<Transacao> {
+    return this.transacaoRepository.save(transacaoDTO);
 
-  private async update(id: number, dto: TransacaoDTO): Promise<UpdateResult> {
-    const updatePayload = await this.transacaoRepository.update(
-      { id_transacao: id },
-      dto as DeepPartial<Transacao>,
-    );
-    const updatedItem = new Transacao({
-      id_transacao: id,
-      ...(dto as DeepPartial<Transacao>),
-    });
-    this.logger.log(`Transacao atualizado: ${updatedItem.getLogInfo()}`);
-    return updatePayload;
   }
 
   public async findOne(
@@ -56,12 +30,8 @@ export class TransacaoRepository {
     });
   }
 
-  public async findMany(
-    fields: EntityCondition<Transacao> | EntityCondition<Transacao>[],
-  ): Promise<Transacao[]> {
-    return await this.transacaoRepository.find({
-      where: fields,
-    });
+  public async findAll(): Promise<Transacao[]> {
+    return await this.transacaoRepository.find();
   }
 
   public async getAll(): Promise<Transacao[]> {

src/cnab/service/cliente-favorecido.service.ts

@@ -9,7 +9,7 @@ import { validateDTO } from 'src/utils/validation-utils';
 @Injectable()
 export class ClienteFavorecidoService {
   private logger: Logger = new Logger('ClienteFavorecidoService', {
-    timestamp: true,
+    timestamp: true
   });
 
   constructor(
@@ -34,8 +34,14 @@ export class ClienteFavorecidoService {
     }
   }
 
+
+  public async findCpfCnpj(cpf_cnpj:string):Promise<ClienteFavorecido> {
+    return await this.clienteFavorecidoRepository.findOne(cpf_cnpj);
+  }
+
+
   public async getAll(): Promise<ClienteFavorecido[]> {
-    return await this.clienteFavorecidoRepository.findMany({});
+    return await this.clienteFavorecidoRepository.findAll({});
   }
 
   private async saveFavorecidoFromUser(
@@ -63,4 +69,4 @@ export class ClienteFavorecidoService {
     await validateDTO(SaveClienteFavorecidoDTO, saveObject);
     await this.clienteFavorecidoRepository.save(saveObject);
   }
-}
+}

src/cnab/service/item-transacao.service.ts

@@ -0,0 +1,18 @@
+// WIP
+
+import { Injectable } from '@nestjs/common';
+import { ItemTransacaoRepository } from '../repository/item-transacao.repository';
+import { ItemTransacaoDTO } from '../dto/item-transacao.dto';
+import { ItemTransacao } from '../entity/item-transacao.entity';
+
+
+@Injectable()
+export class ItemTransacaoService {
+  constructor(
+    private itemtransacaoRepository: ItemTransacaoRepository   
+  ) {}
+
+  public async save(itemTransacaoDTO:ItemTransacaoDTO): Promise<ItemTransacao> {   
+     return await this.itemtransacaoRepository.save(itemTransacaoDTO);
+  }
+}