verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refactor: refs #7817 itemShelving_addList change #2882

Merged
jgallego merged 7 commits from 7817-isChecked into dev 2024-10-03 05:34:45 +00:00
Conversation 0 Commits 7 Files Changed 3 +33 -19
3 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
db/routines/vn/procedures/itemShelving_addList.sql
View File

@ -1,16 +1,22 @@
DELIMITER $$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addList`(vShelvingFk VARCHAR(3), vList TEXT, vIsChecking BOOL, vWarehouseFk INT)
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addList`(
vShelvingFk VARCHAR(3),
vList TEXT,
vIsChecking BOOL,
vWarehouseFk INT
)
BEGIN
/* Recorre cada elemento en la colección vList.
/**
* Recorre cada elemento en la colección vList.
* Si el parámetro isChecking = FALSE, llama a itemShelving_add.
*
* Cuando es TRUE sólo inserta los elementos de la colección que no están ya en
* ese shelving, actualizando los valores del campo vn.itemShelving.isChecked
* ese shelving, actualizando los valores del campo itemShelving.isChecked
*
* param vShelvingFk Identificador de vn.shelving
* param vList JSON array con esta estructura: '[value1, value2, ...]'
* param vIsChecking Define si hay que añadir o comprobar los items
* param vWarehouseFk Identificador de vn.warehouse
* @param vShelvingFk Identificador de shelving
* @param vList JSON array con esta estructura: '[value1, value2, ...]'
* @param vIsChecking Define si hay que añadir o comprobar los items
* @param vWarehouseFk Identificador de warehouse
*/
DECLARE vListLength INT DEFAULT JSON_LENGTH(vList);
DECLARE vCounter INT DEFAULT 0;
@ -20,26 +26,27 @@ BEGIN
DECLARE vIsChecked BOOL;
WHILE vCounter < vListLength DO
SET vPath = CONCAT('$[',vCounter,']');
SET vBarcode = JSON_EXTRACT(vList,vPath);
SET vPath = CONCAT('$[', vCounter, ']');
SET vBarcode = JSON_EXTRACT(vList, vPath);
SET vIsChecked = NULL;
IF vIsChecking THEN
SELECT barcodeToItem(vBarcode) INTO vItemFk;
SELECT COUNT(*) INTO vIsChecked
FROM vn.itemShelving
SELECT IF(COUNT(*), TRUE, FALSE) INTO vIsChecked
guillermo marked this conversation as resolved
jgallego commented 2024-09-24 05:16:32 +00:00
Review
Copy Link

altra forma de fer-ho:
SELECT COUNT(*) > 0 INTO checked

altra forma de fer-ho: SELECT COUNT(*) > 0 INTO checked
FROM itemShelving
WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
AND itemFk = vItemFk;
END IF;
IF NOT (vIsChecking AND vIsChecked) THEN
CALL vn.itemShelving_add(vShelvingFk, vBarcode, 1, NULL, NULL, NULL, vWarehouseFk);
IF NOT vIsChecking OR NOT vIsChecked THEN
guillermo marked this conversation as resolved Outdated
carlosap commented 2024-09-16 14:25:13 +00:00
Outdated
Review
Copy Link

Seria más legible sin el NOT y con un OR

Seria más legible sin el NOT y con un OR
CALL itemShelving_add(vShelvingFk, vBarcode, 1, NULL, NULL, NULL, vWarehouseFk);
END IF;
UPDATE vn.itemShelving
UPDATE itemShelving
guillermo marked this conversation as resolved
carlosap commented 2024-09-16 14:24:25 +00:00
Review
Copy Link

Revisar la lógica del procedimiento, no tiene sentido hacer este UPDATE si el parámetro vIsChecking = FALSE

Revisar la lógica del procedimiento, no tiene sentido hacer este UPDATE si el parámetro vIsChecking = FALSE
guillermo commented 2024-09-17 10:27:07 +00:00
Review
Copy Link

Sí que tiene, porque ese campo puede tener NULL, TRUE o FALSE, si es NULL y la variables es FALSE, quieres que haga el UPDATE a FALSE

Sí que tiene, porque ese campo puede tener NULL, TRUE o FALSE, si es NULL y la variables es FALSE, quieres que haga el UPDATE a FALSE
SET isChecked = vIsChecked
WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
AND itemFk = vItemFk AND isChecked IS NULL;
AND itemFk = vItemFk
AND isChecked IS NULL;
SET vCounter = vCounter + 1;
END WHILE;

7
db/versions/11198-blackPhormium/00-firstScript.sql Normal file
View File

@ -0,0 +1,7 @@
UPDATE vn.itemShelving
SET isChecked = TRUE
WHERE isChecked;
guillermo marked this conversation as resolved
carlosap commented 2024-09-16 14:30:33 +00:00
Review
Copy Link

AND isChecked <> 1

AND isChecked <> 1
guillermo commented 2024-09-17 10:25:57 +00:00
Review
Copy Link

No fa falta, ho he comprovat.

No fa falta, ho he comprovat.
UPDATE vn.itemShelving
SET isChecked = FALSE
WHERE NOT isChecked;

8
modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
View File

@ -1,6 +1,6 @@
const {models} = require('vn-loopback/server/server');
describe('item lastEntriesFilter()', () => {
it('should return two entry for the given item', async() => {
it('should return one entry for the given item', async() => {
const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0);
const maxDate = Date.vnNew();
@ -13,7 +13,7 @@ describe('item lastEntriesFilter()', () => {
const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
const result = await models.Item.lastEntriesFilter(filter, options);
expect(result.length).toEqual(2);
expect(result.length).toEqual(1);
await tx.rollback();
} catch (e) {
@ -22,7 +22,7 @@ describe('item lastEntriesFilter()', () => {
}
});
it('should return six entries for the given item', async() => {
it('should return five entries for the given item', async() => {
const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0);
minDate.setMonth(minDate.getMonth() - 2, 1);
@ -37,7 +37,7 @@ describe('item lastEntriesFilter()', () => {
const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
const result = await models.Item.lastEntriesFilter(filter, options);
expect(result.length).toEqual(6);
expect(result.length).toEqual(5);
await tx.rollback();
} catch (e) {