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

#6964 _ itemOlder #2197

Merged
sergiodt merged 26 commits from 6964_itemOlder into dev 2024-04-04 14:18:20 +00:00
Conversation 0 Commits 26 Files Changed 5 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a40234ba9b - Show all commits

2
modules/item/back/methods/item-shelving/hasItemOlder.js
View File

@ -53,7 +53,7 @@ module.exports = Self => {
AND (p.code <> ? OR ? IS NULL)
AND (ish.shelvingFk <> ? OR ? IS NULL)
sergiodt marked this conversation as resolved Outdated
alexm commented 2024-03-25 06:11:25 +00:00
Outdated
Review
Copy Link

falta gastar la transaccio (...shelvingFkOut, itemFk, itemFk], options)

falta gastar la transaccio (...shelvingFkOut, itemFk, itemFk], options)
sergiodt commented 2024-03-25 06:55:48 +00:00
Outdated
Review
Copy Link

Llevat options

Llevat options
alexm commented 2024-03-25 07:07:00 +00:00
Outdated
Review
Copy Link

Es ficarlo sino no gastarà la transaccio

Es ficarlo sino no gastarà la transaccio
sergiodt commented 2024-03-25 07:23:38 +00:00
Outdated
Review
Copy Link

L'he posat però no veia que fera falta...

L'he posat però no veia que fera falta...
AND (ish.itemFk <> ? OR ? IS NULL)`,
sergiodt marked this conversation as resolved Outdated
alexm commented 2024-03-25 06:06:43 +00:00
Outdated
Review
Copy Link

Si li poses el alias aci hi ha que canviarlo

Si li poses el alias aci hi ha que canviarlo
[shelvingFkIn, parking, parking, shelvingFkOut, shelvingFkOut, itemFk, itemFk]);
[shelvingFkIn, parking, parking, shelvingFkOut, shelvingFkOut, itemFk, itemFk], options);
sergiodt marked this conversation as resolved Outdated
alexm commented 2024-03-25 07:07:09 +00:00
Outdated
Review
Copy Link

Aci

Aci
alexm commented 2024-03-26 07:03:01 +00:00
Outdated
Review
Copy Link

myOptions

myOptions
return result[0]['countItemOlder'] > 0;
};
};

4
modules/item/back/methods/item-shelving/specs/hasItemOlder.spec.js
View File

@ -5,7 +5,7 @@ describe('itemShelving hasOlder()', () => {
it('should return false because there are not older items', async() => {
const shelvingFkIn = 'GVC';
const shelvingFkOut = 'HEJ';
const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, shelvingFkOut);
const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, null, shelvingFkOut);
sergiodt marked this conversation as resolved Outdated
alexm commented 2024-03-25 07:09:19 +00:00
Outdated
Review
Copy Link

Al cridar a la funcio hi ha que seguir el mateix ordre que dalt (async(shelvingFkIn, parking, shelvingFkOut, itemFk, options)

Per tant seria await models.ItemShelving.hasItemOlder(shelvingFkIn, null, shelvingFkOut)

Al cridar a la funcio hi ha que seguir el mateix ordre que dalt (`async(shelvingFkIn, parking, shelvingFkOut, itemFk, options`) Per tant seria `await models.ItemShelving.hasItemOlder(shelvingFkIn, null, shelvingFkOut)`
expect(result).toBe(false);
});
@ -33,7 +33,7 @@ describe('itemShelving hasOlder()', () => {
await itemShelvingBefore.updateAttributes({
itemFk: itemFk
sergiodt marked this conversation as resolved
alexm commented 2024-03-26 12:15:02 +00:00
Review
Copy Link

, myOptions

, myOptions
});
sergiodt marked this conversation as resolved Outdated
alexm commented 2024-03-26 07:04:08 +00:00
Outdated
Review
Copy Link

, myOptions

, myOptions
const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, parking);
const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, parking, null, null, myOptions);
sergiodt marked this conversation as resolved Outdated
alexm commented 2024-03-25 07:10:07 +00:00
Outdated
Review
Copy Link

Aci deuries gastar la transaccio
await models.ItemShelving.hasItemOlder(shelvingFkIn, parking, null, null, myOptions)

Aci deuries gastar la transaccio await models.ItemShelving.hasItemOlder(shelvingFkIn, parking, null, null, myOptions)
sergiodt commented 2024-03-25 07:24:32 +00:00
Outdated
Review
Copy Link

Ací si que veig que faltava posar myOptions perquè faig més accions

Ací si que veig que faltava posar myOptions perquè faig més accions
expect(result).toBe(true);
await tx.rollback();