feat(claim_photo): can upload videos

back/methods/dms/uploadFile.js

@@ -49,7 +49,7 @@ module.exports = Self => {
     Self.uploadFile = async(ctx, options) => {
         const models = Self.app.models;
         const TempContainer = models.TempContainer;
-        const DmsContainer = models.ClaimContainer;
+        const DmsContainer = models.DmsContainer;
         const fileOptions = {};
         const args = ctx.args;
 

loopback/server/datasources.json

@@ -59,8 +59,7 @@
             "multipart/x-zip",
             "image/png",
             "image/jpeg",
-            "image/jpg",
-            "video/mp4"
+            "image/jpg"
         ]
     },
     "imageStorage": {

modules/claim/back/methods/claim/downloadFile.js

@@ -0,0 +1,59 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('downloadFile', {
+        description: 'Get the user image',
+        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 ClaimContainer = models.ClaimContainer;
+        const dms = await models.Dms.findById(id);
+        const pathHash = ClaimContainer.getHash(dms.id);
+        try {
+            await ClaimContainer.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 = ClaimContainer.downloadStream(pathHash, dms.file);
+
+        return [stream, dms.contentType, `filename="${dms.file}"`];
+    };
+};

modules/claim/back/methods/claim/uploadFile.js

@@ -1,3 +1,7 @@
+const UserError = require('vn-loopback/util/user-error');
+const fs = require('fs-extra');
+const path = require('path');
+
 module.exports = Self => {
     Self.remoteMethodCtx('uploadFile', {
         description: 'Upload and attach a document',
@@ -65,10 +69,42 @@ module.exports = Self => {
         }
         const models = Self.app.models;
         const promises = [];
+        const TempContainer = models.TempContainer;
+        const ClaimContainer = models.ClaimContainer;
+        const fileOptions = {};
+        const args = ctx.args;
 
         try {
-            const uploadedFiles = await models.Dms.uploadFile(ctx, myOptions);
-            uploadedFiles.forEach(dms => {
+            const hasWriteRole = await models.DmsType.hasWriteRole(ctx, args.dmsTypeId, myOptions);
+            if (!hasWriteRole)
+                throw new UserError(`You don't have enough privileges`);
+
+            // Upload file to temporary path
+            const tempContainer = await TempContainer.container('dms');
+            const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions);
+            const files = Object.values(uploaded.files).map(file => {
+                return file[0];
+            });
+
+            const addedDms = [];
+            for (const uploadedFile of files) {
+                const newDms = await createDms(ctx, uploadedFile, myOptions);
+                const pathHash = ClaimContainer.getHash(newDms.id);
+
+                const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name);
+                srcFile = path.join(file.client.root, file.container, file.name);
+
+                const claimContainer = await ClaimContainer.container(pathHash);
+                const dstFile = path.join(claimContainer.client.root, pathHash, newDms.file);
+
+                await fs.move(srcFile, dstFile, {
+                    overwrite: true
+                });
+
+                addedDms.push(newDms);
+            }
+
+            addedDms.forEach(dms => {
                 const newClaimDms = models.ClaimDms.create({
                     claimFk: id,
                     dmsFk: dms.id
@@ -86,4 +122,27 @@ module.exports = Self => {
             throw e;
         }
     };
+
+    async function createDms(ctx, file, myOptions) {
+        const models = Self.app.models;
+        const myUserId = ctx.req.accessToken.userId;
+        const args = ctx.args;
+
+        const newDms = await models.Dms.create({
+            workerFk: myUserId,
+            dmsTypeFk: args.dmsTypeId,
+            companyFk: args.companyId,
+            warehouseFk: args.warehouseId,
+            reference: args.reference,
+            description: args.description,
+            contentType: file.type,
+            hasFile: args.hasFile
+        }, myOptions);
+
+        let fileName = file.name;
+        const extension = models.DmsContainer.getFileExtension(fileName);
+        fileName = `${newDms.id}.${extension}`;
+
+        return newDms.updateAttribute('file', fileName, myOptions);
+    }
 };

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

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

modules/claim/back/models/claim.js

@@ -7,4 +7,5 @@ module.exports = Self => {
     require('../methods/claim/uploadFile')(Self);
     require('../methods/claim/updateClaimAction')(Self);
     require('../methods/claim/isEditable')(Self);
+    require('../methods/claim/downloadFile')(Self);
 };

modules/claim/front/photos/index.html

@@ -40,7 +40,7 @@
 </vn-confirm>
 <vn-float-button
     icon="add"
-    vn-tooltip="Select photo" 
+    vn-tooltip="Select file" 
     vn-bind="+"
     ng-click="$ctrl.openUploadDialog()"
     fixed-bottom-right>

modules/claim/front/photos/index.js

@@ -20,7 +20,7 @@ class Controller extends Section {
         return this.$http.post(`ClaimDms/${dmsFk}/removeFile`)
             .then(() => {
                 this.$.model.remove(index);
-                this.vnApp.showSuccess(this.$t('Photo deleted'));
+                this.vnApp.showSuccess(this.$t('File deleted'));
             });
     }
 
@@ -88,13 +88,13 @@ class Controller extends Section {
             data: this.dms.files
         };
         this.$http(options).then(() => {
-            this.vnApp.showSuccess(this.$t('Photo uploaded!'));
+            this.vnApp.showSuccess(this.$t('File uploaded!'));
             this.$.model.refresh();
         });
     }
 
     getImagePath(dmsId) {
-        return this.vnFile.getPath(`/api/claim/${dmsId}/downloadFile`);
+        return this.vnFile.getPath(`/api/Claims/${dmsId}/downloadFile`);
     }
 }
 

modules/claim/front/photos/locale/es.yml

@@ -1,5 +1,5 @@
 Are you sure you want to continue?: ¿Seguro que quieres continuar?
 Drag & Drop photos here...: Arrastra y suelta fotos aquí...
-Photo deleted: Foto eliminada
-Photo uploaded!: Foto subida!
-Select photo: Seleccionar foto
+File deleted: Archivo eliminado
+File uploaded!: Archivo subido!
+Select file: Seleccionar fichero