Merge pull request 'refactor: refs #7580 Fix and improvement' (!2700) from 7580-setParkingfIX into dev

Reviewed-on: #2700 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-12 07:34:45 +00:00 · 2024-07-12 07:34:45 +00:00 · 5ed8b33cef
parent b1290a539b 96a157d2f7
commit 5ed8b33cef
5 changed files with 82 additions and 62 deletions
--- a/db/routines/vn/procedures/collection_setParking.sql
+++ b/db/routines/vn/procedures/collection_setParking.sql
@ -1,15 +1,18 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_setParking`(IN `vCollectionFk` VARCHAR(8), IN `vParkingFk` INT)
-proc: BEGIN
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_setParking`(
+	vSelf INT,
+	vParkingFk INT
+)
+BEGIN
 /**
 * Aparca una colección en un parking.
 *
- * @param vCollectionFk Id de la colección
- * @param vParkingFk Id del parking
+ * @param vSelf Id colección
+ * @param vParkingFk Id parking
 */
-	REPLACE vn.ticketParking(ticketFk, parkingFk)
+	REPLACE ticketParking(ticketFk, parkingFk)
 		SELECT tc.ticketFk, vParkingFk
-			FROM vn.ticketCollection tc
-			WHERE tc.collectionFk = vCollectionFk;
+			FROM ticketCollection tc
+			WHERE tc.collectionFk = vSelf;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/saleGroup_setParking.sql
+++ b/db/routines/vn/procedures/saleGroup_setParking.sql
@ -1,17 +1,25 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`saleGroup_setParking`(IN `vSaleGroupFk` VARCHAR(8), IN `vParkingFk` INT)
-proc: BEGIN
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`saleGroup_setParking`(
+	vSaleGroupFk VARCHAR(8),
+	vParkingFk INT
+)
+BEGIN
 /**
- * Aparca una preparación previa en un parking
+ * Aparca una preparación previa en un parking.
 *
 * @param vSaleGroupFk id de la preparación previa
 * @param vParkingFk id del parking
 */
-	UPDATE vn.saleGroup sg
+ 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
+	UPDATE saleGroup sg
 		SET sg.parkingFk = vParkingFk
 			WHERE sg.id = vSaleGroupFk
-				AND sg.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+				AND sg.created >= util.VN_CURDATE() - INTERVAL 1 WEEK;

