diff --git a/src/app.module.ts b/src/app.module.ts index eb20b31..997ec83 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -1,37 +1,30 @@ import { Module } from '@nestjs/common'; import { AppController } from './app.controller'; import { AppService } from './app.service'; -import { PersonaModule } from './persona/persona.module'; +import { PersonaModule } from './modules/Monedero/persona/persona.module'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { ConfigModule, ConfigService } from '@nestjs/config'; -import { TransaccionModule } from './transaccion/transaccion.module'; -import { AbonoTicketModule } from './abono-ticket/abono-ticket.module'; -import { PagoKioscoModule } from './pago-kiosco/pago-kiosco.module'; -import { KioscoModule } from './kiosco/kiosco.module'; +import { ConfigModule } from '@nestjs/config'; +import { TransaccionModule } from './modules/Monedero/transaccion/transaccion.module'; +import { AbonoTicketModule } from './modules/Monedero/abono-ticket/abono-ticket.module'; +import { KioscoModule } from './modules/Monedero/kiosco/kiosco.module'; import { OperationsModule } from './operations/operations.module'; -import { PagoPatronatoModule } from './pago-patronato/pago-patronato.module'; -import { NombreTransaccionModule } from './nombre-transaccion/nombre-transaccion.module'; +import { PagoPatronatoModule } from './modules/Monedero/pago-patronato/pago-patronato.module'; +import { NombreTransaccionModule } from './modules/Monedero/nombre-transaccion/nombre-transaccion.module'; +import { dbAT } from './database/config/AT.config'; +import { dbMonedero } from './database/config/Monedero.config'; +import { PagoKioscoModule } from './modules/Monedero/pago-kiosco/pago-kiosco.module'; @Module({ imports: [ ConfigModule.forRoot({ isGlobal: true, + envFilePath: '.env', }), - TypeOrmModule.forRootAsync({ - imports: [ConfigModule], - inject: [ConfigService], - useFactory: async (config: ConfigService) => ({ - type: 'mariadb', - host: config.get('DB_HOST'), - port: config.get('DB_PORT'), - username: config.get('DB_USER'), - password: config.get('DB_PASS'), - database: config.get('DB_NAME'), - entities: [__dirname + '/**/*.entity{.ts,.js}'], - synchronize: false, - }), - }), + TypeOrmModule.forRootAsync(dbAT), + + TypeOrmModule.forRootAsync(dbMonedero), + PersonaModule, TransaccionModule, AbonoTicketModule, diff --git a/src/abono-ticket/entities/abono-ticket.entity.ts b/src/database/Monedero/entities/abono-ticket.entity.ts similarity index 82% rename from src/abono-ticket/entities/abono-ticket.entity.ts rename to src/database/Monedero/entities/abono-ticket.entity.ts index 6cf2c39..62d5ccf 100644 --- a/src/abono-ticket/entities/abono-ticket.entity.ts +++ b/src/database/Monedero/entities/abono-ticket.entity.ts @@ -5,7 +5,7 @@ import { ManyToOne, JoinColumn, } from 'typeorm'; -import { Transaccion } from 'src/transaccion/entities/transaccion.entity'; // ajusta la ruta según tu estructura +import { Transaccion } from 'src/database/Monedero/entities/transaccion.entity'; // ajusta la ruta según tu estructura @Entity('AbonoTicket') export class AbonoTicket { diff --git a/src/kiosco/entities/kiosco.entity.ts b/src/database/Monedero/entities/kiosco.entity.ts similarity index 92% rename from src/kiosco/entities/kiosco.entity.ts rename to src/database/Monedero/entities/kiosco.entity.ts index 37bc4b1..b89d638 100644 --- a/src/kiosco/entities/kiosco.entity.ts +++ b/src/database/Monedero/entities/kiosco.entity.ts @@ -1,4 +1,4 @@ -import { PagoKiosco } from 'src/pago-kiosco/entities/pago-kiosco.entity'; +import { PagoKiosco } from 'src/database/Monedero/entities/pago-kiosco.entity'; import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'; @Entity('Kiosco') diff --git a/src/nombre-transaccion/entities/nombre-transaccion.entity.ts b/src/database/Monedero/entities/nombre-transaccion.entity.ts similarity index 82% rename from src/nombre-transaccion/entities/nombre-transaccion.entity.ts rename to src/database/Monedero/entities/nombre-transaccion.entity.ts index 99f8bdd..8e9af07 100644 --- a/src/nombre-transaccion/entities/nombre-transaccion.entity.ts +++ b/src/database/Monedero/entities/nombre-transaccion.entity.ts @@ -1,4 +1,4 @@ -import { Transaccion } from 'src/transaccion/entities/transaccion.entity'; +import { Transaccion } from 'src/database/Monedero/entities/transaccion.entity'; import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm'; @Entity('NombreTransaccion') diff --git a/src/pago-kiosco/entities/pago-kiosco.entity.ts b/src/database/Monedero/entities/pago-kiosco.entity.ts similarity index 83% rename from src/pago-kiosco/entities/pago-kiosco.entity.ts rename to src/database/Monedero/entities/pago-kiosco.entity.ts index c6ef35e..e95cc48 100644 --- a/src/pago-kiosco/entities/pago-kiosco.entity.ts +++ b/src/database/Monedero/entities/pago-kiosco.entity.ts @@ -5,9 +5,9 @@ import { ManyToOne, JoinColumn, } from 'typeorm'; -import { Transaccion } from 'src/transaccion/entities/transaccion.entity'; // ajusta la ruta -import { Kiosco } from 'src/kiosco/entities/kiosco.entity'; -import { PagoPatronato } from 'src/pago-patronato/entities/pago-patronato.entity'; +import { Transaccion } from 'src/database/Monedero/entities/transaccion.entity'; // ajusta la ruta +import { PagoPatronato } from 'src/database/Monedero/entities/pago-patronato.entity'; +import { Kiosco } from './kiosco.entity'; @Entity('PagoKiosco') export class PagoKiosco { diff --git a/src/pago-patronato/entities/pago-patronato.entity.ts b/src/database/Monedero/entities/pago-patronato.entity.ts similarity index 90% rename from src/pago-patronato/entities/pago-patronato.entity.ts rename to src/database/Monedero/entities/pago-patronato.entity.ts index 2ad24cb..1290876 100644 --- a/src/pago-patronato/entities/pago-patronato.entity.ts +++ b/src/database/Monedero/entities/pago-patronato.entity.ts @@ -1,4 +1,4 @@ -import { PagoKiosco } from 'src/pago-kiosco/entities/pago-kiosco.entity'; +import { PagoKiosco } from 'src/database/Monedero/entities/pago-kiosco.entity'; import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'; @Entity('PagoPatronato') diff --git a/src/persona/entities/persona.entity.ts b/src/database/Monedero/entities/persona.entity.ts similarity index 94% rename from src/persona/entities/persona.entity.ts rename to src/database/Monedero/entities/persona.entity.ts index 47e0556..af08507 100644 --- a/src/persona/entities/persona.entity.ts +++ b/src/database/Monedero/entities/persona.entity.ts @@ -1,4 +1,4 @@ -import { Transaccion } from 'src/transaccion/entities/transaccion.entity'; +import { Transaccion } from 'src/database/Monedero/entities/transaccion.entity'; import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm'; @Entity({ name: 'Persona' }) diff --git a/src/transaccion/entities/transaccion.entity.ts b/src/database/Monedero/entities/transaccion.entity.ts similarity index 73% rename from src/transaccion/entities/transaccion.entity.ts rename to src/database/Monedero/entities/transaccion.entity.ts index 544ab7e..855308e 100644 --- a/src/transaccion/entities/transaccion.entity.ts +++ b/src/database/Monedero/entities/transaccion.entity.ts @@ -6,10 +6,10 @@ import { JoinColumn, OneToMany, } from 'typeorm'; -import { Persona } from 'src/persona/entities/persona.entity'; // ajusta la ruta según tu estructura -import { AbonoTicket } from 'src/abono-ticket/entities/abono-ticket.entity'; -import { PagoKiosco } from 'src/pago-kiosco/entities/pago-kiosco.entity'; -import { NombreTransaccion } from 'src/nombre-transaccion/entities/nombre-transaccion.entity'; +import { Persona } from 'src/database/Monedero/entities/persona.entity'; // ajusta la ruta según tu estructura +import { AbonoTicket } from 'src/database/Monedero/entities/abono-ticket.entity'; +import { PagoKiosco } from 'src/database/Monedero/entities/pago-kiosco.entity'; +import { NombreTransaccion } from 'src/database/Monedero/entities/nombre-transaccion.entity'; @Entity('Transaccion') export class Transaccion { diff --git a/src/database/config/AT.config.ts b/src/database/config/AT.config.ts new file mode 100644 index 0000000..3b4e686 --- /dev/null +++ b/src/database/config/AT.config.ts @@ -0,0 +1,18 @@ +import { TypeOrmModuleAsyncOptions } from '@nestjs/typeorm'; +import { ConfigModule, ConfigService } from '@nestjs/config'; + +export const dbAT: TypeOrmModuleAsyncOptions = { + name: 'dbAT', + imports: [ConfigModule], + inject: [ConfigService], + useFactory: async (config: ConfigService) => ({ + type: 'mariadb', + host: config.get('DB_AT_HOST'), + port: config.get('DB_AT_PORT'), + username: config.get('DB_AT_USER'), + password: config.get('DB_AT_PASSWORD'), + database: config.get('DB_AT_NAME'), + entities: [], + synchronize: false, + }), +}; diff --git a/src/database/config/Monedero.config.ts b/src/database/config/Monedero.config.ts new file mode 100644 index 0000000..a3bf1de --- /dev/null +++ b/src/database/config/Monedero.config.ts @@ -0,0 +1,33 @@ +import { TypeOrmModuleAsyncOptions } from '@nestjs/typeorm'; +import { ConfigModule, ConfigService } from '@nestjs/config'; +import { AbonoTicket } from '../Monedero/entities/abono-ticket.entity'; +import { Kiosco } from '../Monedero/entities/kiosco.entity'; +import { NombreTransaccion } from '../Monedero/entities/nombre-transaccion.entity'; +import { PagoKiosco } from '../Monedero/entities/pago-kiosco.entity'; +import { PagoPatronato } from '../Monedero/entities/pago-patronato.entity'; +import { Persona } from '../Monedero/entities/persona.entity'; +import { Transaccion } from '../Monedero/entities/transaccion.entity'; + +export const dbMonedero: TypeOrmModuleAsyncOptions = { + name: 'dbMonedero', + imports: [ConfigModule], + inject: [ConfigService], + useFactory: async (config: ConfigService) => ({ + type: 'mariadb', + host: config.get('DB_MONEDERO_HOST'), + port: config.get('DB_MONEDERO_PORT'), + username: config.get('DB_MONEDERO_USER'), + password: config.get('DB_MONEDERO_PASS'), + database: config.get('DB_MONEDERO_NAME'), + entities: [ + AbonoTicket, + Kiosco, + NombreTransaccion, + PagoKiosco, + PagoPatronato, + Persona, + Transaccion, + ], + synchronize: false, + }), +}; diff --git a/src/abono-ticket/abono-ticket.controller.spec.ts b/src/modules/Monedero/abono-ticket/abono-ticket.controller.spec.ts similarity index 100% rename from src/abono-ticket/abono-ticket.controller.spec.ts rename to src/modules/Monedero/abono-ticket/abono-ticket.controller.spec.ts diff --git a/src/abono-ticket/abono-ticket.controller.ts b/src/modules/Monedero/abono-ticket/abono-ticket.controller.ts similarity index 100% rename from src/abono-ticket/abono-ticket.controller.ts rename to src/modules/Monedero/abono-ticket/abono-ticket.controller.ts diff --git a/src/abono-ticket/abono-ticket.module.ts b/src/modules/Monedero/abono-ticket/abono-ticket.module.ts similarity index 70% rename from src/abono-ticket/abono-ticket.module.ts rename to src/modules/Monedero/abono-ticket/abono-ticket.module.ts index fb8fac5..987ddb9 100644 --- a/src/abono-ticket/abono-ticket.module.ts +++ b/src/modules/Monedero/abono-ticket/abono-ticket.module.ts @@ -2,10 +2,10 @@ import { Module } from '@nestjs/common'; import { AbonoTicketService } from './abono-ticket.service'; import { AbonoTicketController } from './abono-ticket.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { AbonoTicket } from './entities/abono-ticket.entity'; +import { AbonoTicket } from '../../../database/Monedero/entities/abono-ticket.entity'; @Module({ - imports: [TypeOrmModule.forFeature([AbonoTicket])], + imports: [TypeOrmModule.forFeature([AbonoTicket], 'dbMonedero')], controllers: [AbonoTicketController], providers: [AbonoTicketService], exports: [AbonoTicketService], diff --git a/src/abono-ticket/abono-ticket.service.spec.ts b/src/modules/Monedero/abono-ticket/abono-ticket.service.spec.ts similarity index 100% rename from src/abono-ticket/abono-ticket.service.spec.ts rename to src/modules/Monedero/abono-ticket/abono-ticket.service.spec.ts diff --git a/src/abono-ticket/abono-ticket.service.ts b/src/modules/Monedero/abono-ticket/abono-ticket.service.ts similarity index 81% rename from src/abono-ticket/abono-ticket.service.ts rename to src/modules/Monedero/abono-ticket/abono-ticket.service.ts index e2d02ad..d35069c 100644 --- a/src/abono-ticket/abono-ticket.service.ts +++ b/src/modules/Monedero/abono-ticket/abono-ticket.service.ts @@ -1,14 +1,14 @@ import { Injectable, NotFoundException } from '@nestjs/common'; import { CreateAbonoTicketDto } from './dto/create-abono-ticket.dto'; -import { AbonoTicket } from './entities/abono-ticket.entity'; +import { AbonoTicket } from '../../../database/Monedero/entities/abono-ticket.entity'; import { Repository } from 'typeorm'; import { InjectRepository } from '@nestjs/typeorm'; -import { Transaccion } from 'src/transaccion/entities/transaccion.entity'; +import { Transaccion } from 'src/database/Monedero/entities/transaccion.entity'; @Injectable() export class AbonoTicketService { constructor( - @InjectRepository(AbonoTicket) + @InjectRepository(AbonoTicket, 'dbMonedero') private readonly abonoTicketRepository: Repository, ) {} diff --git a/src/abono-ticket/dto/create-abono-ticket.dto.ts b/src/modules/Monedero/abono-ticket/dto/create-abono-ticket.dto.ts similarity index 100% rename from src/abono-ticket/dto/create-abono-ticket.dto.ts rename to src/modules/Monedero/abono-ticket/dto/create-abono-ticket.dto.ts diff --git a/src/abono-ticket/dto/update-abono-ticket.dto.ts b/src/modules/Monedero/abono-ticket/dto/update-abono-ticket.dto.ts similarity index 100% rename from src/abono-ticket/dto/update-abono-ticket.dto.ts rename to src/modules/Monedero/abono-ticket/dto/update-abono-ticket.dto.ts diff --git a/src/kiosco/dto/create-kiosco.dto.ts b/src/modules/Monedero/kiosco/dto/create-kiosco.dto.ts similarity index 100% rename from src/kiosco/dto/create-kiosco.dto.ts rename to src/modules/Monedero/kiosco/dto/create-kiosco.dto.ts diff --git a/src/kiosco/dto/update-kiosco.dto.ts b/src/modules/Monedero/kiosco/dto/update-kiosco.dto.ts similarity index 100% rename from src/kiosco/dto/update-kiosco.dto.ts rename to src/modules/Monedero/kiosco/dto/update-kiosco.dto.ts diff --git a/src/kiosco/kiosco.controller.spec.ts b/src/modules/Monedero/kiosco/kiosco.controller.spec.ts similarity index 100% rename from src/kiosco/kiosco.controller.spec.ts rename to src/modules/Monedero/kiosco/kiosco.controller.spec.ts diff --git a/src/kiosco/kiosco.controller.ts b/src/modules/Monedero/kiosco/kiosco.controller.ts similarity index 100% rename from src/kiosco/kiosco.controller.ts rename to src/modules/Monedero/kiosco/kiosco.controller.ts diff --git a/src/kiosco/kiosco.module.ts b/src/modules/Monedero/kiosco/kiosco.module.ts similarity index 71% rename from src/kiosco/kiosco.module.ts rename to src/modules/Monedero/kiosco/kiosco.module.ts index 33f284a..d7279ef 100644 --- a/src/kiosco/kiosco.module.ts +++ b/src/modules/Monedero/kiosco/kiosco.module.ts @@ -2,10 +2,10 @@ import { Module } from '@nestjs/common'; import { KioscoService } from './kiosco.service'; import { KioscoController } from './kiosco.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { Kiosco } from './entities/kiosco.entity'; +import { Kiosco } from 'src/database/Monedero/entities/kiosco.entity'; @Module({ - imports: [TypeOrmModule.forFeature([Kiosco])], + imports: [TypeOrmModule.forFeature([Kiosco], 'dbMonedero')], controllers: [KioscoController], providers: [KioscoService], exports: [KioscoService], diff --git a/src/kiosco/kiosco.service.spec.ts b/src/modules/Monedero/kiosco/kiosco.service.spec.ts similarity index 100% rename from src/kiosco/kiosco.service.spec.ts rename to src/modules/Monedero/kiosco/kiosco.service.spec.ts diff --git a/src/kiosco/kiosco.service.ts b/src/modules/Monedero/kiosco/kiosco.service.ts similarity index 85% rename from src/kiosco/kiosco.service.ts rename to src/modules/Monedero/kiosco/kiosco.service.ts index baa5339..c966d5d 100644 --- a/src/kiosco/kiosco.service.ts +++ b/src/modules/Monedero/kiosco/kiosco.service.ts @@ -2,13 +2,13 @@ import { Injectable, NotFoundException } from '@nestjs/common'; import { CreateKioscoDto } from './dto/create-kiosco.dto'; import { UpdateKioscoDto } from './dto/update-kiosco.dto'; import { InjectRepository } from '@nestjs/typeorm'; -import { Kiosco } from './entities/kiosco.entity'; import { Repository } from 'typeorm'; +import { Kiosco } from 'src/database/Monedero/entities/kiosco.entity'; @Injectable() export class KioscoService { constructor( - @InjectRepository(Kiosco) + @InjectRepository(Kiosco, 'dbMonedero') private readonly KioscoRepository: Repository, ) {} findAll() { diff --git a/src/nombre-transaccion/dto/create-nombre-transaccion.dto.ts b/src/modules/Monedero/nombre-transaccion/dto/create-nombre-transaccion.dto.ts similarity index 100% rename from src/nombre-transaccion/dto/create-nombre-transaccion.dto.ts rename to src/modules/Monedero/nombre-transaccion/dto/create-nombre-transaccion.dto.ts diff --git a/src/nombre-transaccion/dto/update-nombre-transaccion.dto.ts b/src/modules/Monedero/nombre-transaccion/dto/update-nombre-transaccion.dto.ts similarity index 100% rename from src/nombre-transaccion/dto/update-nombre-transaccion.dto.ts rename to src/modules/Monedero/nombre-transaccion/dto/update-nombre-transaccion.dto.ts diff --git a/src/nombre-transaccion/nombre-transaccion.controller.spec.ts b/src/modules/Monedero/nombre-transaccion/nombre-transaccion.controller.spec.ts similarity index 100% rename from src/nombre-transaccion/nombre-transaccion.controller.spec.ts rename to src/modules/Monedero/nombre-transaccion/nombre-transaccion.controller.spec.ts diff --git a/src/nombre-transaccion/nombre-transaccion.controller.ts b/src/modules/Monedero/nombre-transaccion/nombre-transaccion.controller.ts similarity index 100% rename from src/nombre-transaccion/nombre-transaccion.controller.ts rename to src/modules/Monedero/nombre-transaccion/nombre-transaccion.controller.ts diff --git a/src/nombre-transaccion/nombre-transaccion.module.ts b/src/modules/Monedero/nombre-transaccion/nombre-transaccion.module.ts similarity index 71% rename from src/nombre-transaccion/nombre-transaccion.module.ts rename to src/modules/Monedero/nombre-transaccion/nombre-transaccion.module.ts index b52ed35..130600b 100644 --- a/src/nombre-transaccion/nombre-transaccion.module.ts +++ b/src/modules/Monedero/nombre-transaccion/nombre-transaccion.module.ts @@ -2,10 +2,10 @@ import { Module } from '@nestjs/common'; import { NombreTransaccionService } from './nombre-transaccion.service'; import { NombreTransaccionController } from './nombre-transaccion.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { NombreTransaccion } from './entities/nombre-transaccion.entity'; +import { NombreTransaccion } from 'src/database/Monedero/entities/nombre-transaccion.entity'; @Module({ - imports: [TypeOrmModule.forFeature([NombreTransaccion])], + imports: [TypeOrmModule.forFeature([NombreTransaccion], 'dbMonedero')], controllers: [NombreTransaccionController], providers: [NombreTransaccionService], exports: [NombreTransaccionService], diff --git a/src/nombre-transaccion/nombre-transaccion.service.spec.ts b/src/modules/Monedero/nombre-transaccion/nombre-transaccion.service.spec.ts similarity index 100% rename from src/nombre-transaccion/nombre-transaccion.service.spec.ts rename to src/modules/Monedero/nombre-transaccion/nombre-transaccion.service.spec.ts diff --git a/src/nombre-transaccion/nombre-transaccion.service.ts b/src/modules/Monedero/nombre-transaccion/nombre-transaccion.service.ts similarity index 83% rename from src/nombre-transaccion/nombre-transaccion.service.ts rename to src/modules/Monedero/nombre-transaccion/nombre-transaccion.service.ts index 10412b1..f60a834 100644 --- a/src/nombre-transaccion/nombre-transaccion.service.ts +++ b/src/modules/Monedero/nombre-transaccion/nombre-transaccion.service.ts @@ -1,13 +1,12 @@ import { Injectable, NotFoundException } from '@nestjs/common'; -import { CreateNombreTransaccionDto } from './dto/create-nombre-transaccion.dto'; import { InjectRepository } from '@nestjs/typeorm'; -import { NombreTransaccion } from './entities/nombre-transaccion.entity'; +import { NombreTransaccion } from 'src/database/Monedero/entities/nombre-transaccion.entity'; import { Repository } from 'typeorm'; @Injectable() export class NombreTransaccionService { constructor( - @InjectRepository(NombreTransaccion) + @InjectRepository(NombreTransaccion, 'dbMonedero') private readonly nombreTransaccionRepository: Repository, ) {} diff --git a/src/pago-kiosco/dto/create-pago-kiosco.dto.ts b/src/modules/Monedero/pago-kiosco/dto/create-pago-kiosco.dto.ts similarity index 100% rename from src/pago-kiosco/dto/create-pago-kiosco.dto.ts rename to src/modules/Monedero/pago-kiosco/dto/create-pago-kiosco.dto.ts diff --git a/src/pago-kiosco/pago-kiosco.controller.spec.ts b/src/modules/Monedero/pago-kiosco/pago-kiosco.controller.spec.ts similarity index 100% rename from src/pago-kiosco/pago-kiosco.controller.spec.ts rename to src/modules/Monedero/pago-kiosco/pago-kiosco.controller.spec.ts diff --git a/src/pago-kiosco/pago-kiosco.controller.ts b/src/modules/Monedero/pago-kiosco/pago-kiosco.controller.ts similarity index 100% rename from src/pago-kiosco/pago-kiosco.controller.ts rename to src/modules/Monedero/pago-kiosco/pago-kiosco.controller.ts diff --git a/src/pago-kiosco/pago-kiosco.module.ts b/src/modules/Monedero/pago-kiosco/pago-kiosco.module.ts similarity index 58% rename from src/pago-kiosco/pago-kiosco.module.ts rename to src/modules/Monedero/pago-kiosco/pago-kiosco.module.ts index 1467750..287311c 100644 --- a/src/pago-kiosco/pago-kiosco.module.ts +++ b/src/modules/Monedero/pago-kiosco/pago-kiosco.module.ts @@ -2,13 +2,13 @@ import { Module } from '@nestjs/common'; import { PagoKioscoService } from './pago-kiosco.service'; import { PagoKioscoController } from './pago-kiosco.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { PagoKiosco } from './entities/pago-kiosco.entity'; -import { KioscoModule } from 'src/kiosco/kiosco.module'; -import { TransaccionModule } from 'src/transaccion/transaccion.module'; +import { KioscoModule } from 'src/modules/Monedero/kiosco/kiosco.module'; +import { TransaccionModule } from 'src/modules/Monedero/transaccion/transaccion.module'; +import { PagoKiosco } from 'src/database/Monedero/entities/pago-kiosco.entity'; @Module({ imports: [ - TypeOrmModule.forFeature([PagoKiosco]), + TypeOrmModule.forFeature([PagoKiosco], 'dbMonedero'), KioscoModule, TransaccionModule, ], diff --git a/src/pago-kiosco/pago-kiosco.service.spec.ts b/src/modules/Monedero/pago-kiosco/pago-kiosco.service.spec.ts similarity index 100% rename from src/pago-kiosco/pago-kiosco.service.spec.ts rename to src/modules/Monedero/pago-kiosco/pago-kiosco.service.spec.ts diff --git a/src/pago-kiosco/pago-kiosco.service.ts b/src/modules/Monedero/pago-kiosco/pago-kiosco.service.ts similarity index 78% rename from src/pago-kiosco/pago-kiosco.service.ts rename to src/modules/Monedero/pago-kiosco/pago-kiosco.service.ts index 14afc05..663354e 100644 --- a/src/pago-kiosco/pago-kiosco.service.ts +++ b/src/modules/Monedero/pago-kiosco/pago-kiosco.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@nestjs/common'; import { CreatePagoKioscoDto } from './dto/create-pago-kiosco.dto'; import { InjectRepository } from '@nestjs/typeorm'; -import { PagoKiosco } from './entities/pago-kiosco.entity'; import { Repository } from 'typeorm'; -import { KioscoService } from 'src/kiosco/kiosco.service'; -import { TransaccionService } from 'src/transaccion/transaccion.service'; +import { KioscoService } from 'src/modules/Monedero/kiosco/kiosco.service'; +import { TransaccionService } from 'src/modules/Monedero/transaccion/transaccion.service'; +import { PagoKiosco } from 'src/database/Monedero/entities/pago-kiosco.entity'; @Injectable() export class PagoKioscoService { constructor( - @InjectRepository(PagoKiosco) + @InjectRepository(PagoKiosco, 'dbMonedero') private readonly pagoKioscoRepository: Repository, private readonly kioscoService: KioscoService, private readonly transaccionService: TransaccionService, diff --git a/src/pago-patronato/dto/create-pago-patronato.dto.ts b/src/modules/Monedero/pago-patronato/dto/create-pago-patronato.dto.ts similarity index 100% rename from src/pago-patronato/dto/create-pago-patronato.dto.ts rename to src/modules/Monedero/pago-patronato/dto/create-pago-patronato.dto.ts diff --git a/src/pago-patronato/dto/update-pago-patronato.dto.ts b/src/modules/Monedero/pago-patronato/dto/update-pago-patronato.dto.ts similarity index 100% rename from src/pago-patronato/dto/update-pago-patronato.dto.ts rename to src/modules/Monedero/pago-patronato/dto/update-pago-patronato.dto.ts diff --git a/src/pago-patronato/pago-patronato.controller.spec.ts b/src/modules/Monedero/pago-patronato/pago-patronato.controller.spec.ts similarity index 100% rename from src/pago-patronato/pago-patronato.controller.spec.ts rename to src/modules/Monedero/pago-patronato/pago-patronato.controller.spec.ts diff --git a/src/pago-patronato/pago-patronato.controller.ts b/src/modules/Monedero/pago-patronato/pago-patronato.controller.ts similarity index 100% rename from src/pago-patronato/pago-patronato.controller.ts rename to src/modules/Monedero/pago-patronato/pago-patronato.controller.ts diff --git a/src/pago-patronato/pago-patronato.module.ts b/src/modules/Monedero/pago-patronato/pago-patronato.module.ts similarity index 70% rename from src/pago-patronato/pago-patronato.module.ts rename to src/modules/Monedero/pago-patronato/pago-patronato.module.ts index 6384b1b..5397e3a 100644 --- a/src/pago-patronato/pago-patronato.module.ts +++ b/src/modules/Monedero/pago-patronato/pago-patronato.module.ts @@ -2,10 +2,10 @@ import { Module } from '@nestjs/common'; import { PagoPatronatoService } from './pago-patronato.service'; import { PagoPatronatoController } from './pago-patronato.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { PagoPatronato } from './entities/pago-patronato.entity'; +import { PagoPatronato } from '../../../database/Monedero/entities/pago-patronato.entity'; @Module({ - imports: [TypeOrmModule.forFeature([PagoPatronato])], + imports: [TypeOrmModule.forFeature([PagoPatronato], 'dbMonedero')], controllers: [PagoPatronatoController], providers: [PagoPatronatoService], exports: [PagoPatronatoService], diff --git a/src/pago-patronato/pago-patronato.service.spec.ts b/src/modules/Monedero/pago-patronato/pago-patronato.service.spec.ts similarity index 100% rename from src/pago-patronato/pago-patronato.service.spec.ts rename to src/modules/Monedero/pago-patronato/pago-patronato.service.spec.ts diff --git a/src/pago-patronato/pago-patronato.service.ts b/src/modules/Monedero/pago-patronato/pago-patronato.service.ts similarity index 81% rename from src/pago-patronato/pago-patronato.service.ts rename to src/modules/Monedero/pago-patronato/pago-patronato.service.ts index b047a83..5434225 100644 --- a/src/pago-patronato/pago-patronato.service.ts +++ b/src/modules/Monedero/pago-patronato/pago-patronato.service.ts @@ -2,13 +2,13 @@ import { Injectable } from '@nestjs/common'; import { CreatePagoPatronatoDto } from './dto/create-pago-patronato.dto'; import { UpdatePagoPatronatoDto } from './dto/update-pago-patronato.dto'; import { InjectRepository } from '@nestjs/typeorm'; -import { PagoPatronato } from './entities/pago-patronato.entity'; +import { PagoPatronato } from '../../../database/Monedero/entities/pago-patronato.entity'; import { Repository } from 'typeorm'; @Injectable() export class PagoPatronatoService { constructor( - @InjectRepository(PagoPatronato) + @InjectRepository(PagoPatronato, 'dbMonedero') private readonly pagoPatronatoRepository: Repository, ) {} diff --git a/src/persona/dto/create-persona.dto.ts b/src/modules/Monedero/persona/dto/create-persona.dto.ts similarity index 100% rename from src/persona/dto/create-persona.dto.ts rename to src/modules/Monedero/persona/dto/create-persona.dto.ts diff --git a/src/persona/dto/update-persona.dto.ts b/src/modules/Monedero/persona/dto/update-persona.dto.ts similarity index 100% rename from src/persona/dto/update-persona.dto.ts rename to src/modules/Monedero/persona/dto/update-persona.dto.ts diff --git a/src/persona/google-auth.guard.ts b/src/modules/Monedero/persona/google-auth.guard.ts similarity index 100% rename from src/persona/google-auth.guard.ts rename to src/modules/Monedero/persona/google-auth.guard.ts diff --git a/src/persona/google.strategy.ts b/src/modules/Monedero/persona/google.strategy.ts similarity index 100% rename from src/persona/google.strategy.ts rename to src/modules/Monedero/persona/google.strategy.ts diff --git a/src/persona/jwt.guard.ts b/src/modules/Monedero/persona/jwt.guard.ts similarity index 100% rename from src/persona/jwt.guard.ts rename to src/modules/Monedero/persona/jwt.guard.ts diff --git a/src/persona/jwt.strategy.ts b/src/modules/Monedero/persona/jwt.strategy.ts similarity index 100% rename from src/persona/jwt.strategy.ts rename to src/modules/Monedero/persona/jwt.strategy.ts diff --git a/src/persona/password.ts b/src/modules/Monedero/persona/password.ts similarity index 100% rename from src/persona/password.ts rename to src/modules/Monedero/persona/password.ts diff --git a/src/persona/persona.controller.spec.ts b/src/modules/Monedero/persona/persona.controller.spec.ts similarity index 100% rename from src/persona/persona.controller.spec.ts rename to src/modules/Monedero/persona/persona.controller.spec.ts diff --git a/src/persona/persona.controller.ts b/src/modules/Monedero/persona/persona.controller.ts similarity index 100% rename from src/persona/persona.controller.ts rename to src/modules/Monedero/persona/persona.controller.ts diff --git a/src/persona/persona.module.ts b/src/modules/Monedero/persona/persona.module.ts similarity index 88% rename from src/persona/persona.module.ts rename to src/modules/Monedero/persona/persona.module.ts index 87168b0..9507763 100644 --- a/src/persona/persona.module.ts +++ b/src/modules/Monedero/persona/persona.module.ts @@ -4,14 +4,14 @@ import { PersonaController } from './persona.controller'; import { PassportModule } from '@nestjs/passport'; import { ConfigModule, ConfigService } from '@nestjs/config'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { Persona } from './entities/persona.entity'; import { JwtModule } from '@nestjs/jwt'; import { GoogleStrategy } from './google.strategy'; import { JwtStrategy } from './jwt.strategy'; +import { Persona } from 'src/database/Monedero/entities/persona.entity'; @Module({ imports: [ - TypeOrmModule.forFeature([Persona]), + TypeOrmModule.forFeature([Persona], 'dbMonedero'), PassportModule.register({ defaultStrategy: 'jwt' }), JwtModule.registerAsync({ imports: [ConfigModule], diff --git a/src/persona/persona.service.spec.ts b/src/modules/Monedero/persona/persona.service.spec.ts similarity index 100% rename from src/persona/persona.service.spec.ts rename to src/modules/Monedero/persona/persona.service.spec.ts diff --git a/src/persona/persona.service.ts b/src/modules/Monedero/persona/persona.service.ts similarity index 96% rename from src/persona/persona.service.ts rename to src/modules/Monedero/persona/persona.service.ts index b5e2970..0761cba 100644 --- a/src/persona/persona.service.ts +++ b/src/modules/Monedero/persona/persona.service.ts @@ -2,12 +2,12 @@ import { Injectable, NotFoundException } from '@nestjs/common'; import { JwtService } from '@nestjs/jwt'; import { Repository } from 'typeorm'; import { InjectRepository } from '@nestjs/typeorm'; -import { Persona } from './entities/persona.entity'; +import { Persona } from 'src/database/Monedero/entities/persona.entity'; @Injectable() export class PersonaService { constructor( - @InjectRepository(Persona) + @InjectRepository(Persona, 'dbMonedero') private readonly personaRepository: Repository, private readonly jwtService: JwtService, ) {} diff --git a/src/transaccion/dto/create-transaccion.dto.ts b/src/modules/Monedero/transaccion/dto/create-transaccion.dto.ts similarity index 100% rename from src/transaccion/dto/create-transaccion.dto.ts rename to src/modules/Monedero/transaccion/dto/create-transaccion.dto.ts diff --git a/src/transaccion/transaccion.controller.spec.ts b/src/modules/Monedero/transaccion/transaccion.controller.spec.ts similarity index 100% rename from src/transaccion/transaccion.controller.spec.ts rename to src/modules/Monedero/transaccion/transaccion.controller.spec.ts diff --git a/src/transaccion/transaccion.controller.ts b/src/modules/Monedero/transaccion/transaccion.controller.ts similarity index 100% rename from src/transaccion/transaccion.controller.ts rename to src/modules/Monedero/transaccion/transaccion.controller.ts diff --git a/src/transaccion/transaccion.module.ts b/src/modules/Monedero/transaccion/transaccion.module.ts similarity index 57% rename from src/transaccion/transaccion.module.ts rename to src/modules/Monedero/transaccion/transaccion.module.ts index ea90e5b..bb10837 100644 --- a/src/transaccion/transaccion.module.ts +++ b/src/modules/Monedero/transaccion/transaccion.module.ts @@ -2,13 +2,13 @@ import { Module } from '@nestjs/common'; import { TransaccionService } from './transaccion.service'; import { TransaccionController } from './transaccion.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { Transaccion } from './entities/transaccion.entity'; -import { NombreTransaccionModule } from 'src/nombre-transaccion/nombre-transaccion.module'; -import { PersonaModule } from 'src/persona/persona.module'; +import { NombreTransaccionModule } from 'src/modules/Monedero/nombre-transaccion/nombre-transaccion.module'; +import { PersonaModule } from 'src/modules/Monedero/persona/persona.module'; +import { Transaccion } from 'src/database/Monedero/entities/transaccion.entity'; @Module({ imports: [ - TypeOrmModule.forFeature([Transaccion]), + TypeOrmModule.forFeature([Transaccion], 'dbMonedero'), NombreTransaccionModule, PersonaModule, ], diff --git a/src/transaccion/transaccion.service.spec.ts b/src/modules/Monedero/transaccion/transaccion.service.spec.ts similarity index 100% rename from src/transaccion/transaccion.service.spec.ts rename to src/modules/Monedero/transaccion/transaccion.service.spec.ts diff --git a/src/transaccion/transaccion.service.ts b/src/modules/Monedero/transaccion/transaccion.service.ts similarity index 81% rename from src/transaccion/transaccion.service.ts rename to src/modules/Monedero/transaccion/transaccion.service.ts index 8031260..ca0501a 100644 --- a/src/transaccion/transaccion.service.ts +++ b/src/modules/Monedero/transaccion/transaccion.service.ts @@ -1,15 +1,15 @@ import { Injectable, NotFoundException } from '@nestjs/common'; import { CreateTransaccionDto } from './dto/create-transaccion.dto'; import { InjectRepository } from '@nestjs/typeorm'; -import { Transaccion } from './entities/transaccion.entity'; +import { Transaccion } from '../../../database/Monedero/entities/transaccion.entity'; import { Repository } from 'typeorm'; -import { NombreTransaccionService } from 'src/nombre-transaccion/nombre-transaccion.service'; -import { PersonaService } from 'src/persona/persona.service'; +import { NombreTransaccionService } from 'src/modules/Monedero/nombre-transaccion/nombre-transaccion.service'; +import { PersonaService } from 'src/modules/Monedero/persona/persona.service'; @Injectable() export class TransaccionService { constructor( - @InjectRepository(Transaccion) + @InjectRepository(Transaccion, 'dbMonedero') private readonly transaccionRepository: Repository, private readonly nombreTransaccionService: NombreTransaccionService, private readonly personaService: PersonaService, diff --git a/src/operations/operations.controller.ts b/src/operations/operations.controller.ts index e24c863..b0da152 100644 --- a/src/operations/operations.controller.ts +++ b/src/operations/operations.controller.ts @@ -1,7 +1,7 @@ import { Controller, Post, Body, UseGuards, Req } from '@nestjs/common'; import { OperationsService } from './operations.service'; import { abonoKioscoDto } from './dto/create-operation.dto'; -import { JwtAuthGuard } from 'src/persona/jwt.guard'; +import { JwtAuthGuard } from 'src/modules/Monedero/persona/jwt.guard'; @Controller('operations') export class OperationsController { diff --git a/src/operations/operations.module.ts b/src/operations/operations.module.ts index d045f84..7341b65 100644 --- a/src/operations/operations.module.ts +++ b/src/operations/operations.module.ts @@ -1,10 +1,10 @@ import { Module } from '@nestjs/common'; import { OperationsService } from './operations.service'; 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 { PagoPatronatoModule } from 'src/pago-patronato/pago-patronato.module'; +import { TransaccionModule } from 'src/modules/Monedero/transaccion/transaccion.module'; +import { PersonaModule } from 'src/modules/Monedero/persona/persona.module'; +import { PagoPatronatoModule } from 'src/modules/Monedero/pago-patronato/pago-patronato.module'; +import { PagoKioscoModule } from 'src/modules/Monedero/pago-kiosco/pago-kiosco.module'; @Module({ imports: [ diff --git a/src/operations/operations.service.ts b/src/operations/operations.service.ts index eb9c16a..323bbb6 100644 --- a/src/operations/operations.service.ts +++ b/src/operations/operations.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; -import { PagoKioscoService } from 'src/pago-kiosco/pago-kiosco.service'; -import { PersonaService } from 'src/persona/persona.service'; -import { TransaccionService } from 'src/transaccion/transaccion.service'; +import { PagoKioscoService } from 'src/modules/Monedero/pago-kiosco/pago-kiosco.service'; +import { PersonaService } from 'src/modules/Monedero/persona/persona.service'; +import { TransaccionService } from 'src/modules/Monedero/transaccion/transaccion.service'; @Injectable() export class OperationsService {