diff --git a/src/operations/operations.module.ts b/src/operations/operations.module.ts index dd32771..d045f84 100644 --- a/src/operations/operations.module.ts +++ b/src/operations/operations.module.ts @@ -4,14 +4,14 @@ import { OperationsController } from './operations.controller'; import { TransaccionModule } from 'src/transaccion/transaccion.module'; import { PagoKioscoModule } from 'src/pago-kiosco/pago-kiosco.module'; import { PersonaModule } from 'src/persona/persona.module'; -import { AbonoTicketModule } from 'src/abono-ticket/abono-ticket.module'; +import { PagoPatronatoModule } from 'src/pago-patronato/pago-patronato.module'; @Module({ imports: [ TransaccionModule, PagoKioscoModule, PersonaModule, - AbonoTicketModule, + PagoPatronatoModule, ], controllers: [OperationsController], providers: [OperationsService], diff --git a/src/operations/operations.service.ts b/src/operations/operations.service.ts index 21dc6f8..8ecb541 100644 --- a/src/operations/operations.service.ts +++ b/src/operations/operations.service.ts @@ -2,6 +2,8 @@ import { Injectable } from '@nestjs/common'; import axios from 'axios'; import { AbonoTicketService } from 'src/abono-ticket/abono-ticket.service'; import { PagoKioscoService } from 'src/pago-kiosco/pago-kiosco.service'; +import { PagoPatronato } from 'src/pago-patronato/entities/pago-patronato.entity'; +import { PagoPatronatoService } from 'src/pago-patronato/pago-patronato.service'; import { PersonaService } from 'src/persona/persona.service'; import { TransaccionService } from 'src/transaccion/transaccion.service'; @@ -11,7 +13,7 @@ export class OperationsService { private readonly transaccionService: TransaccionService, private readonly pagoKioscoService: PagoKioscoService, private readonly personaService: PersonaService, - private readonly abonoTicket: AbonoTicketService, + private readonly pagoPatronatoService: PagoPatronatoService, ) {} async depositKiosco({ cantidad, idKiosco, transaccion }, idPersona: number) { @@ -28,10 +30,6 @@ export class OperationsService { const newSaldo = this.personaService.updateSaldo(idPersona, cantidad); - const abonoTicket = this.abonoTicket.findByTransaccion( - await responseTransaccion, - ); - const pagoKiosco = { idTransaccion: (await responseTransaccion).idTransaccion, monto: cantidad, @@ -40,7 +38,11 @@ export class OperationsService { pagoPatronatoCreado: false, }; - this.pagoKioscoService.create(pagoKiosco); + const pagoK = this.pagoKioscoService.create(pagoKiosco); + + const pagoP = this.pagoPatronatoService.findById( + (await pagoK).idPagoKiosco, + ); const res = await axios.post( `${process.env.API_AT_URL}/operations/receipt`, @@ -48,7 +50,7 @@ export class OperationsService { id_cuenta: idPersona, monto: cantidad, fecha_recibo: today, - folio_recibo: (await abonoTicket).idTickect, + folio_recibo: (await pagoP)?.folio, }, ); diff --git a/src/pago-kiosco/pago-kiosco.service.ts b/src/pago-kiosco/pago-kiosco.service.ts index 256adc4..14afc05 100644 --- a/src/pago-kiosco/pago-kiosco.service.ts +++ b/src/pago-kiosco/pago-kiosco.service.ts @@ -34,6 +34,6 @@ export class PagoKioscoService { const create = this.pagoKioscoRepository.create(data); await this.pagoKioscoRepository.save(create); - return { statusCode: 200, message: 'success' }; + return await this.pagoKioscoRepository.save(create); } } diff --git a/src/pago-patronato/pago-patronato.module.ts b/src/pago-patronato/pago-patronato.module.ts index 62c6a52..6384b1b 100644 --- a/src/pago-patronato/pago-patronato.module.ts +++ b/src/pago-patronato/pago-patronato.module.ts @@ -8,5 +8,6 @@ import { PagoPatronato } from './entities/pago-patronato.entity'; imports: [TypeOrmModule.forFeature([PagoPatronato])], controllers: [PagoPatronatoController], providers: [PagoPatronatoService], + exports: [PagoPatronatoService], }) export class PagoPatronatoModule {} diff --git a/src/pago-patronato/pago-patronato.service.ts b/src/pago-patronato/pago-patronato.service.ts index eb89fad..b047a83 100644 --- a/src/pago-patronato/pago-patronato.service.ts +++ b/src/pago-patronato/pago-patronato.service.ts @@ -15,4 +15,8 @@ export class PagoPatronatoService { findAll() { return this.pagoPatronatoRepository.find(); } + + findById(idPagoPatronato: number) { + return this.pagoPatronatoRepository.findOne({ where: { idPagoPatronato } }); + } }