From 767c891317136469424a6c18651bb79d2ee47feb Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 31 Jan 2025 01:17:23 +0100 Subject: [PATCH] perf: refs #6321 remove comments --- modules/item/back/methods/item/getSimilar.js | 18 ++++++++++-------- .../ticket/back/methods/sale/replaceItem.js | 2 +- .../back/methods/ticket/itemLackDetail.js | 3 +-- .../back/methods/ticket/specs/itemLack.spec.js | 18 ------------------ modules/ticket/back/methods/ticket/split.js | 3 ++- 5 files changed, 14 insertions(+), 30 deletions(-) diff --git a/modules/item/back/methods/item/getSimilar.js b/modules/item/back/methods/item/getSimilar.js index bb1b629394..7d904c782f 100644 --- a/modules/item/back/methods/item/getSimilar.js +++ b/modules/item/back/methods/item/getSimilar.js @@ -1,14 +1,16 @@ module.exports = Self => { Self.remoteMethodCtx('getSimilar', { - description: 'Returns the ', + description: 'Returns list of items with similar item requested', accessType: 'READ', - accepts: [{ - arg: 'filter', - type: 'Object', - required: true, - description: 'Filter defining where and paginated data', - http: {source: 'query'} - }], + accepts: [ + { + arg: 'filter', + type: 'Object', + required: true, + description: 'Filter defining where and paginated data', + http: {source: 'query'} + } + ], returns: { type: ['Object'], root: true diff --git a/modules/ticket/back/methods/sale/replaceItem.js b/modules/ticket/back/methods/sale/replaceItem.js index 5bc5c2c480..7412dcf965 100644 --- a/modules/ticket/back/methods/sale/replaceItem.js +++ b/modules/ticket/back/methods/sale/replaceItem.js @@ -73,7 +73,7 @@ module.exports = Self => { query: [sale.ticketFk] }; const salesPerson = await Self.rawSql(salesPersonQuery.sql, salesPersonQuery.query, myOptions); - const url = await Self.app.models.Url.getUrl(); + const url = await models.Url.getUrl(); const substitution = await models.Item.findById(substitutionFk, { fields: ['id', 'name', 'longName'] }, myOptions); diff --git a/modules/ticket/back/methods/ticket/itemLackDetail.js b/modules/ticket/back/methods/ticket/itemLackDetail.js index 6e5badcd11..4d3bdfe637 100644 --- a/modules/ticket/back/methods/ticket/itemLackDetail.js +++ b/modules/ticket/back/methods/ticket/itemLackDetail.js @@ -146,8 +146,7 @@ module.exports = Self => { stmt.merge({ sql: `AND ts.alertLevel=?`, params: [filter.where.stateFk]}); } - // } - // stmt.merge(conn.makeWhere(filter.where)); + const sql = ParameterizedSQL.join([stmt], ';'); const result = await conn.executeStmt(sql, myOptions); return result; diff --git a/modules/ticket/back/methods/ticket/specs/itemLack.spec.js b/modules/ticket/back/methods/ticket/specs/itemLack.spec.js index f565104476..9af5910ea6 100644 --- a/modules/ticket/back/methods/ticket/specs/itemLack.spec.js +++ b/modules/ticket/back/methods/ticket/specs/itemLack.spec.js @@ -62,24 +62,6 @@ describe('Item Lack', () => { } }); - // it('should return data with filter.name', async() => { - // const tx = await models.Ticket.beginTransaction({}); - - // const options = {transaction: tx}; - // const filter = { - // name: 1 - // }; - // try { - // const result = await models.Ticket.itemLack(ctx, filter, options); - - // expect(result.length).toEqual(1); - // await tx.rollback(); - // } catch (e) { - // await tx.rollback(); - // throw e; - // } - // }); - it('should return data with filter.color', async() => { const tx = await models.Ticket.beginTransaction({}); diff --git a/modules/ticket/back/methods/ticket/split.js b/modules/ticket/back/methods/ticket/split.js index 04766f7db6..73fa7a9841 100644 --- a/modules/ticket/back/methods/ticket/split.js +++ b/modules/ticket/back/methods/ticket/split.js @@ -40,7 +40,6 @@ module.exports = Self => { } try { - // const ticketsIds = ticket.map(({ticketFk}, index) => ticketFk); const ticketsCount = await Self.rawSql(` Select t.id tid, s.id sid, count(s.id) count FROM @@ -56,6 +55,7 @@ module.exports = Self => { result.push({ticket: tid, status: 'noSplit'}); continue; } + const [, [{vNewTicket}]] = await Self.rawSql(` CALL vn.ticket_clone(?, @vNewTicket); SELECT @vNewTicket vNewTicket;`, @@ -69,6 +69,7 @@ module.exports = Self => { const updateIsPicked = sales.map(({sid}) => Self.rawSql(` UPDATE vn.sale SET isPicked = (id = ?) WHERE ticketFk = ?`, [sid, tid], myOptions)); + await Promise.all(updateIsPicked); await Self.transferSales(ctx, tid, vNewTicket, sales, myOptions);