From 8d44bb8867f159f3cc3d648d0025e112a6f79fe4 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 17 Oct 2023 15:05:48 +0200
Subject: [PATCH] =?UTF-8?q?refactor(toggleIsIcluded):=20actualizo=20la=20v?=
 =?UTF-8?q?ersi=C3=B3n=20y=20modifico=20el=20proc=20refs=20#5749?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{232401 => 234201}/00-zoneIncluded.sql    |  7 +++---
 .../back/methods/zone/toggleIsIncluded.js     | 24 +++++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)
 rename db/changes/{232401 => 234201}/00-zoneIncluded.sql (83%)

diff --git a/db/changes/232401/00-zoneIncluded.sql b/db/changes/234201/00-zoneIncluded.sql
similarity index 83%
rename from db/changes/232401/00-zoneIncluded.sql
rename to db/changes/234201/00-zoneIncluded.sql
index 592350629..12d4058cf 100644
--- a/db/changes/232401/00-zoneIncluded.sql
+++ b/db/changes/234201/00-zoneIncluded.sql
@@ -13,15 +13,14 @@ DROP TRIGGER IF EXISTS `vn`.`zoneIncluded_afterDelete`;
 USE `vn`;
 
 DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_afterDelete`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_afterDelete`
 	AFTER DELETE ON `zoneIncluded`
 	FOR EACH ROW
 BEGIN
 	INSERT INTO zoneLog
 		SET `action` = 'delete',
-			`changedModel` = 'ZoneIncluded',
-			`changedModelId` = OLD.id,
+			`changedModel` = 'zoneIncluded',
+			`changedModelId` = OLD.zoneFk,
 			`userFk` = account.myUser_getId();
 END$$
 DELIMITER ;
diff --git a/modules/zone/back/methods/zone/toggleIsIncluded.js b/modules/zone/back/methods/zone/toggleIsIncluded.js
index 06532e5c0..98c64c4a0 100644
--- a/modules/zone/back/methods/zone/toggleIsIncluded.js
+++ b/modules/zone/back/methods/zone/toggleIsIncluded.js
@@ -30,23 +30,21 @@ module.exports = Self => {
     Self.toggleIsIncluded = async(id, geoId, isIncluded, options) => {
         const models = Self.app.models;
         const myOptions = {};
-
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
         if (isIncluded === undefined)
             return models.ZoneIncluded.destroyAll({zoneFk: id, geoFk: geoId}, myOptions);
-        else {
-            const zoneIncluded = await models.ZoneIncluded.findOne({where: {zoneFk: id, geoFk: geoId}}, myOptions);
-            if (zoneIncluded)
-                return zoneIncluded.updateAttribute('isIncluded', isIncluded, myOptions);
-            else {
-                return models.ZoneIncluded.create({
-                    zoneFk: id,
-                    geoFk: geoId,
-                    isIncluded: isIncluded
-                }, myOptions);
-            }
-        }
+
+        const zoneIncluded = await models.ZoneIncluded.findOne({where: {zoneFk: id, geoFk: geoId}}, myOptions);
+
+        if (zoneIncluded)
+            return zoneIncluded.updateAttribute('isIncluded', isIncluded, myOptions);
+
+        return models.ZoneIncluded.create({
+            zoneFk: id,
+            geoFk: geoId,
+            isIncluded: isIncluded
+        }, myOptions);
     };
 };