diff --git a/src/alumno/entities/student.entity.ts b/src/alumno/entities/student.entity.ts index 7db9cbc..942fe16 100644 --- a/src/alumno/entities/student.entity.ts +++ b/src/alumno/entities/student.entity.ts @@ -1,4 +1,5 @@ import { AlumnoSancion } from 'src/alumno_sancion/entities/alumno_sancion.entity'; +import { Carrera } from 'src/carrera/entities/carrera.entity'; import { DetalleServicio } from 'src/detalle_servicio/entities/detalle_servicio.entity'; import { Recibo } from 'src/recibo/entities/recibo.entity'; import { @@ -10,23 +11,6 @@ import { PrimaryGeneratedColumn, } from 'typeorm'; -@Entity({ name: 'carrera' }) -export class Carrera { - @PrimaryGeneratedColumn({ name: 'id_carrera', type: 'int', unsigned: true }) - id_carrera: number; - - @Column({ - name: 'carrera', - type: 'varchar', - length: 100, - nullable: false, - }) - carrera: string; - - @OneToMany(() => Alumno, (student) => student.carrera) - estudiantes: Alumno[]; -} - @Entity({ name: 'alumno' }) export class Alumno { @PrimaryGeneratedColumn({ name: 'id_cuenta', type: 'int', unsigned: true }) diff --git a/src/alumno/student.module.ts b/src/alumno/student.module.ts index 7caa938..6e5195a 100644 --- a/src/alumno/student.module.ts +++ b/src/alumno/student.module.ts @@ -2,13 +2,14 @@ import { Module } from '@nestjs/common'; import { AlumnoService } from './student.service'; import { AlumnoController } from './student.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { Alumno, Carrera } from './entities/student.entity'; +import { Alumno } from './entities/student.entity'; +import { Carrera } from 'src/carrera/entities/carrera.entity'; @Module({ - imports: [TypeOrmModule.forFeature([Alumno,Carrera])], + imports: [TypeOrmModule.forFeature([Alumno, Carrera])], controllers: [AlumnoController], providers: [AlumnoService], - exports:[AlumnoService] + exports: [AlumnoService], }) export class AlumnoModule {} -//IO \ No newline at end of file +//IO diff --git a/src/alumno/student.service.ts b/src/alumno/student.service.ts index db40687..ab6e2de 100644 --- a/src/alumno/student.service.ts +++ b/src/alumno/student.service.ts @@ -1,8 +1,9 @@ import { Injectable, NotFoundException } from '@nestjs/common'; import { CreateStudentDto } from './dto/create-student.dto'; -import { Alumno, Carrera } from './entities/student.entity'; +import { Alumno } from './entities/student.entity'; import { EntityManager, Repository } from 'typeorm'; import { InjectRepository } from '@nestjs/typeorm'; +import { Carrera } from 'src/carrera/entities/carrera.entity'; @Injectable() export class AlumnoService { diff --git a/src/app.module.ts b/src/app.module.ts index a64bbdc..f1f5a31 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -9,7 +9,7 @@ import { Perfil, User } from './user/entities/user.entity'; import { DetalleServicioModule } from './detalle_servicio/detalle_servicio.module'; import { PeriodoModule } from './periodo/periodo.module'; import { ServicioModule } from './servicio/servicio.module'; -import { Alumno, Carrera } from './alumno/entities/student.entity'; +import { Alumno } from './alumno/entities/student.entity'; import { DetalleServicio } from './detalle_servicio/entities/detalle_servicio.entity'; import { Periodo } from './periodo/entities/periodo.entity'; import { Servicio } from './servicio/entities/servicio.entity'; @@ -23,8 +23,13 @@ import { ReciboModule } from './recibo/recibo.module'; import { MesaModule } from './mesa/mesa.module'; import { Mesa } from './mesa/entities/mesa.entity'; import { AlumnoInscritoModule } from './alumno_inscrito/alumno_inscrito.module'; -import { AlumnoInscrito, Plataforma } from './alumno_inscrito/entities/alumno_inscrito.entity'; +import { + AlumnoInscrito, + Plataforma, +} from './alumno_inscrito/entities/alumno_inscrito.entity'; import { EquipoModule } from './equipo/equipo.module'; +import { CarreraModule } from './carrera/carrera.module'; +import { Carrera } from './carrera/entities/carrera.entity'; @Module({ imports: [ @@ -71,6 +76,7 @@ import { EquipoModule } from './equipo/equipo.module'; MesaModule, AlumnoInscritoModule, EquipoModule, + CarreraModule, ], controllers: [AppController], providers: [AppService], diff --git a/src/carrera/carrera.controller.ts b/src/carrera/carrera.controller.ts new file mode 100644 index 0000000..4c3cfd3 --- /dev/null +++ b/src/carrera/carrera.controller.ts @@ -0,0 +1,12 @@ +import { Controller, Get } from '@nestjs/common'; +import { CarreraService } from './carrera.service'; + +@Controller('carrera') +export class CarreraController { + constructor(private readonly carreraService: CarreraService) {} + + @Get() + findAll() { + return this.carreraService.findAll(); + } +} diff --git a/src/carrera/carrera.module.ts b/src/carrera/carrera.module.ts new file mode 100644 index 0000000..9aa7fbf --- /dev/null +++ b/src/carrera/carrera.module.ts @@ -0,0 +1,12 @@ +import { Module } from '@nestjs/common'; +import { CarreraService } from './carrera.service'; +import { CarreraController } from './carrera.controller'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { Carrera } from './entities/carrera.entity'; + +@Module({ + imports: [TypeOrmModule.forFeature([Carrera])], + controllers: [CarreraController], + providers: [CarreraService], +}) +export class CarreraModule {} diff --git a/src/carrera/carrera.service.ts b/src/carrera/carrera.service.ts new file mode 100644 index 0000000..7813d16 --- /dev/null +++ b/src/carrera/carrera.service.ts @@ -0,0 +1,15 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Carrera } from './entities/carrera.entity'; +import { Repository } from 'typeorm'; + +@Injectable() +export class CarreraService { + constructor( + @InjectRepository(Carrera) + private readonly carreraRepository: Repository, + ) {} + findAll() { + return this.carreraRepository.find(); + } +} diff --git a/src/carrera/dto/create-carrera.dto.ts b/src/carrera/dto/create-carrera.dto.ts new file mode 100644 index 0000000..0015231 --- /dev/null +++ b/src/carrera/dto/create-carrera.dto.ts @@ -0,0 +1 @@ +export class CreateCarreraDto {} diff --git a/src/carrera/dto/update-carrera.dto.ts b/src/carrera/dto/update-carrera.dto.ts new file mode 100644 index 0000000..c6d55b1 --- /dev/null +++ b/src/carrera/dto/update-carrera.dto.ts @@ -0,0 +1,4 @@ +import { PartialType } from '@nestjs/mapped-types'; +import { CreateCarreraDto } from './create-carrera.dto'; + +export class UpdateCarreraDto extends PartialType(CreateCarreraDto) {} diff --git a/src/carrera/entities/carrera.entity.ts b/src/carrera/entities/carrera.entity.ts new file mode 100644 index 0000000..917e1ff --- /dev/null +++ b/src/carrera/entities/carrera.entity.ts @@ -0,0 +1,19 @@ +import { Alumno } from 'src/alumno/entities/student.entity'; +import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm'; + +@Entity({ name: 'carrera' }) +export class Carrera { + @PrimaryGeneratedColumn({ name: 'id_carrera', type: 'int', unsigned: true }) + id_carrera: number; + + @Column({ + name: 'carrera', + type: 'varchar', + length: 100, + nullable: false, + }) + carrera: string; + + @OneToMany(() => Alumno, (student) => student.carrera) + estudiantes: Alumno[]; +}