-	CALL vn.ticket_setNextState(vn.ticket_get(vSaleGroupFk));
+	CALL ticket_setNextState(ticket_get(vSaleGroupFk));
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/setParking.sql
+++ b/db/routines/vn/procedures/setParking.sql
@ -1,6 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`setParking`(IN `vParam` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
-proc: BEGIN
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`setParking`(
+	vParam VARCHAR(8),
+	vParkingCode VARCHAR(8)
+)
+BEGIN
 /**
 * Aparca una colección, un ticket, un saleGroup o un shelving en un parking
 *
@ -8,56 +11,43 @@ proc: BEGIN
 * @param vParkingCode código del parking
 */
 	DECLARE vParkingFk INT;
-	DECLARE vIsSaleGroup BOOL;
-	DECLARE vIsTicket BOOL;
-	DECLARE vIsCollection BOOL;
+	DECLARE vLastWeek DATE;

-	SET vParkingCode = replace(vParkingCode,' ','');
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	SET vParkingCode = REPLACE(vParkingCode, ' ', '');

 	SELECT id INTO vParkingFk
-		FROM vn.parking
+		FROM parking
 		WHERE code = vParkingCode COLLATE utf8_unicode_ci;

 	IF vParkingFk IS NULL THEN
 		CALL util.throw('parkingNotExist');
-		LEAVE proc;
 	END IF;
-	
-	IF  vParam REGEXP '^[0-9]+$' THEN
-		-- Se comprueba si es una preparación previa
-		SELECT COUNT(*) INTO vIsSaleGroup
-			FROM vn.saleGroup sg
-			WHERE sg.id = vParam;

-		IF vIsSaleGroup THEN
-			CALL vn.saleGroup_setParking(vParam, vParkingFk);
-			LEAVE proc;
-		END IF;
+	START TRANSACTION;

-		-- Se comprueba si es un ticket
-		SELECT COUNT(*) INTO vIsTicket
-			FROM vn.ticket t
-			WHERE t.id = vParam
-				AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+	IF vParam REGEXP '^[0-9]+$' THEN
+		SET vLastWeek = util.VN_CURDATE() - INTERVAL 1 WEEK;

-		IF vIsTicket THEN
-			CALL vn.ticket_setParking(vParam, vParkingFk);
-			LEAVE proc;
-		END IF;
-
-		-- Se comprueba si es una coleccion de tickets
-		SELECT COUNT(*) INTO vIsCollection
-			FROM vn.collection c
-			WHERE c.id = vParam
-				AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
-		IF vIsCollection THEN
-			CALL vn.collection_setParking(vParam, vParkingFk);
-			LEAVE proc;
+		-- Comprobamos si es una prep. previa, ticket, colección o shelving
+		IF (SELECT TRUE FROM saleGroup WHERE id = vParam) THEN
+			CALL saleGroup_setParking(vParam, vParkingFk);
+		ELSEIF (SELECT TRUE FROM ticket	WHERE id = vParam AND shipped >= vLastWeek) THEN
+			CALL ticket_setParking(vParam, vParkingFk);
+		ELSEIF (SELECT TRUE	FROM `collection` WHERE id = vParam AND created >= vLastWeek) THEN
+			CALL collection_setParking(vParam, vParkingFk);
+		ELSEIF (SELECT TRUE	FROM shelving WHERE code = vParam COLLATE utf8_unicode_ci) THEN
+			CALL shelving_setParking(vParam, vParkingFk);
 		END IF;
 	ELSE
-		-- Por descarte, se considera una matrícula
-		CALL vn.shelving_setParking(vParam, vParkingFk);
+		CALL util.throw('paramNotExist');
 	END IF;
+
+	COMMIT;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setNextState.sql
+++ b/db/routines/vn/procedures/ticket_setNextState.sql
@ -1,14 +1,21 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setNextState`(vSelf INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setNextState`(
+	vSelf INT
+)
 BEGIN
 /**
- * Cambia el estado del ticket al siguiente estado según la tabla state
+ * Cambia el estado del ticket al siguiente estado según la tabla state.
 *
- * @param vSelf id dle ticket
+ * @param vSelf Id ticket
 */
 	DECLARE vStateFk INT;
 	DECLARE vNewStateFk INT;

+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
 	SELECT stateFk INTO vStateFk
 		FROM ticketState
 		WHERE ticketFk = vSelf;
@ -17,6 +24,10 @@ BEGIN
 		FROM state
 		WHERE id = vStateFk;

+	IF vNewStateFk IS NULL THEN
+		CALL util.throw('The ticket not have next state');
+	END IF;
+
 	INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 		VALUES (vNewStateFk, vSelf, account.myUser_getId());
 END$$
--- a/db/routines/vn/procedures/ticket_setParking.sql
+++ b/db/routines/vn/procedures/ticket_setParking.sql
@ -1,11 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setParking`(IN `vTicketFk` VARCHAR(8), IN `vParkingFk` INT)
-proc: BEGIN
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setParking`(
+	vSelf INT,
+	vParkingFk INT
+)
+BEGIN
 /**
- * Aparca un ticket en un parking
+ * Aparca un ticket en un parking.
 *
- * @param vTicketFk id del ticket
- * @param vParkingFk id del parking
+ * @param vSelf Id ticket
+ * @param vParkingFk Id parking
 */
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vCollectionTicketFk INT;
@ -14,16 +17,21 @@ proc: BEGIN
 			FROM ticket t
 				LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
 				LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
-			WHERE t.id = vTicketFk;
+			WHERE t.id = vSelf;

 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
 	INSERT INTO vn.ticketParking(ticketFk, parkingFk)
 		SELECT IFNULL(tc2.ticketFk, t.id), vParkingFk
 			FROM ticket t
 				LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
 				LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
-			WHERE t.id = vTicketFk
+			WHERE t.id = vSelf
 		ON DUPLICATE KEY UPDATE parkingFk = vParkingFk;

 	OPEN vCursor;