From 530c300ea5f24a76d9867c9593183de4c8d649af Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Thu, 1 Dec 2022 15:15:46 +0100
Subject: [PATCH] declaring models deliveryMan

---
 .../10510-december/00-gastos_reparto.sql      | 13 +++--
 .../back/methods/route/getDeliveryMan.js      | 51 -------------------
 modules/route/back/models/deliveryMan.json    |  2 +-
 modules/route/back/models/route.js            |  1 -
 4 files changed, 9 insertions(+), 58 deletions(-)
 delete mode 100644 modules/route/back/methods/route/getDeliveryMan.js

diff --git a/db/changes/10510-december/00-gastos_reparto.sql b/db/changes/10510-december/00-gastos_reparto.sql
index c95a8643df..cd28e28321 100644
--- a/db/changes/10510-december/00-gastos_reparto.sql
+++ b/db/changes/10510-december/00-gastos_reparto.sql
@@ -9,10 +9,12 @@ CREATE TABLE `vn`.`routeDeliveryMan` (
 ) ENGINE=InnoDB;
 
 CREATE TABLE `vn`.`routeDeliveryManAgency` (
-    `deliveryManFk` INT UNSIGNED NOT NULL,
-    `agencyModeFk` INT NOT NULL,
-    CONSTRAINT `routeDeliveryManAgency_FK` FOREIGN KEY (`agencyModeFk`) REFERENCES `vn`.`agencyMode`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE,
-    CONSTRAINT `routeDeliveryManAgency_FK_1` FOREIGN KEY (`deliveryManFk`) REFERENCES `vn`.`routeDeliveryMan`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE
+  `deliveryManFk` int(10) unsigned NOT NULL,
+  `agencyModeFk` int(11) NOT NULL,
+  PRIMARY KEY (`deliveryManFk`),
+  KEY `routeDeliveryManAgency_FK` (`agencyModeFk`),
+  CONSTRAINT `routeDeliveryManAgency_FK` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `routeDeliveryManAgency_FK_1` FOREIGN KEY (`deliveryManFk`) REFERENCES `routeDeliveryMan` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDB;
 
 ALTER TABLE `vn`.`route` ADD `invoiceOutFk` varchar(10) NULL;
@@ -20,4 +22,5 @@ ALTER TABLE `vn`.`route` ADD CONSTRAINT `route_FK` FOREIGN KEY (`invoiceOutFk`)
 
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
-        ('DeliveryMan', '*', '*', 'ALLOW', 'ROLE', 'employee');
+        ('DeliveryMan', '*', '*', 'ALLOW', 'ROLE', 'employee'),
+        ('DeliveryManAgency', '*', '*', 'ALLOW', 'ROLE', 'employee');
diff --git a/modules/route/back/methods/route/getDeliveryMan.js b/modules/route/back/methods/route/getDeliveryMan.js
deleted file mode 100644
index f5501c12c5..0000000000
--- a/modules/route/back/methods/route/getDeliveryMan.js
+++ /dev/null
@@ -1,51 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethod('getDeliveryMan', {
-        description: 'Returns the list of delivery men',
-        accepts: [
-            {
-                arg: 'id',
-                type: 'number',
-                required: false,
-                description: 'The delivery man id',
-                http: {source: 'path'}
-            }],
-        accessType: 'READ',
-        returns: {
-            type: 'Object',
-            root: true
-        },
-        http: {
-            path: `/getDeliveryMan`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getDeliveryMan = async(id, options) => {
-        const models = Self.app.models;
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        const deliveryMan = await models.DeliveryMan.find({
-            where: {
-                id
-            },
-            include: [{
-                relation: 'deliveryManAgency',
-                scope:
-                {
-                    include: {
-                        relation: 'agencyMode'
-                    }
-                }
-            },
-            {
-                relation: 'supplier'
-            }]
-        });
-
-        return deliveryMan;
-    };
-};
diff --git a/modules/route/back/models/deliveryMan.json b/modules/route/back/models/deliveryMan.json
index a0e5939dc2..2a13921532 100644
--- a/modules/route/back/models/deliveryMan.json
+++ b/modules/route/back/models/deliveryMan.json
@@ -29,7 +29,7 @@
             "foreignKey": "supplierFk"
         },
 		"deliveryManAgency": {
-            "type": "hasMany",
+            "type": "hasOne",
             "model": "DeliveryManAgency",
             "foreignKey": "deliveryManFk"
         }
diff --git a/modules/route/back/models/route.js b/modules/route/back/models/route.js
index 98b67a1664..57db81048b 100644
--- a/modules/route/back/models/route.js
+++ b/modules/route/back/models/route.js
@@ -13,7 +13,6 @@ module.exports = Self => {
     require('../methods/route/driverRoutePdf')(Self);
     require('../methods/route/driverRouteEmail')(Self);
     require('../methods/route/sendSms')(Self);
-    require('../methods/route/getDeliveryMan')(Self);
     require('../methods/route/updateDeliveryMan')(Self);
 
     Self.validate('kmStart', validateDistance, {