refs #5858 feat: comments

db/routines/vn/events/zone_getCollisions.sql

@@ -1,11 +1,11 @@
 DELIMITER $$
+
 CREATE EVENT IF NOT EXISTS `zone_getCollisions`
     ON SCHEDULE EVERY 1 DAY
     STARTS CURRENT_TIMESTAMP + INTERVAL 1 DAY
-    ENABLE
+    DO BEGIN
-    DO  BEGIN
         CALL `zone_getCollisions`();
-    -- Desactivar el evento después de ejecutarse
+        ALTER EVENT `zone_getCollisions` DISABLE;
-    ALTER EVENT `zone_getCollisions` DISABLE;
+    END$$
-END$$
+
-DELIMITER;
+DELIMITER ;

db/routines/vn/procedures/zone_getCollisions.sql

@@ -1,5 +1,6 @@
 DELIMITER $$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneIncluded_checkCollisions`()
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getCollisions`()
 BEGIN
 /**
  * Calcula si para un mismo codigo postal y dia
@@ -78,6 +79,7 @@ BEGIN
 	        GROUP BY z.agencyModeFk, zn.geoFk, zw.warehouseFk
 	        HAVING count(*) > 1;
 
+    -- Recojo los datos de la zona que ha dado conflicto
     SELECT JSON_ARRAYAGG(
         JSON_OBJECT(
             'zoneFk', zoneFk,
@@ -91,6 +93,7 @@ BEGIN
     JOIN warehouse w ON w.id = gc.warehouseFk
     INTO json_data;
 
+    -- Creo un registro de la notificacion 'zone-included' para reportar via email
     SELECT util.notification_send(
         'zone-included',
             JSON_OBJECT('zoneCollisions',json_data),
@@ -101,5 +104,5 @@ BEGIN
 		geoCollision,
 		tmp.zone,
 		tmp.zoneNodes;
-END ;;
+END$$
 DELIMITER ;

db/routines/vn/triggers/zoneIncluded_afterDelete.sql

@@ -8,6 +8,8 @@ BEGIN
 			`changedModel` = 'zoneIncluded',
 			`changedModelId` = OLD.zoneFk,
 			`userFk` = account.myUser_getId();
+
+    -- Activo el evento 'zone_getCollisions'
     UPDATE mysql.event SET status = 1 WHERE name = 'zone_getCollisions';
 END$$
 DELIMITER ;

db/routines/vn/triggers/zoneIncluded_beforeInsert.sql

@@ -4,6 +4,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeIn
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+    -- Activo el evento 'zone_getCollisions'
     UPDATE mysql.event SET status = 1 WHERE name = 'zone_getCollisions';
 END$$
 DELIMITER ;

db/routines/vn/triggers/zoneIncluded_beforeUpdate.sql

@@ -4,6 +4,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeUp
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+    -- Activo el evento 'zone_getCollisions'
     UPDATE mysql.event SET status = 1 WHERE name = 'zone_getCollisions';
 END$$
 DELIMITER ;

db/versions/10881-greenHydrangea/01-notification.vn.sql

@@ -0,0 +1,10 @@
+INSERT INTO util.notification (id, name,description)
+	VALUES (
+(SELECT MAX(id)+1 from util.notification n) , 'zone-included','An email to notify zoneCollisions');
+
+INSERT INTO util.notificationSubscription (notificationFk,userFk)
+		SELECT id, account.myUser_getId() FROM util.notification WHERE name= "zone-included";
+
+
+INSERT INTO util.notificationAcl (notificationFk,roleFk)
+	SELECT id, (SELECT id from `account`.`role` where name = "system") FROM util.notification WHERE name= "zone-included";

modules/zone/back/methods/zone/specs/deleteZone.spec.js

@@ -35,7 +35,6 @@ describe('zone deletezone()', () => {
 
         try {
             const options = {transaction: tx};
-
             await models.Zone.deleteZone(ctx, zoneId, options);
 
             const updatedZone = await models.Zone.findById(zoneId, null, options);