new model expedition, add fixtures for the model and update ACL

services/db/04-fixtures.sql

@@ -397,6 +397,12 @@ INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,
         (4, 'Mark I',           1, 60, 'AMR', 'EXT', 1, 1, 'Iron Mans first armor',         1, 05080000, 1, 2, 0, NULL, 0, 66090, 2),
         (5, 'Mjolnir',          3, 30, 'AZR', 'EXT', 1, 2, 'Thors hammer!',                 2, 06021010, 1, 2, 0, NULL, 0, 67350, 2);
 
+INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`)
+    VALUES
+        ( 1, 1, 1, 0, CURDATE(), 1, 0, 2, 1),
+        ( 2, 1, 1, 1, CURDATE(), 2, 1, 0, 2),
+        ( 3, 2, 2, 2, CURDATE(), 3, 2, 0, NULL);
+
 INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPackageReturnable`, `created`, `itemFk`, `price`)
     VALUES
         (1, 0.00,    10, 10, 0, 0, CURDATE(), 1, 1.50),

services/db/changes/1.0.2/01-ACLinserts.sql

@@ -8,4 +8,5 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Packaging', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Packaging', '*', 'WRITE', 'ALLOW', 'ROLE', 'logistic');
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('SaleChecked', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('SaleComponent', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('SaleComponent', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Expedition', '*', 'READ', 'ALLOW', 'ROLE', 'employee');

services/db/changes/1.0.2/05-expedition.sql

@@ -0,0 +1,19 @@
+USE `vn`;
+CREATE 
+     OR REPLACE ALGORITHM = UNDEFINED 
+    DEFINER = `root`@`%` 
+    SQL SECURITY DEFINER
+VIEW `vn`.`expedition` AS
+    SELECT 
+        `e`.`expeditions_id` AS `id`,
+        `e`.`agency_id` AS `agencyModeFk`,
+        `e`.`ticket_id` AS `ticketFk`,
+        `e`.`EsBulto` AS `isBox`,
+        `e`.`odbc_date` AS `created`,
+        `e`.`Id_Article` AS `itemFk`,
+        `e`.`counter` AS `counter`,
+        `e`.`checked` AS `checked`,
+        `e`.`workerFk` AS `workerFk`
+    FROM
+        `vn2008`.`expeditions` `e`
+

services/loopback/common/models/agency-mode.json

@@ -41,5 +41,13 @@
       "model": "AgencyType",
       "foreignKey": "agencyTypeFk"
     }
-  }
+  },
+  "acls": [
+    {
+      "accessType": "READ",
+      "principalType": "ROLE",
+      "principalId": "$everyone",
+      "permission": "ALLOW"
+    }
+  ]
 }

services/ticket/common/models/expedition.json

@@ -0,0 +1,51 @@
+{
+    "name": "Expedition",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "expedition"
+        }
+    },
+    "properties": {
+      "id": {
+        "id": true,
+        "type": "Number",
+        "description": "Identifier"
+      },
+      "isBox": {
+        "type": "Number"
+      },
+      "created": {
+        "type": "Date"
+      },
+      "counter": {
+        "type": "Number"
+      },
+      "checked": {
+        "type": "Number"
+      }
+    },
+    "relations": {
+      "ticket": {
+        "type": "belongsTo",
+        "model": "Ticket",
+        "foreignKey": "ticketFk"
+      },
+      "agencyMode": {
+        "type": "belongsTo",
+        "model": "agency-mode",
+        "foreignKey": "agencyModeFk"
+      },
+      "item": {
+        "type": "belongsTo",
+        "model": "Item",
+        "foreignKey": "itemFk"
+      },
+      "worker": {
+        "type": "belongsTo",
+        "model": "Worker",
+        "foreignKey": "workerFk"
+      }
+    }
+  }
+  

services/ticket/server/model-config.json

@@ -25,6 +25,9 @@
   },
   "SaleComponent": {
     "dataSource": "vn"
+  },
+  "Expedition": {
+    "dataSource": "vn"
   }
 }