new structure whit other database

This commit is contained in:
2025-10-23 08:35:55 -06:00
parent ec1dd723d2
commit f66de9458b
65 changed files with 123 additions and 80 deletions
+15 -22
View File
@@ -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<string>('DB_HOST'),
port: config.get<number>('DB_PORT'),
username: config.get<string>('DB_USER'),
password: config.get<string>('DB_PASS'),
database: config.get<string>('DB_NAME'),
entities: [__dirname + '/**/*.entity{.ts,.js}'],
synchronize: false,
}),
}),
TypeOrmModule.forRootAsync(dbAT),
TypeOrmModule.forRootAsync(dbMonedero),
PersonaModule,
TransaccionModule,
AbonoTicketModule,
@@ -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 {
@@ -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')
@@ -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')
@@ -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 {
@@ -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')
@@ -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' })
@@ -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 {
+18
View File
@@ -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<string>('DB_AT_HOST'),
port: config.get<number>('DB_AT_PORT'),
username: config.get<string>('DB_AT_USER'),
password: config.get<string>('DB_AT_PASSWORD'),
database: config.get<string>('DB_AT_NAME'),
entities: [],
synchronize: false,
}),
};
+33
View File
@@ -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<string>('DB_MONEDERO_HOST'),
port: config.get<number>('DB_MONEDERO_PORT'),
username: config.get<string>('DB_MONEDERO_USER'),
password: config.get<string>('DB_MONEDERO_PASS'),
database: config.get<string>('DB_MONEDERO_NAME'),
entities: [
AbonoTicket,
Kiosco,
NombreTransaccion,
PagoKiosco,
PagoPatronato,
Persona,
Transaccion,
],
synchronize: false,
}),
};
@@ -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],
@@ -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<AbonoTicket>,
) {}
@@ -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],
@@ -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<Kiosco>,
) {}
findAll() {
@@ -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],
@@ -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<NombreTransaccion>,
) {}
@@ -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,
],
@@ -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<PagoKiosco>,
private readonly kioscoService: KioscoService,
private readonly transaccionService: TransaccionService,
@@ -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],
@@ -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<PagoPatronato>,
) {}
@@ -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],
@@ -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<Persona>,
private readonly jwtService: JwtService,
) {}
@@ -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,
],
@@ -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<Transaccion>,
private readonly nombreTransaccionService: NombreTransaccionService,
private readonly personaService: PersonaService,
+1 -1
View File
@@ -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 {
+4 -4
View File
@@ -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: [
+3 -3
View File
@@ -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 {