From 00262e5dd0ad1bf2608a435aa4c8fc83564c5985 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 3 Feb 2023 13:20:00 +0100 Subject: [PATCH] refactor newPallet and use translator --- src/newPallet.js | 15 +++++++-------- src/stream.js | 4 ++-- util/locale/es.yml | 1 + util/translator.js | 8 ++++++++ 4 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 util/locale/es.yml create mode 100644 util/translator.js diff --git a/src/newPallet.js b/src/newPallet.js index 10a9c9f..d22b624 100644 --- a/src/newPallet.js +++ b/src/newPallet.js @@ -1,13 +1,12 @@ import con from '../db/connect.js'; import counter from './counter.js'; +import t from '../util/translator.js'; export default async(rfids, arcId) => { - console.logger.info('PRINTING...'); - console.log([Array.from(rfids), arcId, null]); - await con.query(`CALL vn.expeditionPallet_build(JSON_ARRAY(?), ?, ?, @palletId);`, [Array.from(rfids), arcId, null]); - const [[{palletId}]] = await con.query(`SELECT @palletId as palletId;`); - - await counter(null, arcId); - if (!palletId) - console.logger.error({error: 'ERROR_CREATING_PALLET', expeditions: rfids}); + try { + await con.query(`CALL vn.expeditionPallet_build(JSON_ARRAY(?), ?, ?, @palletId);`, [Array.from(rfids), arcId, null]); + await counter(null, arcId); + } catch (error) { + await con.query(`UPDATE vn.arcRead SET error = ?, counter = NULL WHERE id = ?;`, [t(error.sqlMessage), arcId]); + } }; diff --git a/src/stream.js b/src/stream.js index bb09003..f8dd802 100644 --- a/src/stream.js +++ b/src/stream.js @@ -16,7 +16,7 @@ export default async(conf, cb) => { stream .on('data', async value => { const parsed = await rfidParser(value); - console.log(parsed.codes); + if (!parsed.codes.size) return; rfidbuffer = new Set([...rfidbuffer, ...parsed.codes]); rfidbufferExtend = rfidbufferExtend.concat(parsed.extended); @@ -37,7 +37,7 @@ export default async(conf, cb) => { }); function createPallet() { - clearTimeout(interval); // try remove + clearTimeout(interval); newPallet(rfidbuffer, conf.arcId); diff --git a/util/locale/es.yml b/util/locale/es.yml new file mode 100644 index 0000000..ea5b1c1 --- /dev/null +++ b/util/locale/es.yml @@ -0,0 +1 @@ +TRUCK_NOT_AVAILABLE: No hay un camiĆ³n disponible \ No newline at end of file diff --git a/util/translator.js b/util/translator.js new file mode 100644 index 0000000..ee55218 --- /dev/null +++ b/util/translator.js @@ -0,0 +1,8 @@ +import yml from 'require-yml'; +import path from 'path'; + +export default function t(expression) { + const {pathname: root} = new URL('./locale', import.meta.url); + let es = yml(path.join(root, 'es.yml')) || {}; + return es[expression] || expression; +}