From c626302257122e4eea4024fe74e23cf592dbc767 Mon Sep 17 00:00:00 2001 From: Mr Swift Date: Thu, 22 Aug 2024 14:21:59 +0330 Subject: [PATCH] Fix serial checker bug --- server/controllers/serialsExelController.js | 2 +- server/database.js | 2 +- server/plugins/asanServiceSerialChecker.js | 28 ++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/controllers/serialsExelController.js b/server/controllers/serialsExelController.js index 3cdefb9..a1f9555 100644 --- a/server/controllers/serialsExelController.js +++ b/server/controllers/serialsExelController.js @@ -101,7 +101,7 @@ module.exports.checkSerial = [ try { const { serial, type, g } = req.body const serialStatus = await serialChecker(serial, type, g) -console.log("s"); + console.log(serialStatus); let okMsg if (type === 'guaranteeSerial') okMsg = serialStatus diff --git a/server/database.js b/server/database.js index d59a6d9..0f6c099 100644 --- a/server/database.js +++ b/server/database.js @@ -5,7 +5,7 @@ const inHostUrl = 'mongodb://root:KPTt76tImNBBMm4Kor8QA9gB@asan-service:27017/as const outHostUrl = 'mongodb://root:KPTt76tImNBBMm4Kor8QA9gB@hotaka.liara.cloud:33794/asanserv_database?authSource=admin' const init = ()=>{ try { - mongoose.connect(outHostUrl, { + mongoose.connect(inHostUrl, { useNewUrlParser: true, useUnifiedTopology: true, useFindAndModify: false, diff --git a/server/plugins/asanServiceSerialChecker.js b/server/plugins/asanServiceSerialChecker.js index 396fcbd..c736c09 100644 --- a/server/plugins/asanServiceSerialChecker.js +++ b/server/plugins/asanServiceSerialChecker.js @@ -3,15 +3,15 @@ const readXlsxFile = require('read-excel-file/node') const guaranteeSerialsPath = './static/uploads/serials' const productSerialsPath = './static/uploads/serials_products' -const serialChecker = (serial, type = 'guaranteeSerial', g = 1) => { +const serialChecker = (serial, type = 'guaranteeSerial', g = 1) => { return new Promise(async (resolve, reject) => { let exelsPath; if (type === 'guaranteeSerial') exelsPath = guaranteeSerialsPath + `/${g}`; if (type === 'orginality') exelsPath = productSerialsPath + `/${g}`; -console.log("s"); - - const lowerSerial = serial.toString().toLowerCase().trim().replace("-","") + + + const lowerSerial = serial.toString().toLowerCase().trim().replace("-", "") try { const serialFiles = await fs.readdirSync(exelsPath); @@ -19,20 +19,20 @@ console.log("s"); // eslint-disable-next-line prefer-promise-reject-errors reject("این کد در سامانه موجود نیست") } + + serialFiles.forEach(async (file, i) => { - if(file.split('.').some(item => ['xlsx', 'xltx', 'xlsm', 'xlsb'].includes(item))){ + if (file.split('.').some(item => ['xlsx', 'xltx', 'xlsm', 'xlsb'].includes(item))) { const exelFile = await readXlsxFile(`${exelsPath}/${file}`); -console.log(file); + console.log(file); for (const row of exelFile) { - console.log(row); - - // eslint-disable-next-line eqeqeq - if ((row[1].toString()).toLowerCase().trim() == lowerSerial) { - resolve(row[2]); - return; // Serial found, exit loop - } - + // eslint-disable-next-line eqeqeq + if ((row[1].toString()).toLowerCase().trim() == lowerSerial) { + resolve(row[2]); + return; // Serial found, exit loop + } + } if ((serialFiles.length - 1) <= i) { // eslint-disable-next-line prefer-promise-reject-errors