Merge pull request '#2687 - Fix Travel_cloneWithEntries' (!2021) from 2687_fix_travel_cloneWithEntries into test

Reviewed-on: #2021
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

db/routines/util/procedures/tx_commit.sql

@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(isTx BOOL)
+BEGIN
+/**
+ * Confirma los cambios asociados a una transacción.
+ *
+ * @param isTx es true si existe transacción asociada
+*/
+    IF isTx THEN
+        COMMIT;
+    END IF;
+END$$
+DELIMITER ;

db/routines/util/procedures/tx_rollback.sql

@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(isTx BOOL)
+BEGIN
+/**
+ * Deshace los cambios asociados a una transacción.
+ *
+ * @param isTx es true si existe transacción asociada
+*/
+    IF isTx THEN
+        ROLLBACK;
+    END IF;
+END$$
+DELIMITER ;

db/routines/util/procedures/tx_start.sql

@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(isTx BOOL)
+BEGIN
+/**
+ * Inicia una transacción.
+ *
+ * @param isTx es true si existe transacción asociada
+*/
+    IF isTx THEN
+        START TRANSACTION;
+    END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/travel_cloneWithEntries.sql

@@ -1,21 +1,20 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_cloneWithEntries`(
-	IN vTravelFk INT, 
-	IN vDateStart DATE, 
+	IN vTravelFk INT,
+	IN vDateStart DATE,
 	IN vDateEnd DATE,
 	IN vWarehouseOutFk INT,
-	IN vWarehouseInFk INT, 
-	IN vRef VARCHAR(255), 
-	IN vAgencyModeFk INT, 
+	IN vWarehouseInFk INT,
+	IN vRef VARCHAR(255),
+	IN vAgencyModeFk INT,
 	OUT vNewTravelFk INT)
 BEGIN
 /**
  * Clona un travel junto con sus entradas y compras
- *
  * @param vTravelFk travel plantilla a clonar
  * @param vDateStart fecha del shipment del nuevo travel
  * @param vDateEnd fecha del landing del nuevo travel
- * @param vWarehouseOutFk fecha del salida del nuevo travel
+ * @param vWarehouseOutFk warehouse del salida del nuevo travel
  * @param vWarehouseInFk warehouse de landing del nuevo travel
  * @param vRef referencia del nuevo travel
  * @param vAgencyModeFk del nuevo travel
@@ -25,34 +24,35 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
+    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
 	DECLARE vRsEntry CURSOR FOR
 		SELECT e.id
 			FROM entry e
 				JOIN travel t ON t.id = e.travelFk
 			WHERE e.travelFk = vTravelFk;
-		
+
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN 
-		ROLLBACK;
+	BEGIN
+		CALL util.tx_rollback(vTx);
 		RESIGNAL;
 	END;
-	
-	START TRANSACTION;
+
+    CALL util.tx_start(vTx);
 
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk
 			FROM travel
 			WHERE id = vTravelFk;
-	
+
 	SET vNewTravelFk = LAST_INSERT_ID();
 
 	SET vDone = FALSE;
 	SET @isModeInventory = TRUE;
 
 	OPEN vRsEntry;
-	
+
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH vRsEntry INTO vAuxEntryFk;
@@ -62,7 +62,7 @@ BEGIN
 		END IF;
 
 		CALL entry_cloneHeader(vAuxEntryFk, vNewEntryFk, vNewTravelFk);
-		CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
+        CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
 
 		SELECT evaNotes INTO vEvaNotes
 			FROM entry
@@ -76,6 +76,6 @@ BEGIN
 	SET @isModeInventory = FALSE;
 	CLOSE vRsEntry;
 
-	COMMIT;
+    CALL util.tx_commit(vTx);
 END$$
 DELIMITER ;

db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql

@@ -27,7 +27,7 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
-    DECLARE vTx BOOLEAN DEFAULT !@@in_transaction;
+    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
 	DECLARE vRsEntry CURSOR FOR
 		SELECT e.id
 			FROM entry e
@@ -41,8 +41,8 @@ BEGIN
 		CALL util.tx_rollback(vTx);
 		RESIGNAL;
 	END;
-
-	CALL util.tx_start(vTx);
+   
+    CALL util.tx_start(vTx);  
 
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk

modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js

@@ -27,7 +27,10 @@ describe('Travel cloneWithEntries()', () => {
             expect(newTravel.warehouseOutFk).toEqual(warehouseThree);
             expect(newTravel.agencyModeFk).toEqual(agencyModeOne);
             expect(travelEntries.length).toBeGreaterThan(0);
-
+            await models.Entry.destroyAll({
+                travelFk: newTravelId
+            }, options);
+            await models.Travel.destroyById(newTravelId, options);
             await tx.rollback();
             const travelRemoved = await models.Travel.findById(newTravelId, options);