From 729185f9215c99e37906838fd5ee7894cb918cd4 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 4 Mar 2025 10:25:19 +0100 Subject: [PATCH 1/2] fix: fix salesFilter excluding ticket filtered --- modules/monitor/back/methods/sales-monitor/salesFilter.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js index ce50fec6aa..38c7082252 100644 --- a/modules/monitor/back/methods/sales-monitor/salesFilter.js +++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js @@ -262,10 +262,7 @@ module.exports = Self => { (INDEX (ticketFk)) ENGINE = MEMORY SELECT f.id ticketFk - FROM tmp.filter f - LEFT JOIN alertLevel al ON al.id = f.alertLevel - WHERE (al.code = 'FREE' OR f.alertLevel IS NULL) - AND f.shipped >= ?`, [date]); + FROM tmp.filter f`); stmts.push(stmt); stmts.push('CALL ticket_getProblems(FALSE)'); @@ -288,7 +285,7 @@ module.exports = Self => { stmts.push(stmt); stmt = new ParameterizedSQL(` - SELECT * + SELECT f.*, tp.* FROM tmp.filter f LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id LEFT JOIN tmp.ticket_warnings tw ON tw.ticketFk = f.id -- 2.40.1 From d7f06b7df9a5b997310f80d961bb196d9fb2add3 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 4 Mar 2025 10:33:48 +0100 Subject: [PATCH 2/2] fix: fixed salesFilter test --- .../back/methods/sales-monitor/specs/salesFilter.spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js index 1b4616de73..7b0bfc800b 100644 --- a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js +++ b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js @@ -68,7 +68,7 @@ describe('SalesMonitor salesFilter()', () => { const filter = {}; const result = await models.SalesMonitor.salesFilter(ctx, filter, options); - expect(result.length).toEqual(5); + expect(result.length).toEqual(8); await tx.rollback(); } catch (e) { @@ -254,8 +254,8 @@ describe('SalesMonitor salesFilter()', () => { const firstTicket = result.shift(); const secondTicket = result.shift(); - expect(firstTicket.totalProblems).toEqual(null); - expect(secondTicket.totalProblems).toEqual(null); + expect(firstTicket.totalProblems).toEqual(0); + expect(secondTicket.totalProblems).toEqual(0); await tx.rollback(); } catch (e) { -- 2.40.1