db/dump/fixtures.before.sql

@@ -2409,7 +2409,8 @@ INSERT INTO `vn`.`dmsType`(`id`, `name`, `readRoleFk`, `writeRoleFk`, `code`)
         (17, 'cmr',                 1,      1,      'cmr'),
         (18, 'dua',                 NULL,   NULL,   'dua'),
         (19, 'inmovilizado',        NULL,   NULL,   'fixedAssets'),
-        (20, 'Reclamación',         1,      1,      'claim');
+        (20, 'Reclamación',         1,      1,      'claim'),
+        (21, 'Entrada',             1,      1,      'entry');
 
 INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
     VALUES
@@ -2420,7 +2421,8 @@ INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `wa
         (5, 5,  '5.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'travel: 1',       'dmsForThermograph',                           util.VN_CURDATE()),
         (6, 5,  '6.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'NotExists',       'DoesNotExists',                               util.VN_CURDATE()),
         (7, 20, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1',              'TICKET ID  DEL CLIENTE BRUCE WAYNE ID 1101',  util.VN_CURDATE()),
-        (8, 20, '8.mp4', 'video/mp4',  9, 1, 442, NULL, FALSE, '1',              'TICKET ID  DEL CLIENTE BRUCE WAYNE ID 1101',  util.VN_CURDATE());
+        (8, 20, '8.mp4', 'video/mp4',  9, 1, 442, NULL, FALSE, '1',              'TICKET ID  DEL CLIENTE BRUCE WAYNE ID 1101',  util.VN_CURDATE()),
+        (9, 21, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1',              'ENTRADA ID 1',                                util.VN_CURDATE());
 
 INSERT INTO `vn`.`claimDms`(`claimFk`, `dmsFk`)
     VALUES
@@ -3064,6 +3066,10 @@ INSERT INTO `vn`.`clientSms` (`id`, `clientFk`, `smsFk`, `ticketFk`)
         (13, 1101, 1, NULL),
         (14, 1101, 4, 27);
 
+INSERT INTO `vn`.`entryDms`(`entryFk`, `dmsFk`, `editorFk`)
+    VALUES
+        (1, 9, 9);
+
 INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentInstruccions,specialAgreements,companyFk,addressToFk,addressFromFk,supplierFk,packagesList,merchandiseDetail,state)
 	VALUES (1,'123456A','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',442,1,2,1,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
 	    (2,'123456N','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',69,3,4,2,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),

db/routines/vn/procedures/workerTimeControl_clockIn.sql

@@ -75,7 +75,7 @@ BEGIN
 
 	SET vDated = DATE(vTimed);
 
-	SELECT IF(pc.code = 'driveCE',
+	SELECT IF(pc.code = 'driverCE',
 				wc.dayBreakDriver,
 				wc.dayBreak),
 			wc.shortWeekBreak,

db/routines/vn/triggers/entryDms_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entryDms_afterDelete`
+	AFTER DELETE ON `entryDms`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO entryLog
+		SET `action` = 'delete',
+			`changedModel` = 'EntryDms',
+			`changedModelId` = OLD.entryFk,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/entryDms_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entryDms_beforeInsert`
+	BEFORE INSERT ON `entryDms`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/entryDms_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entryDms_beforeUpdate`
+	BEFORE UPDATE ON `entryDms`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/versions/10841-orangeGalax/00-entryDms.sql

@@ -0,0 +1,15 @@
+CREATE OR REPLACE TABLE `vn`.`entryDms` (
+  `entryFk` int(11) NOT NULL,
+  `dmsFk` int(11) NOT NULL,
+  `editorFk` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`entryFk`,`dmsFk`),
+  KEY `gestdoc_id` (`dmsFk`),
+  KEY `entryDms_editor` (`editorFk`),
+  CONSTRAINT `entryDms_dms` FOREIGN KEY (`dmsFk`) REFERENCES `dms` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `entryDms_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
+  CONSTRAINT `entryDms_entry` FOREIGN KEY (`entryFk`) REFERENCES `entry` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('EntryDms', '*', '*', 'ALLOW', 'ROLE', 'employee');

db/versions/10841-orangeGalax/00-entryDmsType.vn.sql

@@ -0,0 +1,2 @@
+INSERT INTO `vn`.`dmsType` (code, name, path__, writeRoleFk, readRoleFk, monthToDelete)
+    VALUES('entry', 'Entrada', '', 1, 1, NULL);

db/versions/10906-limeIvy/00-firstScript.sql

@@ -0,0 +1,6 @@
+ALTER TABLE vn.professionalCategory DROP COLUMN IF EXISTS code;
+ALTER TABLE IF EXISTS vn.professionalCategory ADD COLUMN code VARCHAR(25) UNIQUE DEFAULT NULL;
+
+UPDATE vn.professionalCategory
+    SET code = 'driverCE'
+    WHERE name = 'Conductor C + E';

loopback/locale/es.json

@@ -336,6 +336,7 @@
     "Incorrect pin": "Pin incorrecto",
     "You already have the mailAlias": "Ya tienes este alias de correo",
     "The alias cant be modified": "Este alias de correo no puede ser modificado",
+    "this warehouse has not dms": "El Almacén no acepta documentos",
     "This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
     "Name should be uppercase": "El nombre debe ir en mayúscula",
     "Bank entity must be specified": "La entidad bancaria es obligatoria",
@@ -345,4 +346,4 @@
     "Cmr file does not exist": "El archivo del cmr no existe",
     "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
     "No tickets to invoice": "No hay tickets para facturar"
-}
+}

loopback/server/datasources.json

@@ -103,6 +103,20 @@
             "video/mp4"
         ]
     },
+    "entryStorage": {
+        "name": "entryStorage",
+        "connector": "loopback-component-storage",
+        "provider": "filesystem",
+        "root": "./storage/dms",
+        "maxFileSize": "31457280",
+        "allowedContentTypes": [
+            "image/png",
+            "image/jpeg",
+            "image/jpg",
+            "image/webp",
+            "video/mp4"
+        ]
+    },
     "accessStorage": {
         "name": "accessStorage",
         "connector": "loopback-component-storage",

modules/entry/back/methods/entry-dms/downloadFile.js

@@ -0,0 +1,59 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('downloadFile', {
+        description: 'Get the entry file',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'Number',
+                description: 'The document id',
+                http: {source: 'path'}
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            },
+            {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            },
+            {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: `/:id/downloadFile`,
+            verb: 'GET'
+        }
+    });
+
+    Self.downloadFile = async function(ctx, id) {
+        const models = Self.app.models;
+        const EntryContainer = models.EntryContainer;
+        const dms = await models.Dms.findById(id);
+        const pathHash = EntryContainer.getHash(dms.id);
+        try {
+            await EntryContainer.getFile(pathHash, dms.file);
+        } catch (e) {
+            if (e.code != 'ENOENT')
+                throw e;
+
+            const error = new UserError(`File doesn't exists`);
+            error.statusCode = 404;
+
+            throw error;
+        }
+
+        const stream = EntryContainer.downloadStream(pathHash, dms.file);
+
+        return [stream, dms.contentType, `filename="${dms.file}"`];
+    };
+};

