back/methods/vn-user/specs/renew-token.spec.js

@@ -72,9 +72,9 @@ describe('Renew Token', () => {
         }
 
         expect(error).toBeDefined();
-        const query = 'SELECT * FROM util.debug';
 
-        const debugLog = await models.Application.rawSql(query, null);
+        const query = 'SELECT * FROM util.debug WHERE variable = "renewToken"';
+        const debugLog = await models.Application.rawSql(query);
 
         expect(debugLog.length).toEqual(1);
     });

db/versions/11230-brownEucalyptus/00-addClientObservationType.sql

@@ -1,3 +1,3 @@
-ALTER TABLE vn.clientObservation 
+ALTER TABLE vn.clientObservation DROP COLUMN IF EXISTS observationTypeFk;
-	ADD COLUMN observationTypeFk TINYINT(3) UNSIGNED NOT NULL,
+ALTER TABLE vn.clientObservation ADD COLUMN IF NOT EXISTS observationTypeFk TINYINT(3) UNSIGNED NULL;
-		ADD CONSTRAINT clientObservationTypeFk FOREIGN KEY (observationTypeFk) REFERENCES vn.observationType(id);
+ALTER TABLE vn.clientObservation ADD CONSTRAINT clientObservationTypeFk FOREIGN KEY IF NOT EXISTS (observationTypeFk) REFERENCES vn.observationType(id);

db/versions/11251-navyChrysanthemum/00-firstScript.sql

@@ -1,5 +1,3 @@
-/*
 UPDATE vn.sale
     SET originalQuantity = quantity
     WHERE originalQuantity IS NULL
-*/

db/versions/11251-navyChrysanthemum/01-firstScript.sql

@@ -1 +1 @@
--- ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';
+ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';

db/versions/11298-wheatIvy/00-closure.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`ticketConfig`
+ADD COLUMN `closureDaysAgo` int(11) NOT NULL DEFAULT 2 COMMENT 'Number of days to look back for ticket closure',
+ADD CONSTRAINT `closureDaysAgo_check` CHECK (`closureDaysAgo` > 0);

modules/ticket/back/methods/ticket/closeAll.js

@@ -53,8 +53,9 @@ module.exports = Self => {
                     JOIN province p ON p.id = c.provinceFk
                     JOIN country co ON co.id = p.countryFk
                     LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                    JOIN ticketConfig tc ON TRUE
                 WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
-                    AND DATE(t.shipped) BETWEEN ? - INTERVAL 7 DAY AND util.dayEnd(?)
+                    AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
                     AND t.refFk IS NULL
                 GROUP BY t.id
         `, [toDate, toDate]);
@@ -108,6 +109,7 @@ module.exports = Self => {
                                 JOIN alertLevel al ON al.id = ts.alertLevel
                                 JOIN client c ON c.id = t.clientFk
                                 JOIN province p ON p.id = c.provinceFk
+                                JOIN ticketConfig tc ON TRUE
                                 LEFT JOIN autonomy a ON a.id = p.autonomyFk
                                 JOIN country co ON co.id = p.countryFk
                                 LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
@@ -116,7 +118,7 @@ module.exports = Self => {
                                 LEFT JOIN vn.invoiceOutSerial ios ON ios.taxAreaFk = 'WORLD'
                                     AND ios.code = invoiceSerial(t.clientFk, t.companyFk, 'multiple')
                             WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
-                                AND DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
+                                AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
                                 AND t.refFk IS NULL
                                 AND IFNULL(a.hasDailyInvoice, co.hasDailyInvoice)
                             GROUP BY ticketFk
@@ -141,9 +143,10 @@ module.exports = Self => {
                     JOIN alertLevel al ON al.id = ts.alertLevel
                     JOIN agencyMode am ON am.id = t.agencyModeFk
                     JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+                    JOIN ticketConfig tc ON TRUE
                     LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
                 SET t.routeFk = NULL
-                WHERE DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
+                WHERE t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
                     AND al.code NOT IN ('DELIVERED', 'PACKED')
                     AND NOT t.packages
                     AND tob.id IS NULL

modules/ticket/back/methods/ticket/closure.js

@@ -12,10 +12,7 @@ module.exports = async function(ctx, Self, tickets, options) {
         Object.assign(myOptions, options);
 
     let tx;
-    // if (!myOptions.transaction) {
+    // IMPORTANT: Due to its high cost in production, wrapping this process in a transaction may cause timeouts.
-    //     tx = await Self.beginTransaction({});
-    //     myOptions.transaction = tx;
-    // }
 
     if (tickets.length == 0) return;
 

modules/ticket/back/methods/ticket/specs/closure.spec.js

@@ -50,9 +50,9 @@ describe('Ticket closure functionality', () => {
 
         expect(ticketStateBefore.code).not.toBe(ticketStateAfter.code);
 
-        const ticketAfter = await models.TicketState.findById(ticketId, null, options);
+        const ticketAfter = await models.Ticket.findById(ticketId, null, options);
 
-        expect(ticketAfter.refFk).toBeUndefined();
+        expect(ticketAfter.refFk).toBeNull();
     });
 
     it('should send Incoterms authorization email on first order', async() => {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.42.0",
+    "version": "24.44.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",