From fc1e0672a4469ae56446707ecd37cc696ff9ef43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Fri, 29 Nov 2024 11:59:36 +0100
Subject: [PATCH] fix: refs #8087 refs#8087 errores travel_moveRaids

---
 .../vn/procedures/travel_checkRaid.sql        | 17 -----
 .../vn/procedures/travel_moveRaids.sql        | 69 +++++++++++--------
 .../vn/triggers/travel_beforeInsert.sql       |  4 --
 3 files changed, 41 insertions(+), 49 deletions(-)
 delete mode 100644 db/routines/vn/procedures/travel_checkRaid.sql

diff --git a/db/routines/vn/procedures/travel_checkRaid.sql b/db/routines/vn/procedures/travel_checkRaid.sql
deleted file mode 100644
index 64f3355e2..000000000
--- a/db/routines/vn/procedures/travel_checkRaid.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`travel_checkRaid`(
-	vIsRaid BOOL,
-	vDaysInForward INT
-)
-BEGIN
-/**
- * Check if the values of isRaid and daysInforward are correct
- *
- * @param vIsRaid idRaid value
- * @param vDaysInForward daysInForward value
- */
-	IF (NOT vIsRaid AND vDaysInForward IS NOT NULL) OR (vIsRaid AND vDaysInForward IS NULL) THEN
-		CALL util.throw('The raid information is not correct');
-	END IF;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/procedures/travel_moveRaids.sql b/db/routines/vn/procedures/travel_moveRaids.sql
index cf0fce23c..52f6707bf 100644
--- a/db/routines/vn/procedures/travel_moveRaids.sql
+++ b/db/routines/vn/procedures/travel_moveRaids.sql
@@ -8,22 +8,16 @@ BEGIN
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vBuyerEmail VARCHAR(40);
 	DECLARE vTravelLink TEXT;
-	DECLARE vMailBody TEXT DEFAULT '';
+	DECLARE vMailBody TEXT;
+	DECLARE vIsMovible BOOL;
+	DECLARE vSubject VARCHAR(30);
 
-	DECLARE vCur CURSOR FOR
-		SELECT GROUP_CONCAT(DISTINCT
-				CONCAT('https://salix.verdnatura.es/#!/travel/',
-					ttm.travelFk,
-					'/summary ')
-				ORDER BY ttm.travelFk SEPARATOR '\n\r') travelLink,
-			CONCAT(u.name, '@verdnatura.es') buyerEmail
-			FROM tTravelToMove ttm
-				JOIN entry e ON e.travelFk = ttm.travelFk
-				JOIN buy b ON b.entryFk = e.id
-				JOIN item i ON i.id = b.itemFk
-				JOIN itemType it ON it.id = i.typeFk
-				JOIN account.user u ON u.id = it.workerFk
-			GROUP BY u.name;
+	DECLARE vTravels CURSOR FOR
+		SELECT GROUP_CONCAT(DISTINCT travelLink ORDER BY id SEPARATOR '\n\r'),
+				buyerEmail,
+				isMovable
+			FROM tTravelToMove
+			GROUP BY isMovable, buyerEmail;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
@@ -34,35 +28,54 @@ BEGIN
 	END;
 
 	CREATE OR REPLACE TEMPORARY TABLE tTravelToMove
-		SELECT id travelFk,
-				util.VN_CURDATE() + INTERVAL daysInForward  DAY newLanded
+		WITH travels AS (
+		SELECT id ,
+				CONCAT('https://salix.verdnatura.es/#!/travel/', id,'/summary') travelLink,
+				util.VN_CURDATE() + INTERVAL daysInForward DAY newLanded,
+				shipped <= util.VN_CURDATE() + INTERVAL daysInForward DAY isMovable
 			FROM travel
 			WHERE isRaid
-				AND daysInForward;
+				AND daysInForward
+		)SELECT t.*,
+				CONCAT(u.name, '@verdnatura.es') buyerEmail
+			FROM travels t
+				STRAIGHT_JOIN entry e ON e.travelFk = t.id
+				JOIN buy b ON b.entryFk = e.id
+				JOIN item i ON i.id = b.itemFk
+				JOIN itemType it ON it.id = i.typeFk
+				JOIN account.user u ON u.id = it.workerFk
+			GROUP BY t.id;
 
 	START TRANSACTION;
 
 	UPDATE travel tr
-			JOIN tTravelToMove ttm ON ttm.travelFk = tr.id
-		SET tr.landed = ttm.newLanded;
+			JOIN tTravelToMove ttm ON ttm.id = tr.id
+		SET tr.landed = ttm.newLanded
+		WHERE ttm.isMovable;
 
-	OPEN vCur;
+	OPEN vTravels;
 
 	l: LOOP
 		SET vDone = FALSE;
-		FETCH vCur INTO vTravelLink, vBuyerEmail;
+		FETCH vTravels INTO vTravelLink, vBuyerEmail, vIsMovible;
 
 		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		CALL `vn`.`mail_insert`(
-			vBuyerEmail,
-			'noreply@verdnatura.es',
-			'Cambio de fecha en Redadas',
-			CONCAT('Se ha movido los siguientes travels: \n\r ', vTravelLink));
+		IF vIsMovible THEN
+			SET vSubject = 'Cambio de fecha en Redadas';
+			SET vMailBody = 'Se ha movido los siguientes travels';
+		ELSE
+			SET vSubject = 'ERROR al cambiar la fecha en Redadas';
+			SET vMailBody = 'Ha ocurrido un error con las fechas al mover los siguiente travels';
+		END IF;
+
+		SET vMailBody = CONCAT(vMailBody, ': \n\r ', vTravelLink);
+
+		CALL mail_insert(vBuyerEmail, 'noreply@verdnatura.es', vSubject, vMailBody);
 	END LOOP;
-	CLOSE vCur;
+	CLOSE vTravels;
 	COMMIT;
 	DROP TEMPORARY TABLE tTravelToMove;
 END$$
diff --git a/db/routines/vn/triggers/travel_beforeInsert.sql b/db/routines/vn/triggers/travel_beforeInsert.sql
index 5356ed537..50331ba6a 100644
--- a/db/routines/vn/triggers/travel_beforeInsert.sql
+++ b/db/routines/vn/triggers/travel_beforeInsert.sql
@@ -9,10 +9,6 @@ BEGIN
 
 	CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 
-	IF NEW.isRaid IS NOT NULL OR NEW.daysInForward IS NOT NULL THEN
-		CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
-	END IF;
-
 	IF NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;