diff --git a/db/selectShelving.js b/db/selectShelving.js new file mode 100644 index 0000000..fe006a8 --- /dev/null +++ b/db/selectShelving.js @@ -0,0 +1,11 @@ +const con = require('./connect'); + +function shelvingExist(shelving, callback) { + const consSql = `SELECT * FROM vn.shelving WHERE code = ?`; + con.query(consSql, shelving, function(err, result, fields) { + callback(null, result); + }); +} + +exports.shelvingExist = shelvingExist; + diff --git a/methods/bindShelvingTag.js b/methods/bindShelvingTag.js index b359ff9..edfbf0b 100644 --- a/methods/bindShelvingTag.js +++ b/methods/bindShelvingTag.js @@ -14,11 +14,13 @@ router.get('/:smartTagFk&:shelving&:level', async(req, res) => { const result = bindShelvingTag(smartTagFk, shelving, level); if (result == 'INVALID_PLATE') - res.json({message: 'MATRICULA INCORRECTA'}); + throw new Error('CODIGO MATRICULA INCORRECTO'); else if (result == 'INVALID_TAG_CODE') - res.json({message: 'CODIGO DE ETIQUETA INCORRECTO'}); + throw new Error('CODIGO DE ETIQUETA INCORRECTO'); else res.json({message: 'SUCCESS'}); + + return; }); module.exports = router; diff --git a/utilities/filter.js b/utilities/filter.js index 0a88e48..c5e3031 100644 --- a/utilities/filter.js +++ b/utilities/filter.js @@ -1,24 +1,14 @@ +const select = require('../db/selectShelving'); function isSmartTag(toFilter) { const exp = /^A0A3B82[A-F0-9]{5}$/; return exp.test(toFilter); } -let n = true; + function isShelving(toFilter) { - if (!Array.isArray(toFilter)) { - let s = toFilter; - toFilter = Array; - toFilter[0] = s; - } - const exp = /^[A-Z]{3}$/; - for (let i = 0; i < toFilter.length; i++) { - let state = exp.test(toFilter[i]); - if (state == false) - n = false; - } - if (n == false) - return false; - else - return true; + console.log(select.shelvingExist(toFilter, function(err, data) { + console.log(data); + })); + return select.shelvingExist(toFilter); } exports.isSmartTag = isSmartTag; exports.isShelving = isShelving;