From 41b465b25c496e0ec7860d6390c166bf38138879 Mon Sep 17 00:00:00 2001 From: DanielRamirezGe Date: Tue, 21 Sep 2021 22:50:30 -0500 Subject: [PATCH] se configuro las peticones a la base de datos de profesores --- .env | 11 ++++ .env.example | 11 ++++ app.js | 27 ++++++---- conf/baseProfesoresDSC.js | 12 ++--- conf/connection.js | 40 +++++---------- conf/sistemas.js | 16 +++--- data_base/values.sql | 4 +- package-lock.json | 14 +++++ package.json | 1 + public/comprobante-5.pdf | Bin 692635 -> 692305 bytes public/comprobante-7.pdf | Bin 692727 -> 692823 bytes routes/busca_profesor.js | 14 +++-- routes/datos_proyecto_1.js | 2 +- routes/pdf.js | 57 ++++++++++----------- routes/sqlQuery/queryBdRedInvestigacion.js | 12 +++++ 15 files changed, 133 insertions(+), 88 deletions(-) create mode 100644 .env create mode 100644 .env.example create mode 100644 routes/sqlQuery/queryBdRedInvestigacion.js diff --git a/.env b/.env new file mode 100644 index 0000000..7f95a44 --- /dev/null +++ b/.env @@ -0,0 +1,11 @@ +DB_HOST_RED_INVESTIGACION = 'localhost' +DB_USER_RED_INVESTIGACION = 'root' +DB_PASS_RED_INVESTIGACION = 'georgechido' +DB_NAME_RED_INVESTIGACION = 'red_de_investigacion' +PORT= 3000 + + +DB_HOST_PROFESORES = '132.248.80.194' +DB_USER_PROFESORES = 'des_george' +DB_PASS_PROFESORES = 'emp140 ' +DB_NAME_PROFESORES = 'Betelgeuse_dat_prof' \ No newline at end of file diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..323ba1b --- /dev/null +++ b/.env.example @@ -0,0 +1,11 @@ +DB_HOST_RED_INVESTIGACION = '132.248.80.194' +DB_USER_RED_INVESTIGACION = 'usr_red_de_investigacion' +DB_PASS_RED_INVESTIGACION = 'Inv3st1G4' +DB_NAME_RED_INVESTIGACION = 'P_orion_red_de_investigacion' +PORT= 3000 + + +DB_HOST_PROFESORES = '132.248.80.194' +DB_USER_PROFESORES = 'des_george' +DB_PASS_PROFESORES = 'emp140 ' +DB_NAME_PROFESORES = 'Betelgeuse_dat_prof' \ No newline at end of file diff --git a/app.js b/app.js index 03bf59c..3f224ef 100644 --- a/app.js +++ b/app.js @@ -1,14 +1,19 @@ -var express = require('express'); -var app = express(); -var cors = require('cors'); -app.use(cors()); -app.get('/', function(req, res) { - res.send('that is works'); -}); +const express = require('express') +const app = express(); +const cors = require('cors') -app.use(express.json()) // for parsing application/json +require('dotenv').config() + +app.get('/', function(req, res) { + res.send('Api de red de investigacion') +}) + +app.use(cors()) +app.use(express.json()) app.use(express.urlencoded({ extended: true })) app.use(require('./routes/index.js')) -app.listen(3062, function() { - console.log('Example app listening on port 3062!'); -}); \ No newline at end of file + + +app.listen(process.env.PORT, () => { + console.log('Api escuchando el puerto', process.env.PORT) +}) \ No newline at end of file diff --git a/conf/baseProfesoresDSC.js b/conf/baseProfesoresDSC.js index 20afad3..4f8a66f 100644 --- a/conf/baseProfesoresDSC.js +++ b/conf/baseProfesoresDSC.js @@ -1,18 +1,18 @@ var mysql = require('mysql') const mysqlConnection = mysql.createConnection({ - host: '132.248.80.194', - user: 'des_george', - database: 'Betelgeuse_dat_prof', - password: 'emp140 ' + host: process.env.DB_HOST_PROFESORES, + user: process.env.DB_USER_PROFESORES, + password: process.env.DB_PASS_PROFESORES, + database: process.env.DB_NAME_PROFESORES }) mysqlConnection.connect((err) => { if (err) { - console.log('No se pudo conectar a la base') + console.log('No se pudo conectar a la base de datos de profesores') console.log(err) } - else console.log('base conectada') + else console.log('Base de profesores conectada') }) diff --git a/conf/connection.js b/conf/connection.js index 0fc9268..cf27e80 100644 --- a/conf/connection.js +++ b/conf/connection.js @@ -1,32 +1,18 @@ var mysql = require('mysql'); -const connection = mysql.createConnection({ - host: '132.248.80.194', - user: 'usr_red_de_investigacion', - password: 'Inv3st1G4', - database: 'P_orion_red_de_investigacion' +const mysqlConnection = mysql.createConnection({ + host: process.env.DB_HOST_RED_INVESTIGACION, + user: process.env.DB_USER_RED_INVESTIGACION, + password: process.env.DB_PASS_RED_INVESTIGACION, + database: process.env.DB_NAME_RED_INVESTIGACION }); -module.exports = connection; +mysqlConnection.connect((err) => { + if (err) { + console.log('No se pudo conectar a la base de Red de investigacion') + console.log(err) + } + else console.log('Base de Red de investigacion conectada') +}) - -// usr_red_de_investigacion -// Inv3st1G4 - - - - -// var mysql = require('mysql'); -// const connection = mysql.createConnection({ -// host: '132.248.80.194', -// user: 'usr_red_de_investigacion', -// password: 'Inv3st1G4', -// database: 'P_orion_red_de_investigacion' -// }); - -// module.exports = connection; - - - -// usr_red_de_investigacion -// Inv3st1G4 \ No newline at end of file +module.exports = mysqlConnection diff --git a/conf/sistemas.js b/conf/sistemas.js index e5a45d5..7148476 100644 --- a/conf/sistemas.js +++ b/conf/sistemas.js @@ -1,9 +1,9 @@ -var mysql = require('mysql'); -const connection = mysql.createConnection({ - host: '132.248.180.228', - user: 'USR_REDINVESTIGACION', - database: 'BASESDSI', - password: '67NHA*Y' -}); +// var mysql = require('mysql'); +// const connection = mysql.createConnection({ +// host: '132.248.180.228', +// user: 'USR_REDINVESTIGACION', +// database: 'BASESDSI', +// password: '67NHA*Y' +// }); -module.exports = connection; \ No newline at end of file +// module.exports = connection; \ No newline at end of file diff --git a/data_base/values.sql b/data_base/values.sql index d158d18..2f25503 100644 --- a/data_base/values.sql +++ b/data_base/values.sql @@ -1,6 +1,6 @@ insert into usuario values(null, "UIM_User", "$2b$10$wjy7AE.5r0KY83llKguY4e51cvyl643IdNnCGeaOnJ/IwoBJdoKsS"); -- Red_Investigacion_UiM* -insert into usuario values(null, `cedetec_User`, "$2b$10$9UYHmMoTBjnB736dS7/Eleygisp0tIVuMPv5XhMuNMfzdjk3YjFcK"); +insert into usuario values(null, "cedetec_User", "$2b$10$9UYHmMoTBjnB736dS7/Eleygisp0tIVuMPv5XhMuNMfzdjk3YjFcK"); -- cedetec_red_* @@ -28,7 +28,7 @@ insert into entidades values(null, "Otra facultad de la UNAM"); insert into entidades values(null, "Otra universidad de Mexico"); insert into entidades values (null, "Universidad en el extrajero"); -insert into entidades values (null, "Asociaciín civil"); +insert into entidades values (null, "Asociación civil"); insert into entidades values (null, "Dependencia federal"); insert into entidades values (null, "Dependencia municipal"); insert into entidades values (null, "Otra entidad"); diff --git a/package-lock.json b/package-lock.json index a784c50..b6c9276 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "bcrypt": "^3.0.7", "cors": "^2.8.5", + "dotenv": "^10.0.0", "express": "^4.17.1", "mssql": "^6.0.1", "mysql": "^2.18.1", @@ -846,6 +847,14 @@ "resolved": "https://registry.npmjs.org/dfa/-/dfa-1.2.0.tgz", "integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==" }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, "node_modules/duplexer2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", @@ -3792,6 +3801,11 @@ "resolved": "https://registry.npmjs.org/dfa/-/dfa-1.2.0.tgz", "integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==" }, + "dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" + }, "duplexer2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", diff --git a/package.json b/package.json index fe508b0..0ae450c 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "dependencies": { "bcrypt": "^3.0.7", "cors": "^2.8.5", + "dotenv": "^10.0.0", "express": "^4.17.1", "mssql": "^6.0.1", "mysql": "^2.18.1", diff --git a/public/comprobante-5.pdf b/public/comprobante-5.pdf index 94636420353b4383f7c9b856e2cfa974225bdb4b..a2519f2faf0a83b40ddc53b9c80354f365fbe2d4 100755 GIT binary patch delta 2240 zcmah}4K&o-7B?p3AEWe8Tyuw-n#?WpJ^#Otp-d<;Qih~_jFAX2LzGO7kutfyV!Xnr zn<*K&A)^$!O~_4zuH^e8imRzeiuA@?Z{7Fqb=P`(t-bcyzq8LizkT*O=h9DR&kD>= z319+M0bH<5pe9hS&`@;{jVA!ZFudrg0N4P>gG3Q50?-#}CjtoGuGC?Q*8MS$S)ILl z=!~*cTM@!a+Y?v|*_9+zC8HYi<(v7OBP5QNoI8ed^mi)zJUi>S+wOq8pCKsC-!y&O zGQRt(Y`7-H3E^(JGv_1Ld12l%s&>A5Zgp|ceK|RMMk4yzx2j`1n9iczG)a{r;GkbE-{7sE&N|PemO7Q@ zCwv8rdHkNqRE1*5rg!f9YM*{F*S5N?6so(c0DSD0@rP@QHGNeIN6U%Y0!RJ0LBvf* zmsOukDfw~hyOKj>fejJc=`(ILlC)EXKUu^TD8Ml@^gPp5}v()_i!l7@zZ)oA2h9p z#i%p}5aibNO)xPxR-ciPtv#^%-HqwfO~nz%Q-&qY-w%OK1MEPaEys>Iu6ZfFH!$rV zpWeLFQf)dNbGmLDA;+Sn=FlE9+8s5-Ohe{LWG>JBnF-^mW`6XUF{!$PXJ|{#8ZLZi z5q{bU`bB^JA+OYxY5Pnc!sRPpsAFGh>|1l#T)$8|v8n5pradsSntI43HU8wZx1MND zKg<(enRntv<_7D5lAkr*o#5Sj5tlZbHjloSudTZGx$hMERjc{Oc@up(qNuNG(@>%c zIv`<^=c&4xlrc2vBOys(OkSPS8N(_5`^3VIAM)1p`d%9;5cYV#cq|@BcWwN2e%!iz zgU2=YK9~D%>W^eGS3l{yFn*g)IdN&+E5TRddbH>FhQgyI&b%}+vn9K!|CD8LD|?~n zLEC~^cX6k!Obgj%Ar2_eFdoGQ^HLZj@OFw1??8#nno;n?I_X}U-4@q;LVNM1#(4F^ ze03Y0BFRdTrQ3?jWQ54J{hm)qv00AsU`ot$V-ur0r4*yq5yK_|@%qQUkZhvK6e~l! z^17gK*xT!$H80)D5``OH4!M@Kw_fz#U*}+eIS~H7r2?hf{UG7lx?$XIww>waeoc1a zTHZxO_P3Hp(7GM^-Yt{pA|H32HE{4LeAu(# z9r{5kOTwDxNgWjDLnd;3>T@|5#^kYQGaC81>w}@UUpL=2mc4qu+1C;&)~QbD+!4CW z6OBzOL)X!2hi^r^Q)4TeW6AEdhd;!ln1@Qu4-B!(Yc-}n)9fKu-ZeKc~ z3Oflk<-_%hH9s15$;#ZX)Oqg8y%j2)6$aJ9FJ8610kFdYINV6KU+Cf}+&>t=ld@9* zJrPO>fa?h;9LfzacVlzHqas;s4hm2FH$tQR5ls}u34wk3i;;_~t*iiZXLi^jZV-w9 z68`uMwRn#*YF*?wt@=;2?FUZ{*t{RJw}`UkpVlri^0)1rh<UmfQcla_59bsByx^D(0iDj`fWfW;OQo9C>3|Bj~V~UWt5`RWXwnG&c({ zk(~4vY2aWe=Lpmu_Sirg6zjYLGauZyFk$U`p(s9QOYbzrlvYSnD=96p(YcI0OE3SR zjv2My{9XFY2i^{rUe_|C@8kteCq{kvvG8}P{bqmD0?L0*6XQy^cRI}7Bmz?atS;Sx zfFs~>5J72(5Q*xwNdyxDdN|j}@PH^5I}(LoT&L`powA?YaHUWEAOCQ87~PM{M&UtG zdkVl2!5uVoMV>zbzrjc%^Hjh_6%VDaGE3UxprO>|O4XEYaR8Q^!5|qm0w~uNg{1$@7OfH^3(>!h@1wXc@TlTWD=whmyiL;q@@^%sJzL4CIjJ?5(FV=2|);lU(AR8Qzg*f zR05GnplBftz#mb@FZOE(9kt&I2l^8NC=|$_O$G665{pD4<8XfdAd!d<#IZ;a4fX#+ e4gkuR$>I7%a$_RdfdB=1OEbsfuGp` delta 2571 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 diff --git a/routes/busca_profesor.js b/routes/busca_profesor.js index d8fb920..935127f 100644 --- a/routes/busca_profesor.js +++ b/routes/busca_profesor.js @@ -41,9 +41,17 @@ app.get('/busca_profesor', async(req, res) => { try{ let getProfesoresQuery = `SELECT * FROM Profesor;` let getProfesoresResponse = await query(getProfesoresQuery).then(getProfesoresResponse =>{ - console.log(getProfesoresResponse) - res.status(200).json({error: false, msj: 'Exito al obtener la respuesta', data: getProfesoresResponse}) - return + let diferentsRfcDicctionary = {} + let profesorData = [] + getProfesoresResponse.map(profesor =>{ + if(typeof diferentsRfcDicctionary[profesor.RFC] === 'undefined'){ + profesorData.push(profesor) + diferentsRfcDicctionary[profesor.RFC] = 'true' + } + }) + + res.status(200).json({error: false, msj: 'Exito al obtener la respuesta', data: profesorData}) + return }).catch(err =>{ console.log(err) res.status(400).json({error: false, msj: 'Ocurrio un error al traer los datos del profesor', desc: err}) diff --git a/routes/datos_proyecto_1.js b/routes/datos_proyecto_1.js index 640f85b..a585da4 100644 --- a/routes/datos_proyecto_1.js +++ b/routes/datos_proyecto_1.js @@ -30,7 +30,7 @@ app.post('/datos_proyecto_1', async(req, res) => { if (req.body.nombre_proyecto == undefined || req.body.rfc == undefined || req.body.nombre_responsable == undefined || req.body.disciplina == undefined || req.body.objetivo_general == undefined || req.body.campo_conocimiento == undefined || req.body.linea_investigacion == undefined || req.body.objetivo_particular == undefined) { - res.status(400).json({ error: true, msj: 'No estan los datos que requiere la appi' }); + res.status(400).json({ error: true, msj: 'No estan los datos que requiere la Api' }); return; } diff --git a/routes/pdf.js b/routes/pdf.js index e129fc1..8ba8c42 100644 --- a/routes/pdf.js +++ b/routes/pdf.js @@ -7,14 +7,9 @@ const express = require('express'); var app = express(); const sql = require('mssql') -function query(consulta) { - return new Promise(function(resolve, reject) { - connection.query(`${consulta}`, (error, results, files) => { - if (error) reject(error); - resolve(results); - }); - }) -} +const queryBdProfesores = require('./sqlQuery/queryBdProfesores') +const query = require('./sqlQuery/queryBdRedInvestigacion') + @@ -24,12 +19,8 @@ let g_pdf = async function hacer(id_proyecto) { const doc = new PDFDocument({ size: 'A4' }); doc.pipe(fs.createWriteStream(__dirname + `/../public/comprobante-${id}.pdf`)); - - console.log("el id proyetco en pdf= ", id); - - let inicio = 120; var datetime = new Date(); var anio = new Date(); @@ -75,23 +66,29 @@ let g_pdf = async function hacer(id_proyecto) { doc.font('Times-Roman').moveDown().fontSize(10).text(`Nombre del profesor: ${ datos.nombre_responsable }`, sang); try { - let pass = "67NHA*Y"; - // make sure that any items are correctly URL encoded in the connection string - await sql.connect(`mssql://USR_REDINVESTIGACION:${pass}@132.248.180.228/DB_ARES`) - const result = await sql.query `EXEC DB_ARES.dbo.SPD_CONSULTA_DATOS_X_PROFESOR_RED_INVESTIGACION ${datos.rfc_responsable};` - // console.log("sss"); - // console.log(result.recordsets); - console.log("datos ", datos.rfc_responsable, ' ', result.recordsets[0][0]); - let base = result.recordsets[0][0]; - doc.font('Times-Roman').moveDown().fontSize(10).text(`Numero de trabajador: ${ base.Numero_Trabajador } RFC: ${ base.Rfc }`, sang); - doc.font('Times-Roman').moveDown().fontSize(10).text(`Categoria: ${ base.Categoria }`, sang); - doc.font('Times-Roman').moveDown().fontSize(10).text(`Adscripcion: ${ base.Adscripcion }`, sang); - doc.font('Times-Roman').moveDown().fontSize(10).text(`Nivel maximo de estudios: ${ base['Nivel maximo de estudios'] }`, sang); - doc.font('Times-Roman').moveDown().fontSize(10).text(`Telefono de oficina: ${ base['Tel. oficina'] } Extensión: ${ base['Extensión'] }`, sang); - doc.font('Times-Roman').moveDown().fontSize(10).text(`Telefono particular: ${ base.Particular } Celular: ${ base.Celular }`, sang); - doc.font('Times-Roman').moveDown().fontSize(10).text(`Correo institucional: ${ base['Correo Institucional'] } `, sang); - doc.font('Times-Roman').moveDown().fontSize(10).text(`Correo personal: ${ base['Correo Personal'] } `, sang); - doc.font('Times-Roman').moveDown().fontSize(10).text(`Espacio fisico: ${ base.EspacioFisico } Edificio: ${base.Edificio}`, sang); + // let pass = "67NHA*Y"; + // codigo comentado porque anteriormente se hacia esta coneccion con anabel + // await sql.connect(`mssql://USR_REDINVESTIGACION:${pass}@132.248.180.228/DB_ARES`) + // const result = await sql.query `EXEC DB_ARES.dbo.SPD_CONSULTA_DATOS_X_PROFESOR_RED_INVESTIGACION ${datos.rfc_responsable};` + //console.log("datos ", datos.rfc_responsable, ' ', result.recordsets[0][0]); + //let base = result.recordsets[0][0]; + + + let queryGetProfesor = `SELECT * FROM Profesor WHERE RFC='${datos.rfc_responsable}';` + let responseGetProfesor = await queryBdProfesores(queryGetProfesor) + console.log(datos.rfc_responsable) + responseGetProfesor = responseGetProfesor[0] + + + doc.font('Times-Roman').moveDown().fontSize(10).text(`Numero de trabajador: ${ responseGetProfesor.NumTrabajador } RFC: ${ responseGetProfesor.RFC }`, sang); + doc.font('Times-Roman').moveDown().fontSize(10).text(`Categoria: ${ responseGetProfesor.Nombramiento }`, sang); + doc.font('Times-Roman').moveDown().fontSize(10).text(`Adscripcion: ${ responseGetProfesor.Adscripcion }`, sang); + doc.font('Times-Roman').moveDown().fontSize(10).text(`Nivel maximo de estudios: ${ responseGetProfesor.GradoMaximo }`, sang); + doc.font('Times-Roman').moveDown().fontSize(10).text(`Telefono de oficina: ${ responseGetProfesor.TelOficina } Extensión: ${ responseGetProfesor.Extension }`, sang); + doc.font('Times-Roman').moveDown().fontSize(10).text(`Telefono particular: ${ responseGetProfesor.Particular } Celular: ${ responseGetProfesor.Celular }`, sang); + doc.font('Times-Roman').moveDown().fontSize(10).text(`Correo institucional: ${ responseGetProfesor.CorreoInstitucional } `, sang); + doc.font('Times-Roman').moveDown().fontSize(10).text(`Correo personal: ${ responseGetProfesor.CorreoPersonal } `, sang); + doc.font('Times-Roman').moveDown().fontSize(10).text(`Espacio fisico: ${ responseGetProfesor.EspacioFisico } Edificio: ${responseGetProfesor.Edificio}`, sang); } catch (err) { console.log(err); @@ -339,6 +336,6 @@ let g_pdf = async function hacer(id_proyecto) { doc.end(); - return "acabo papa"; + return } module.exports = g_pdf; \ No newline at end of file diff --git a/routes/sqlQuery/queryBdRedInvestigacion.js b/routes/sqlQuery/queryBdRedInvestigacion.js new file mode 100644 index 0000000..f5de14e --- /dev/null +++ b/routes/sqlQuery/queryBdRedInvestigacion.js @@ -0,0 +1,12 @@ +const connection = require('../../conf/connection') + +function query(consulta) { + return new Promise(function(resolve, reject) { + connection.query(`${consulta}`, (error, results, files) => { + if (error) reject(error); + resolve(results); + }); + }) +} + +module.exports = query \ No newline at end of file