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

7253-devToTest_2418 #2350

Merged
alexm merged 320 commits from 7253-devToTest_2418 into test 2024-04-23 08:02:46 +00:00
Conversation 0 Commits 320 Files Changed 212 +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

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

@ -24,16 +24,10 @@ module.exports = Self => {
Self.addDropOff = async(ticketFk, note, options) => {
const models = Self.app.models;
const myOptions = {};
let tx;
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
try {
const observationTypeDropOff = await models.ObservationType.findOne({
where: {code: 'dropOff'}
}, myOptions);
@ -44,11 +38,5 @@ module.exports = Self => {
description: note
}, 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';
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 {
const options = {transaction: tx};
await models.TicketObservation.addDropOff(
ticketFk, note, myOptions);
ticketFk, note, options);
const observationTypeDropOff = await models.TicketObservation.find({
where: {
ticketFk,
code
}
}, myOptions);
}, options);
expect(observationTypeDropOff.length).toEqual(1);