diff --git a/src/app.module.ts b/src/app.module.ts index dae2cf4..fd39777 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -44,7 +44,6 @@ import { Contacto } from './contacto/entity/contacto.entity'; import { Equipo } from './equipo/entity/equipo.entity'; import { EquipoEvento } from './equipo-evento/entity/equipo_evento.entity'; import { EquipoMiembro } from './equipo-miembro/entity/equipo_miembro.entity'; -import { SybaseModule } from './sybase/sybase.module'; @Module({ imports: [ @@ -89,17 +88,6 @@ import { SybaseModule } from './sybase/sybase.module'; synchronize: true, }), }), - SybaseModule.forRootAsync({ - inject: [ConfigService], - useFactory: (configService: ConfigService) => { - return { - host: configService.get('DB_HOST_DSC'), - database: configService.get('DB_NAME_DSC'), - username: configService.get('DB_USER_DSC'), - password: configService.get('DB_PASS_DSC'), - }; - }, - }), EventosModule, ParticipanteModule, EventoParticipanteModule, diff --git a/src/config/db.ts b/src/config/db.ts deleted file mode 100644 index b6a612f..0000000 --- a/src/config/db.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { Injectable } from '@nestjs/common'; -import * as mysql from 'mysql2/promise'; - -@Injectable() -export class MysqlService { - private mysqlPool: mysql.Pool; - private mysqlConnection: mysql.Connection; - private mysqlConnectionDscConfirmation: mysql.Connection; - - constructor() { -/* this.mysqlPool = mysql.createPool({ - connectionLimit: 20, - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASS, - database: process.env.DB_NAME, - }); - - this.mysqlConnection = mysql.createConnection({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASS, - database: process.env.DB_NAME, - }); - - this.mysqlConnectionDscConfirmation = mysql.createPool({ - connectionLimit: 20, - host: process.env.DB_HOST_DSC, - user: process.env.DB_USER_DSC, - password: process.env.DB_PASS_DSC, - database: process.env.DB_NAME_DSC, - }); */ - - /* this.mysqlConnection.connect((err) => { - if (err) console.log(err); - else console.log('base conectada'); - }); */ - } - - getMysqlConnection(): mysql.Connection { - return this.mysqlConnection; - } - - getMysqlPool(): mysql.Pool { - return this.mysqlPool; - } - - getMysqlConnectionDscConfirmation(): mysql.Connection { - return this.mysqlConnectionDscConfirmation; - } -} \ No newline at end of file diff --git a/src/inscripcion-dsc/inscripcion-dsc.controller.ts b/src/inscripcion-dsc/inscripcion-dsc.controller.ts index fbecd37..85a14e8 100644 --- a/src/inscripcion-dsc/inscripcion-dsc.controller.ts +++ b/src/inscripcion-dsc/inscripcion-dsc.controller.ts @@ -16,21 +16,13 @@ export class InscripcionDscController { async confirmacionDsc(@Body() body: any) { const { accountNumber } = body; -/* this.inscripcionService - .userVerification({ accountNumber }) - .then((res) => { - console.log(res); - }) - .catch((err) => { - return(err) - }); */ + const verificado = await this.inscripcionService.userVerification(accountNumber) + console.log(verificado) - try { + /* try { const userVerificationResponse = - await this.inscripcionService.userVerification({ - accountNumber, - }); - console.log(userVerificationResponse) + await this.inscripcionService.userVerification(accountNumber); + console.log(userVerificationResponse); if (userVerificationResponse.length === 0) { return { error: true, @@ -64,11 +56,6 @@ export class InscripcionDscController { msj: `No se pudo realizar la confirmación del usuario`, desc: `${err}`, }; - } + } */ } - - /* @Get(":id") - getUsuarioById(@Param('id', ParseIntPipe)id: number){ - - } */ } diff --git a/src/inscripcion-dsc/inscripcion-dsc.service.ts b/src/inscripcion-dsc/inscripcion-dsc.service.ts index b89674c..fbbd72e 100644 --- a/src/inscripcion-dsc/inscripcion-dsc.service.ts +++ b/src/inscripcion-dsc/inscripcion-dsc.service.ts @@ -1,13 +1,32 @@ import { Injectable } from '@nestjs/common'; -import { SybaseService } from 'src/sybase/sybase.service'; @Injectable() export class InscripcionDscService { - constructor(private sybaseService: SybaseService) {} + async userVerification(accountNumber: string): Promise { - async userVerification(data: { accountNumber: string }): Promise { - const { accountNumber } = data; - /* console.log(accountNumber) */ + const mysql = require('mysql2'); + + const connection = mysql.createConnection({ + host: process.env.DB_HOST_DSC, + user: process.env.DB_USER_DSC, + password: process.env.DB_PASS_DSC, + database: process.env.DB_NAME_DSC, + }); + + const userInformationQuery = `SELECT A.id_cuenta, nombre, if(AI.platica=true,1,0) as confirmacion FROM alumno A + JOIN alumno_inscrito AI ON (A.id_cuenta = AI.id_cuenta) + JOIN periodo P ON (P.id_periodo = AI.id_periodo) + WHERE A.id_cuenta = "${accountNumber}" and P.activo=true`; + + console.log(userInformationQuery); + + connection.connect(); + connection.query(userInformationQuery, function (error, results, fields) { + if (error) throw error; + console.log('The solution is: ', results); + }); + connection.end(); + /* try { @@ -32,7 +51,7 @@ export class InscripcionDscService { } catch (error) { throw error; - } + } */ } validarNumeroCuenta = (numeroCuenta) => { @@ -41,6 +60,15 @@ export class InscripcionDscService { }; async userConfirmation(data: { accountNumber: string }): Promise { + const mysql = require('mysql2'); + + const connection = mysql.createConnection({ + host: process.env.DB_HOST_DSC, + user: process.env.DB_USER_DSC, + password: process.env.DB_PASS_DSC, + database: process.env.DB_NAME_DSC, + }); + const { accountNumber } = data; try { @@ -53,7 +81,7 @@ export class InscripcionDscService { WHERE id_cuenta="${accountNumber}" and id_periodo=(SELECT id_periodo FROM periodo WHERE activo=true)`; try { - const responseUserConfirmation = await this.sybaseService.queryDsc( + const responseUserConfirmation = await connection.query( userConfirmationQuery, ); return responseUserConfirmation; diff --git a/src/sybase/sybase.config.ts b/src/sybase/sybase.config.ts deleted file mode 100644 index 46ecc65..0000000 --- a/src/sybase/sybase.config.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface SybaseConfig { - - database: string; - - host: string; - - password: string; - - username: string; - } \ No newline at end of file diff --git a/src/sybase/sybase.module-definition.ts b/src/sybase/sybase.module-definition.ts deleted file mode 100644 index 0e4a1c6..0000000 --- a/src/sybase/sybase.module-definition.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { ConfigurableModuleBuilder } from '@nestjs/common'; -import { SybaseConfig } from './sybase.config'; - -export const { ConfigurableModuleClass, MODULE_OPTIONS_TOKEN } = - new ConfigurableModuleBuilder() - .setClassMethodName('forRoot') - .build(); diff --git a/src/sybase/sybase.module.ts b/src/sybase/sybase.module.ts deleted file mode 100644 index 7a4be12..0000000 --- a/src/sybase/sybase.module.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Global, Module } from '@nestjs/common'; -import { ConfigurableModuleClass } from './sybase.module-definition'; -import { SybaseService } from './sybase.service'; - -@Global() -@Module({ providers: [SybaseService], exports: [SybaseService] }) -export class SybaseModule extends ConfigurableModuleClass {} diff --git a/src/sybase/sybase.service.ts b/src/sybase/sybase.service.ts deleted file mode 100644 index e96657d..0000000 --- a/src/sybase/sybase.service.ts +++ /dev/null @@ -1,35 +0,0 @@ -import * as Sybase from 'sybase'; -import { - Inject, - Injectable, - InternalServerErrorException, -} from '@nestjs/common'; -import { SybaseConfig } from './sybase.config'; -import { MODULE_OPTIONS_TOKEN } from './sybase.module-definition'; - -@Injectable() -export class SybaseService { - private db; - - constructor(@Inject(MODULE_OPTIONS_TOKEN) private options: SybaseConfig) { - this.db = new Sybase( - options.host, - options.database, - options.username, - options.password, - ); - } - - queryDsc(consulta: string): Promise { - return new Promise((resolve, reject) => { - this.db.query(consulta, (err, data) => { - console.log(consulta); - if (err) { - reject(err); - } else { - resolve(data); - } - }); - }); - } -}