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

feat: refs #8077 create testo to sumAmount
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Robert Ferrús 2025-01-08 12:30:15 +01:00
parent 5287b8a492
commit d831b5197d
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/client/back/methods/defaulter/filter.js
View File

@ -56,8 +56,7 @@ module.exports = Self => {
filter = mergeFilters(ctx.args.filter, {where});
const stmts = [];
const fields = ctx.args.sumAmount ? 'sum(d.amount) sumAmount' : ` DISTINCT c.id clientFk,
c.name clientName,
const sqlCode = `, c.name clientName,
c.salesPersonFk,
c.businessTypeFk = 'worker' isWorker,
u.name salesPersonName,
@ -75,6 +74,8 @@ module.exports = Self => {
dp.id departmentFk,
dp.name departmentName,
dp.notificationEmail departmentEmail`;
const fields = ctx.args.sumAmount ? `sum(d.amount) sumAmount, d.clientFk ${sqlCode}`
: ` DISTINCT c.id clientFk ${sqlCode}`;
const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const stmt = new ParameterizedSQL(
@ -108,7 +109,7 @@ module.exports = Self => {
, [date]);
stmt.merge(conn.makeWhere(filter.where));
!ctx.args.sumAmount && stmt.merge(`GROUP BY d.clientFk`);
!ctx.args.sumAmount && stmt.merge(`GROUP BY clientFk`);
stmt.merge(conn.makeOrderBy(filter.order));
stmt.merge(conn.makeLimit(filter));

17
modules/client/back/methods/defaulter/specs/filter.spec.js
View File

@ -60,4 +60,21 @@ describe('defaulter filter()', () => {
throw e;
}
});
it('should return the defaulter the sum of every defaulters', async() => {
const tx = await models.Defaulter.beginTransaction({});
try {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101, sumAmount: true}};
const [result] = await models.Defaulter.filter(ctx, null, options);
expect(result.sumAmount).toBeDefined();
await tx.rollback();
} catch (e) {
await tx.rollback();
throw e;
}
});
});