refs #5749 added id

db/changes/232401/00-zoneIncluded.sql

@@ -0,0 +1,27 @@
+ALTER TABLE `vn`.`zoneIncluded`
+  ADD COLUMN `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
+  DROP PRIMARY KEY,
+  DROP FOREIGN KEY `zoneFk2`,
+  DROP FOREIGN KEY `zoneGeoFk2`,
+  DROP KEY `geoFk_idx`,
+  ADD PRIMARY KEY (`id`),
+  ADD CONSTRAINT `zoneIncluded_FK_1` FOREIGN KEY (zoneFk) REFERENCES `vn`.`zone`(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT `zoneIncluded_FK_2` FOREIGN KEY (geoFk) REFERENCES `vn`.`zoneGeo`(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT `unique_zone_geo` UNIQUE (`zoneFk`, `geoFk`);
+
+DROP TRIGGER IF EXISTS `vn`.`zoneIncluded_afterDelete`;
+USE `vn`;
+
+DELIMITER $$
+$$
+CREATE 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,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

modules/zone/back/methods/zone/toggleIsIncluded.js

@@ -37,11 +37,16 @@ module.exports = Self => {
         if (isIncluded === undefined)
             return models.ZoneIncluded.destroyAll({zoneFk: id, geoFk: geoId}, myOptions);
         else {
-            return models.ZoneIncluded.upsert({
-                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);
+            else {
+                return models.ZoneIncluded.create({
+                    zoneFk: id,
+                    geoFk: geoId,
+                    isIncluded: isIncluded
+                }, myOptions);
+            }
         }
     };
 };

modules/zone/back/models/zone-included.json

@@ -7,8 +7,8 @@
 		}
 	},
 	"properties": {
-		"zoneFk": {
-			"id": true,
+		"id": {
+            "id": true,
 			"type": "number"
 		},
 		"isIncluded": {