diff --git a/src/carrera/carrera.module.ts b/src/carrera/carrera.module.ts index 5707bd3..e57e605 100644 --- a/src/carrera/carrera.module.ts +++ b/src/carrera/carrera.module.ts @@ -3,9 +3,10 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { CarreraController } from './carrera.controller'; import { CarreraService } from './carrera.service'; import { Carrera } from './entity/carrera.entity'; +import { InstitucionModule } from '../institucion/institucion.module'; @Module({ - imports: [TypeOrmModule.forFeature([Carrera])], + imports: [TypeOrmModule.forFeature([Carrera]), InstitucionModule], controllers: [CarreraController], providers: [CarreraService], exports: [CarreraService], diff --git a/src/carrera/carrera.service.ts b/src/carrera/carrera.service.ts index fd19233..573172a 100644 --- a/src/carrera/carrera.service.ts +++ b/src/carrera/carrera.service.ts @@ -3,20 +3,13 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { Carrera } from './entity/carrera.entity'; import { InstitucionService } from '../institucion/institucion.service'; -import { Institucion } from 'src/institucion/entity/institucion.entity'; @Injectable() export class CarreraService { constructor( @InjectRepository(Carrera) private repository: Repository, private institucionService: InstitucionService, - ) { } - - findAllByIdInstitucion(id_institucion: number) { - return this.institucionService - .findById(id_institucion) - .then((institucion) => this.repository.find({institucion})) - } + ) {} findById(id_carrera: number) { return this.repository.findOne({ id_carrera }).then((carrera) => { @@ -24,4 +17,12 @@ export class CarreraService { return carrera; }); } + + findAllByIdInstitucion(id_institucion: number) { + return this.institucionService + .findById(id_institucion) + .then((institucion) => this.repository.find({institucion})) + } + + } diff --git a/src/carrito/carrito.service.ts b/src/carrito/carrito.service.ts index b1ad50e..86d7a62 100644 --- a/src/carrito/carrito.service.ts +++ b/src/carrito/carrito.service.ts @@ -26,6 +26,10 @@ export class CarritoService { await this.institucionTipoCarritoService.findByIdTipoCarito( id_tipo_carrito, ); + const carrito = this.repository.findAndCount({ modulo, tipoCarrito }) + .then((existeCarrito) => { + console.log(existeCarrito) + }) const nuevoCarrito = this.repository.create({ modulo, tipoCarrito, diff --git a/src/hora-excepcion/hora-excepcion.module.ts b/src/hora-excepcion/hora-excepcion.module.ts index a69ad94..c751451 100644 --- a/src/hora-excepcion/hora-excepcion.module.ts +++ b/src/hora-excepcion/hora-excepcion.module.ts @@ -3,10 +3,12 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { HoraExcepcionController } from './hora-excepcion.controller'; import { HoraExcepcionService } from './hora-excepcion.service'; import { HoraExcepcion } from './entity/hora-excepcion.entity'; +import { InstitucionDiaModule } from '../institucion-dia/institucion-dia.module' @Module({ - imports: [TypeOrmModule.forFeature([HoraExcepcion])], + imports: [TypeOrmModule.forFeature([HoraExcepcion]), InstitucionDiaModule], controllers: [HoraExcepcionController], providers: [HoraExcepcionService], + exports: [HoraExcepcionService] }) export class HoraExcepcionModule {} diff --git a/src/hora-excepcion/hora-excepcion.service.ts b/src/hora-excepcion/hora-excepcion.service.ts index a777570..6d7114c 100644 --- a/src/hora-excepcion/hora-excepcion.service.ts +++ b/src/hora-excepcion/hora-excepcion.service.ts @@ -7,8 +7,7 @@ import { InstitucionDiaService } from '../institucion-dia/institucion-dia.servic @Injectable() export class HoraExcepcionService { constructor( - @InjectRepository(HoraExcepcion) - private repository: Repository, + @InjectRepository(HoraExcepcion) private repository: Repository, private institucionDiaService: InstitucionDiaService, ) { } diff --git a/src/institucion-dia/institucion-dia.module.ts b/src/institucion-dia/institucion-dia.module.ts index 88c0e88..ac3c1e6 100644 --- a/src/institucion-dia/institucion-dia.module.ts +++ b/src/institucion-dia/institucion-dia.module.ts @@ -10,5 +10,6 @@ import { InstitucionModule } from '../institucion/institucion.module'; imports: [TypeOrmModule.forFeature([Dia, InstitucionDia]), InstitucionModule], controllers: [InstitucionDiaController], providers: [InstitucionDiaService], + exports: [InstitucionDiaService] }) export class InstitucionDiaModule {}