From 08d196a2fcd00f3b34c7e0af50bff265884d93dd Mon Sep 17 00:00:00 2001 From: TioSam77 Date: Tue, 18 Jun 2024 13:14:31 -0600 Subject: [PATCH] S --- package-lock.json | 11 ++++++---- package.json | 2 +- src/Profesor/entities/profesor.entity.ts | 2 +- .../entities/adscripcion.entity.ts | 2 +- src/app.module.ts | 20 +++++++++---------- src/asignatura/entities/asignatura.entity.ts | 4 ++-- .../asignatura_carrera_profesor.entity.ts | 2 +- src/carrera/entities/carrera.entity.ts | 4 ++-- src/categoria/entities/categoria.entity.ts | 2 +- .../entities/datos_academicos.entity.ts | 2 +- src/edificio/entities/edificio.entity.ts | 2 +- .../entities/lineas_investigacion.entity.ts | 2 +- .../entities/proyectos_academicos.entity.ts | 2 +- .../entities/tipo_usuario.entity.ts | 2 +- src/users/entities/user.entity.ts | 2 +- 15 files changed, 32 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 49c1408..4b92ece 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "mysql": "^2.18.1", - "mysql2": "^3.10.0", + "mysql2": "^3.10.1", "passport": "^0.7.0", "passport-jwt": "^4.0.1", "reflect-metadata": "^0.2.2", @@ -1893,6 +1893,7 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/@nestjs/config/-/config-3.2.2.tgz", "integrity": "sha512-vGICPOui5vE6kPz1iwQ7oCnp3qWgqxldPmBQ9onkVoKlBtyc83KJCr7CjuVtf4OdovMAVcux1d8Q6jglU2ZphA==", + "license": "MIT", "dependencies": { "dotenv": "16.4.5", "dotenv-expand": "10.0.0", @@ -2056,6 +2057,7 @@ "version": "10.0.2", "resolved": "https://registry.npmjs.org/@nestjs/typeorm/-/typeorm-10.0.2.tgz", "integrity": "sha512-H738bJyydK4SQkRCTeh1aFBxoO1E9xdL/HaLGThwrqN95os5mEyAtK7BLADOS+vldP4jDZ2VQPLj4epWwRqCeQ==", + "license": "MIT", "dependencies": { "uuid": "9.0.1" }, @@ -7126,9 +7128,10 @@ } }, "node_modules/mysql2": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.10.0.tgz", - "integrity": "sha512-qx0mfWYt1DpTPkw8mAcHW/OwqqyNqBLBHvY5IjN8+icIYTjt6znrgYJ+gxqNNRpVknb5Wc/gcCM4XjbCR0j5tw==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.10.1.tgz", + "integrity": "sha512-6zo1T3GILsXMCex3YEu7hCz2OXLUarxFsxvFcUHWMpkPtmZLeTTWgRdc1gWyNJiYt6AxITmIf9bZDRy/jAfWew==", + "license": "MIT", "dependencies": { "denque": "^2.1.0", "generate-function": "^2.3.1", diff --git a/package.json b/package.json index 3f0306f..91ce9fa 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "mysql": "^2.18.1", - "mysql2": "^3.10.0", + "mysql2": "^3.10.1", "passport": "^0.7.0", "passport-jwt": "^4.0.1", "reflect-metadata": "^0.2.2", diff --git a/src/Profesor/entities/profesor.entity.ts b/src/Profesor/entities/profesor.entity.ts index 260251c..3da992f 100644 --- a/src/Profesor/entities/profesor.entity.ts +++ b/src/Profesor/entities/profesor.entity.ts @@ -16,7 +16,7 @@ import { AsignaturaCarreraProfesor } from '../../asignatura_carrera_profesor/ent @Entity() export class Profesor { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_profesor: number; @Column({ type: 'int', length: 11, nullable: false }) diff --git a/src/adscripcion/entities/adscripcion.entity.ts b/src/adscripcion/entities/adscripcion.entity.ts index 542b9cd..3fb6f0a 100644 --- a/src/adscripcion/entities/adscripcion.entity.ts +++ b/src/adscripcion/entities/adscripcion.entity.ts @@ -3,7 +3,7 @@ import {Profesor} from "../../Profesor/entities/profesor.entity"; @Entity() export class Adscripcion { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_adscripcion: number; @Column({ type: 'varchar', length: 150, nullable: false }) diff --git a/src/app.module.ts b/src/app.module.ts index 9f1d884..95d8f59 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -5,7 +5,7 @@ import { AppService } from './app.service'; import { AuthModule } from './auth/auth.module'; import { TypeOrmModule } from '@nestjs/typeorm'; import { UsersModule } from './users/users.module'; -import { User } from "./users/entities/user.entity"; +import { User } from './users/entities/user.entity'; import { ProfesorModule } from './profesor/profesor.module'; import { Profesor } from './profesor/entities/profesor.entity'; @@ -18,17 +18,17 @@ import { Profesor } from './profesor/entities/profesor.entity'; isGlobal: true, }), TypeOrmModule.forRootAsync({ - imports: [ConfigModule,AuthModule,UsersModule,], + imports: [ConfigModule, AuthModule, UsersModule], inject: [ConfigService], - useFactory: async (configservice: ConfigService) => ({ + useFactory: async (configService: ConfigService) => ({ type: 'mariadb', - host: configservice.get('DB_HOST'), - port: configservice.get('DB_PORT'), - username: configservice.get('DB_USER'), - password: configservice.get('DB_PASSWORD'), - database: configservice.get('DB_DATABASE'), - entities: [User,Profesor], - synchronize:true, + host: 'localhost', + port: parseInt(configService.get('DB_PORT'), 10), + username: configService.get('DB_USER'), + password: configService.get('DB_PASSWORD'), + database: configService.get('DB_DATABASE'), + entities: [User, Profesor], + synchronize: true, }), }), ProfesorModule, diff --git a/src/asignatura/entities/asignatura.entity.ts b/src/asignatura/entities/asignatura.entity.ts index e28fee1..1dc63e7 100644 --- a/src/asignatura/entities/asignatura.entity.ts +++ b/src/asignatura/entities/asignatura.entity.ts @@ -1,10 +1,10 @@ -import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'; +import { Entity, PrimaryColumn, Column, OneToMany } from 'typeorm'; import { AsignaturaCarreraProfesor } from "../../asignatura_carrera_profesor/entities/asignatura_carrera_profesor.entity"; @Entity() export class Asignatura { - @PrimaryGeneratedColumn() + @PrimaryColumn() id_asignatura: number; @Column({ type: 'varchar', length: 50, nullable: false }) diff --git a/src/asignatura_carrera_profesor/entities/asignatura_carrera_profesor.entity.ts b/src/asignatura_carrera_profesor/entities/asignatura_carrera_profesor.entity.ts index 6aa690e..0c7d3cd 100644 --- a/src/asignatura_carrera_profesor/entities/asignatura_carrera_profesor.entity.ts +++ b/src/asignatura_carrera_profesor/entities/asignatura_carrera_profesor.entity.ts @@ -5,7 +5,7 @@ import { Carrera } from "../../Carrera/entities/carrera.entity"; @Entity() export class AsignaturaCarreraProfesor { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_profesor: number; @PrimaryColumn({ type: 'int', length: 11, nullable: false }) diff --git a/src/carrera/entities/carrera.entity.ts b/src/carrera/entities/carrera.entity.ts index 0b70e72..d9dd6d2 100644 --- a/src/carrera/entities/carrera.entity.ts +++ b/src/carrera/entities/carrera.entity.ts @@ -1,10 +1,10 @@ -import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'; +import { Entity, PrimaryColumn, Column, OneToMany } from 'typeorm'; import { AsignaturaCarreraProfesor } from "../../asignatura_carrera_profesor/entities/asignatura_carrera_profesor.entity"; @Entity() export class Carrera { - @PrimaryGeneratedColumn() + @PrimaryColumn({ type: 'int', nullable: false }) id_carrera: number; @Column({ type: 'varchar', length: 150, nullable: false }) diff --git a/src/categoria/entities/categoria.entity.ts b/src/categoria/entities/categoria.entity.ts index cd4ba98..432252f 100644 --- a/src/categoria/entities/categoria.entity.ts +++ b/src/categoria/entities/categoria.entity.ts @@ -3,7 +3,7 @@ import { Profesor } from '../../Profesor/entities/profesor.entity'; @Entity() export class Categoria { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_categoria: number; @Column({ type: 'varchar', length: 256, nullable: false }) diff --git a/src/datos_academicos/entities/datos_academicos.entity.ts b/src/datos_academicos/entities/datos_academicos.entity.ts index d3268b5..5226e04 100644 --- a/src/datos_academicos/entities/datos_academicos.entity.ts +++ b/src/datos_academicos/entities/datos_academicos.entity.ts @@ -3,7 +3,7 @@ import { Profesor } from '../../Profesor/entities/profesor.entity'; @Entity({ name: 'datos_academicos' }) export class DatosAcademicos { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_datos: number; @Column({ type: 'int', nullable: false }) diff --git a/src/edificio/entities/edificio.entity.ts b/src/edificio/entities/edificio.entity.ts index e7ab9eb..ebbc4ec 100644 --- a/src/edificio/entities/edificio.entity.ts +++ b/src/edificio/entities/edificio.entity.ts @@ -3,7 +3,7 @@ import { Profesor } from "../../Profesor/entities/profesor.entity"; @Entity() export class Edificio { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_edificio: number; @Column({ type: 'varchar', length: 256, nullable: false }) diff --git a/src/lineas_investigacion/entities/lineas_investigacion.entity.ts b/src/lineas_investigacion/entities/lineas_investigacion.entity.ts index 4c89ab2..0ccf51b 100644 --- a/src/lineas_investigacion/entities/lineas_investigacion.entity.ts +++ b/src/lineas_investigacion/entities/lineas_investigacion.entity.ts @@ -4,7 +4,7 @@ import { Profesor } from "../../Profesor/entities/profesor.entity"; @Entity({ name: 'lineas_investigacion' }) export class LineasInvestigacion { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_linea_inv: number; @Column({ type: 'int', nullable: false }) diff --git a/src/proyectos_academicos/entities/proyectos_academicos.entity.ts b/src/proyectos_academicos/entities/proyectos_academicos.entity.ts index 12d9ca5..f13e524 100644 --- a/src/proyectos_academicos/entities/proyectos_academicos.entity.ts +++ b/src/proyectos_academicos/entities/proyectos_academicos.entity.ts @@ -4,7 +4,7 @@ import { Profesor } from "../../Profesor/entities/profesor.entity"; @Entity({ name: 'proyectos_academicos' }) export class ProyectosAcademicos { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_proyecto: number; @Column({ type: 'int', nullable: false }) diff --git a/src/tipo_usuario/entities/tipo_usuario.entity.ts b/src/tipo_usuario/entities/tipo_usuario.entity.ts index e6d38f8..bc18d56 100644 --- a/src/tipo_usuario/entities/tipo_usuario.entity.ts +++ b/src/tipo_usuario/entities/tipo_usuario.entity.ts @@ -3,7 +3,7 @@ import { User } from '../../users/entities/user.entity'; @Entity({ name: 'tipo_usuario' }) export class TipoUsuario { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_tipo_usuario: number; @Column({ type: 'varchar', length: 30, nullable: false }) diff --git a/src/users/entities/user.entity.ts b/src/users/entities/user.entity.ts index bf53505..f89350f 100644 --- a/src/users/entities/user.entity.ts +++ b/src/users/entities/user.entity.ts @@ -4,7 +4,7 @@ import { TipoUsuario } from "../../tipo_usuario/entities/tipo_usuario.entity"; @Entity({ name: 'usuario' }) export class User { - @PrimaryColumn({ type: 'int', length: 11, nullable: false }) + @PrimaryColumn({ type: 'int', nullable: false }) id_usuario: number; @Column({ type: 'int', nullable: false })