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

6921_addFromDelivery #2304

Merged
sergiodt merged 18 commits from 6921_addFromDelivery into dev 2024-04-22 10:33:34 +00:00
Conversation 0 Commits 18 Files Changed 6 +12 -30
2 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e909d64757 - Show all commits

28
modules/ticket/back/methods/ticket-observation/addDropOff.js
View File

@ -24,31 +24,19 @@ module.exports = Self => {
Self.addDropOff = async(ticketFk, note, options) => { Self.addDropOff = async(ticketFk, note, options) => {
const models = Self.app.models; const models = Self.app.models;
const myOptions = {}; const myOptions = {};
let tx;
if (typeof options == 'object') if (typeof options == 'object')
Object.assign(myOptions, options); Object.assign(myOptions, options);
if (!myOptions.transaction) { const observationTypeDropOff = await models.ObservationType.findOne({
tx = await Self.beginTransaction({}); where: {code: 'dropOff'}
sergiodt marked this conversation as resolved Outdated
jgallego commented 2024-04-17 13:31:38 +00:00
Outdated
Review
Copy Link

no cal començar la transaccio sols hi ha un create

no cal començar la transaccio sols hi ha un create
myOptions.transaction = tx; }, myOptions);
}
try {
const observationTypeDropOff = await models.ObservationType.findOne({
where: {code: 'dropOff'}
}, myOptions);
await models.TicketObservation.create({ await models.TicketObservation.create({
ticketFk: ticketFk, ticketFk: ticketFk,
observationTypeFk: observationTypeDropOff.id, observationTypeFk: observationTypeDropOff.id,
description: note description: note
}, myOptions); }, myOptions);
if (tx) await tx.commit();
} catch (error) {
if (tx) await tx.rollback();
throw error;
}
}; };
}; };

14
modules/ticket/back/methods/ticket-observation/specs/addDropOff.spec.js
View File

@ -6,25 +6,19 @@ describe('ticketObservation addDropOff()', () => {
const code = 'dropOff'; const code = 'dropOff';
it('should return a dropOff note', async() => { it('should return a dropOff note', async() => {
const myOptions = {}; const tx = await models.TicketObservation.beginTransaction({});
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await models.TicketObservation.beginTransaction({});
myOptions.transaction = tx;
}
try { try {
const options = {transaction: tx};
await models.TicketObservation.addDropOff( await models.TicketObservation.addDropOff(
ticketFk, note, myOptions); ticketFk, note, options);
const observationTypeDropOff = await models.TicketObservation.find({ const observationTypeDropOff = await models.TicketObservation.find({
where: { where: {
ticketFk, ticketFk,
code code
} }
}, myOptions); }, options);
expect(observationTypeDropOff.length).toEqual(1); expect(observationTypeDropOff.length).toEqual(1);