fix: refs #6184 saveSign

modules/route/back/methods/route/cmrEmail.js

@@ -48,23 +48,18 @@ module.exports = Self => {
                 if (!recipient)
                     throw new UserError('There is no assigned email for this client');
 
-                const dms = await models.TicketDms.findOne({
+                const dms = await Self.rawSql(`
-                    where: {ticketFk: ticketId},
+                    SELECT d.id
-                    include: [{
+                        FROM ticketDms td
-                        relation: 'dms',
+                            JOIN dms d ON d.id = td.dmsFk
-                        fields: ['id'],
+                            JOIN dmsType dt ON dt.id = d.dmsTypeFk
-                        scope: {
+                        WHERE td.ticketFk = ?
-                            relation: 'dmsType',
+                            AND dt.code = 'cmr'
-                            scope: {
+                    `, [ticketId]);
-                                where: {code: 'cmr'}
-                            }
-                        }
-                    }]
-                }, myOptions);
 
-                if (!dms) throw new UserError('Cmr file does not exist');
+                if (!dms.lenght) throw new UserError('Cmr file does not exist');
 
-                const response = await models.Dms.downloadFile(ctx, dms.id);
+                const response = await models.Dms.downloadFile(ctx, dms[0].id);
 
                 const email = new Email('cmr', {
                     ticketId,

modules/ticket/back/methods/ticket/saveCmr.js

@@ -42,18 +42,15 @@ module.exports = Self => {
                 const ticket = await models.Ticket.findById(ticketId, myOptions);
 
                 if (ticket.cmrFk) {
-                    const hasDmsCmr = await models.TicketDms.findOne({
+                    const hasDmsCmr = await Self.rawSql(`
-                        where: {ticketFk: ticketId},
+                        SELECT d.id
-                        include: {
+                            FROM ticketDms td
-                            relation: 'dms',
+                                JOIN dms d ON d.id = td.dmsFk
-                            fields: ['dmsFk'],
+                            WHERE td.ticketFk = ?
-                            scope: {
+                                AND d.dmsTypeFk = ?
-                                where: {dmsTypeFk: dmsTypeCmr.id}
+                    `, [ticketId, dmsTypeCmr.id]);
-                            }
-                        }
-                    }, myOptions);
 
-                    if (hasDmsCmr?.dms())
+                    if (hasDmsCmr.length)
                         throw new UserError('This ticket already has a cmr saved');
 
                     ctx.args.id = ticket.cmrFk;

modules/ticket/back/methods/ticket/saveSign.js

@@ -33,8 +33,8 @@ module.exports = Self => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
         let tx;
-        let dms;
+        let ticket;
-        let gestDocCreated = false;
+        let externalTickets = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -44,6 +44,11 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
 
+        const dmsTypeTicket = await models.DmsType.findOne({
+            where: {code: 'ticket'},
+            fields: ['id']
+        });
+
         async function setLocation(ticketId) {
             await models.Delivery.create({
                 ticketFk: ticketId,
@@ -53,102 +58,104 @@ module.exports = Self => {
             }, myOptions);
         }
 
-        async function gestDocExists(ticketId) {
+        async function hasSignDms(ticketId) {
             const ticketDms = await models.TicketDms.findOne({
                 where: {ticketFk: ticketId},
-                fields: ['dmsFk']
-            }, myOptions);
-
-            if (!ticketDms) return false;
-
-            const ticket = await models.Ticket.findById(ticketId, {fields: ['isSigned']}, myOptions);
-            if (ticket.isSigned == true)
-                return true;
-            else
-                await models.Dms.destroyAll({where: {reference: ticketId}}, myOptions);
-
-            return false;
-        }
-
-        async function createGestDoc(id) {
-            const ticket = await models.Ticket.findById(id,
-                {
                 include: [
                     {
-                            relation: 'warehouse',
+                        relation: 'dms',
+                        fields: ['id'],
                         scope: {
-                                fields: ['id']
+                            where: {dmsTypeFk: dmsTypeTicket.id}
                         }
-                        }, {
+                    }
-                            relation: 'client',
+                ]
+            });
+            if (ticketDms?.dms()?.id) return true;
+        }
+
+        async function createGestDoc() {
+            const ctxUploadFile = Object.assign({}, ctx);
+            ctxUploadFile.args = {
+                warehouseId: ticket.warehouseFk,
+                companyId: ticket.companyFk,
+                dmsTypeId: dmsTypeTicket.id,
+                reference: ticket.id,
+                description: `Firma del cliente - Ruta ${ticket.route().id}`,
+                hasFile: true
+            };
+            const dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
+            await models.TicketDms.create({ticketFk: ticket.id, dmsFk: dms[0].id}, myOptions);
+        }
+
+        try {
+            for (const ticketId of tickets) {
+                ticket = await models.Ticket.findById(ticketId, {
+                    include: [{
+                        relation: 'address',
                         scope: {
-                                fields: ['name']
+                            include: {
+                                relation: 'province',
+                                scope: {
+                                    include: {
+                                        relation: 'country',
+                                        scope: {
+                                            fields: ['code']
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }, {
                         relation: 'route',
                         scope: {
                             fields: ['id']
                         }
-                        }
+                    }]
-                    ]
+                });
-                }, myOptions);
-            const dmsType = await models.DmsType.findOne({where: {code: 'Ticket'}, fields: ['id']}, myOptions);
-            const ctxUploadFile = Object.assign({}, ctx);
-            if (ticket.route() === null)
-                throw new UserError('Ticket without route');
-            ctxUploadFile.args = {
-                warehouseId: ticket.warehouseFk,
-                companyId: ticket.companyFk,
-                dmsTypeId: dmsType.id,
-                reference: '',
-                description: `Firma del cliente - Ruta ${ticket.route().id}`,
-                hasFile: false
-            };
-            dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
-            gestDocCreated = true;
-        }
 
-        try {
+                const ticketState = await models.TicketState.findOne({
-            for (const ticketId of tickets) {
+                    where: {ticketFk: ticketId},
-                const ticketState = await models.TicketState.findOne(
-                    {where: {ticketFk: ticketId},
                     fields: ['alertLevel']
-                    }, myOptions);
+                });
 
-                const packedAlertLevel = await models.AlertLevel.findOne({where: {code: 'PACKED'},
+                const packedAlertLevel = await models.AlertLevel.findOne({
+                    where: {code: 'PACKED'},
                     fields: ['id']
-                }, myOptions);
+                });
 
                 if (!ticketState)
                     throw new UserError('Ticket does not exist');
+                if (!ticket.route())
+                    throw new UserError('Ticket without route');
                 if (ticketState.alertLevel < packedAlertLevel.id)
                     throw new UserError('This ticket cannot be signed because it has not been boxed');
-                if (await gestDocExists(ticketId))
+                if (await ticket.isSigned)
                     throw new UserError('Ticket is already signed');
 
                 if (location) await setLocation(ticketId);
-                if (!gestDocCreated) await createGestDoc(ticketId);
+                if (!await hasSignDms(ticketId)) await createGestDoc(ticketId);
-                await models.TicketDms.create({ticketFk: ticketId, dmsFk: dms[0].id}, myOptions);
-                const ticket = await models.Ticket.findById(ticketId, null, myOptions);
                 await ticket.updateAttribute('isSigned', true, myOptions);
 
                 const deliveryState = await models.State.findOne({
-                    where: {
+                    where: {code: 'DELIVERED'}
-                        code: 'DELIVERED'
+                });
-                    }
-                }, myOptions);
 
                 await models.Ticket.state(ctx, {
                     ticketFk: ticketId,
                     stateFk: deliveryState.id
                 }, myOptions);
-            }
 
+                if (ticket?.address()?.province()?.country()?.code != 'ES' && ticket.cmrFk) {
+                    await models.Ticket.saveCmr(ctx, [ticketId], myOptions);
+                    externalTickets.push(ticketId);
+                }
+            }
             if (tx) await tx.commit();
-            return;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
         }
+        await models.Route.cmrEmail(ctx, externalTickets);
     };
 };