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

fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic #3324

Merged
pablone merged 3 commits from 7301-removeRedundantInventories into dev 2025-01-02 09:54:10 +00:00
Conversation 0 Commits 3 Files Changed 3 +2 -3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b838e988e0 - Show all commits

1
modules/item/back/methods/item/lastEntriesFilter.js
View File

@ -79,7 +79,6 @@ module.exports = Self => {
stmt.merge('AND IF(s.id = ic.supplierFk, tr.landed = DATE(c.inventoried), TRUE)'); stmt.merge('AND IF(s.id = ic.supplierFk, tr.landed = DATE(c.inventoried), TRUE)');
stmt.merge(conn.makePagination(filter)); stmt.merge(conn.makePagination(filter));
console.log('stmt: ', stmt);
return conn.executeStmt(stmt, myOptions); return conn.executeStmt(stmt, myOptions);
}; };
}; };

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

@ -1,7 +1,7 @@
const {models} = require('vn-loopback/server/server'); const {models} = require('vn-loopback/server/server');
const itemFk = 1; const itemFk = 1;
describe('item lastEntriesFilter()', () => { describe('item lastEntriesFilter()', () => {
fit('should return two entry for the given item', async() => { it('should return two entry for the given item', async() => {
const minDate = Date.vnNew(); const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0); minDate.setHours(0, 0, 0, 0);
const maxDate = Date.vnNew(); const maxDate = Date.vnNew();
@ -23,7 +23,7 @@ describe('item lastEntriesFilter()', () => {
} }
}); });
fit('should return six entries for the given item', async() => { it('should return six entries for the given item', async() => {
const minDate = Date.vnNew(); const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0); minDate.setHours(0, 0, 0, 0);
minDate.setMonth(minDate.getMonth() - 2, 1); minDate.setMonth(minDate.getMonth() - 2, 1);