modules/entry/back/methods/entry-dms/removeFile.js

@@ -0,0 +1,53 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('removeFile', {
+        description: 'Removes a entry document',
+        accessType: 'WRITE',
+        accepts: {
+            arg: 'id',
+            type: 'number',
+            description: 'The document id',
+            http: {source: 'path'}
+        },
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:id/removeFile`,
+            verb: 'POST'
+        }
+    });
+
+    Self.removeFile = async(ctx, id, options) => {
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const targetEntryDms = await Self.findById(id, null, myOptions);
+            const targetDms = await Self.app.models.Dms.removeFile(ctx, targetEntryDms.dmsFk, myOptions);
+
+            if (!targetDms)
+                throw new UserError('Try again');
+
+            const entryDmsDestroyed = await targetEntryDms.destroy(myOptions);
+
+            if (tx) await tx.commit();
+
+            return entryDmsDestroyed;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};
+

modules/entry/back/methods/entry-dms/uploadFile.js

@@ -0,0 +1,86 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('uploadFile', {
+        description: 'Upload and attach a file',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            description: 'The entry id',
+            http: {source: 'path'}
+        },
+        {
+            arg: 'warehouseId',
+            type: 'number',
+            description: 'The warehouse id',
+            required: true
+        },
+        {
+            arg: 'companyId',
+            type: 'number',
+            description: 'The company id',
+            required: true
+        },
+        {
+            arg: 'dmsTypeId',
+            type: 'number',
+            description: 'The dms type id',
+            required: true
+        },
+        {
+            arg: 'reference',
+            type: 'string',
+            required: true
+        },
+        {
+            arg: 'description',
+            type: 'string',
+            required: true
+        },
+        {
+            arg: 'hasFile',
+            type: 'boolean',
+            description: 'True if has an attached file',
+            required: true
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:id/uploadFile`,
+            verb: 'POST'
+        }
+    });
+
+    Self.uploadFile = async(ctx, id, options) => {
+        const {Dms, EntryDms} = Self.app.models;
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
+
+            const promises = uploadedFiles.map(dms => EntryDms.create({
+                entryFk: id,
+                dmsFk: dms.id
+            }, myOptions));
+            await Promise.all(promises);
+
+            if (tx) await tx.commit();
+
+            return uploadedFiles;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/entry/back/model-config.json

@@ -2,6 +2,12 @@
     "Entry": {
         "dataSource": "vn"
     },
+    "EntryDms": {
+        "dataSource": "vn"
+    },
+    "EntryContainer": {
+        "dataSource": "entryStorage"
+    },
     "Buy": {
         "dataSource": "vn"
     },

modules/entry/back/models/entry-container.json

@@ -0,0 +1,10 @@
+{
+    "name": "EntryContainer",
+    "base": "Container",
+    "acls": [{
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+    }]
+}

modules/entry/back/models/entry-dms.js

@@ -0,0 +1,13 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    require('../methods/entry-dms/removeFile')(Self);
+    require('../methods/entry-dms/downloadFile')(Self);
+    require('../methods/entry-dms/uploadFile')(Self);
+
+    Self.rewriteDbError(function(err) {
+        if (err.code === 'ER_DUP_ENTRY')
+            return new UserError('This document already exists on this entry');
+        return err;
+    });
+};

modules/entry/back/models/entry-dms.json

@@ -0,0 +1,36 @@
+{
+    "name": "EntryDms",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
+    "options": {
+        "mysql": {
+            "table": "entryDms"
+        }
+    },
+    "allowedContentTypes": [
+        "image/png",
+        "image/jpeg",
+        "image/jpg"
+    ],
+    "properties": {
+        "dmsFk": {
+            "type": "number",
+            "id": true,
+            "required": true
+        }
+    },
+    "relations": {
+        "entry": {
+            "type": "belongsTo",
+            "model": "Entry",
+            "foreignKey": "entryFk"
+        },
+        "dms": {
+            "type": "belongsTo",
+            "model": "Dms",
+            "foreignKey": "dmsFk"
+        }
+    }
+}