From f2d1aa5f1659e70e188d08e77d568119fb1ce6ac Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 15 Oct 2024 08:17:03 +0200
Subject: [PATCH] feat: refs #8098 closureDaysAgo

---
 db/versions/11298-wheatIvy/00-closure.sql     |  3 +++
 .../ticket/back/methods/ticket/closeAll.js    | 21 ++++++++++---------
 modules/ticket/back/methods/ticket/closure.js |  5 +----
 .../back/methods/ticket/specs/closure.spec.js |  4 ++--
 4 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 db/versions/11298-wheatIvy/00-closure.sql

diff --git a/db/versions/11298-wheatIvy/00-closure.sql b/db/versions/11298-wheatIvy/00-closure.sql
new file mode 100644
index 000000000..7b33939cf
--- /dev/null
+++ b/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);
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 8869f9464..4ae83b647 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -45,17 +45,18 @@ module.exports = Self => {
                     eu.email salesPersonEmail,
                     t.addressFk
                 FROM ticket t
-                    JOIN agencyMode am ON am.id = t.agencyModeFk
-                    JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
-                    JOIN ticketState ts ON ts.ticketFk = t.id
-                    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 country co ON co.id = p.countryFk
-                    LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                JOIN agencyMode am ON am.id = t.agencyModeFk
+                JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                JOIN ticketState ts ON ts.ticketFk = t.id
+                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 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.refFk IS NULL
+                AND DATE(t.shipped) BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
+                AND t.refFk IS NULL
                 GROUP BY t.id
         `, [toDate, toDate]);
         const ticketIds = tickets.map(ticket => ticket.id);
diff --git a/modules/ticket/back/methods/ticket/closure.js b/modules/ticket/back/methods/ticket/closure.js
index d20c83304..56bd6eccd 100644
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/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) {
-    //     tx = await Self.beginTransaction({});
-    //     myOptions.transaction = tx;
-    // }
+    // IMPORTANT: Due to its high cost in production, wrapping this process in a transaction may cause timeouts.
 
     if (tickets.length == 0) return;
 
diff --git a/modules/ticket/back/methods/ticket/specs/closure.spec.js b/modules/ticket/back/methods/ticket/specs/closure.spec.js
index 303c38233..cafe178cb 100644
--- a/modules/ticket/back/methods/ticket/specs/closure.spec.js
+++ b/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() => {