Merge branch 'dev' into 6220-addressFilter

back/methods/dms/removeFile.js

@@ -22,8 +22,8 @@ module.exports = Self => {
 
     Self.removeFile = async(ctx, id, options) => {
         const models = Self.app.models;
-        let tx;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);

e2e/paths/08-route/03_create_and_clone.spec.js

@@ -26,7 +26,7 @@ describe('Route create path', () => {
             await page.waitToClick(selectors.createRouteView.submitButton);
             const message = await page.waitForSnackbar();
 
-            expect(message.text).toContain('Access denied');
+            expect(message.text).toContain('Access Denied');
         });
     });
 

front/core/services/locale/en.yml

@@ -3,4 +3,4 @@ Could not contact the server: Could not contact the server, make sure you have a
 Please enter your username: Please enter your username
 It seems that the server has fall down: It seems that the server has fall down, wait a few minutes and try again
 Session has expired: Your session has expired, please login again
-Access denied: Access denied
+Access Denied: Access Denied

front/core/services/locale/es.yml

@@ -3,5 +3,5 @@ Could not contact the server: No se ha podido contactar con el servidor, asegura
 Please enter your username: Por favor introduce tu nombre de usuario
 It seems that the server has fall down: Parece que el servidor se ha caído, espera unos minutos e inténtalo de nuevo
 Session has expired: Tu sesión ha expirado, por favor vuelve a iniciar sesión
-Access denied: Acción no permitida
+Access Denied: Acción no permitida
 Direction not found: Dirección no encontrada

front/salix/module.js

@@ -120,7 +120,7 @@ function $exceptionHandler(vnApp, $window, $state, $injector) {
                     messageT = 'Invalid login';
                 break;
             case 403:
-                messageT = exception.data?.error?.message || 'Access denied';
+                messageT = exception.data?.error?.message || 'Access Denied';
                 break;
             case 502:
                 messageT = 'It seems that the server has fall down';

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

@@ -1,3 +1,5 @@
+const UserError = require('vn-loopback/util/user-error');
+
 module.exports = Self => {
     Self.remoteMethodCtx('removeFile', {
         description: 'Removes a claim document',
@@ -19,8 +21,8 @@ module.exports = Self => {
     });
 
     Self.removeFile = async(ctx, id, options) => {
-        let tx;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -31,19 +33,18 @@ module.exports = Self => {
         }
 
         try {
-            const models = Self.app.models;
+            const claimDms = await Self.findById(id, null, myOptions);
-            const targetClaimDms = await models.ClaimDms.findById(id, null, myOptions);
-            const targetDms = await models.Dms.findById(targetClaimDms.dmsFk, null, myOptions);
-            const trashDmsType = await models.DmsType.findOne({where: {code: 'trash'}}, myOptions);
 
-            await models.Dms.removeFile(ctx, targetClaimDms.dmsFk, myOptions);
+            const targetDms = await Self.app.models.Dms.removeFile(ctx, claimDms.dmsFk, myOptions);
-            await targetClaimDms.destroy(myOptions);
 
-            await targetDms.updateAttribute('dmsTypeFk', trashDmsType.id, myOptions);
+            if (!targetDms || ! claimDms)
+                throw new UserError('Try again');
+
+            const claimDmsDestroyed = await claimDms.destroy(myOptions);
 
             if (tx) await tx.commit();
 
-            return targetDms;
+            return claimDmsDestroyed;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

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

@@ -1,6 +1,3 @@
-const UserError = require('vn-loopback/util/user-error');
-const fs = require('fs-extra');
-const path = require('path');
 
 module.exports = Self => {
     Self.remoteMethodCtx('uploadFile', {
@@ -57,96 +54,33 @@ module.exports = Self => {
     });
 
     Self.uploadFile = async(ctx, id, options) => {
-        const tx = await Self.beginTransaction({});
+        const {Dms, ClaimDms} = Self.app.models;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        if (!myOptions.transaction)
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
             myOptions.transaction = tx;
+        }
 
-        const models = Self.app.models;
-        const promises = [];
-        const TempContainer = models.TempContainer;
-        const ClaimContainer = models.ClaimContainer;
-        const fileOptions = {};
-        const args = ctx.args;
-
-        let srcFile;
         try {
-            const hasWriteRole = await models.DmsType.hasWriteRole(ctx, args.dmsTypeId, myOptions);
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
-            if (!hasWriteRole)
-                throw new UserError(`You don't have enough privileges`);
 
-            // Upload file to temporary path
+            const promises = uploadedFiles.map(dms => ClaimDms.create({
-            const tempContainer = await TempContainer.container('dms');
+                claimFk: id,
-            const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions);
+                dmsFk: dms.id
-            const files = Object.values(uploaded.files).map(file => {
+            }, myOptions));
-                return file[0];
+            await Promise.all(promises);
-            });
-
-            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
-                }, myOptions);
-
-                promises.push(newClaimDms);
-            });
-            const resolvedPromises = await Promise.all(promises);
 
             if (tx) await tx.commit();
 
-            return resolvedPromises;
+            return uploadedFiles;
         } catch (e) {
             if (tx) await tx.rollback();
-
-            if (fs.existsSync(srcFile))
-                await fs.unlink(srcFile);
-
             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/client/back/methods/client-dms/removeFile.js

@@ -19,9 +19,8 @@ module.exports = Self => {
     });
 
     Self.removeFile = async(ctx, id, options) => {
-        const models = Self.app.models;
-        let tx;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -34,13 +33,16 @@ module.exports = Self => {
         try {
             const clientDms = await Self.findById(id, null, myOptions);
 
-            await models.Dms.removeFile(ctx, clientDms.dmsFk, myOptions);
+            const targetDms = await Self.app.models.Dms.removeFile(ctx, clientDms.dmsFk, myOptions);
 
-            const destroyedClient = await clientDms.destroy(myOptions);
+            if (!targetDms || !clientDms)
+                throw new UserError('Try again');
+
+            const clientDmsDestroyed = await clientDms.destroy(myOptions);
 
             if (tx) await tx.commit();
 
-            return destroyedClient;
+            return clientDmsDestroyed;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/client/back/methods/client/uploadFile.js

@@ -55,9 +55,9 @@ module.exports = Self => {
     });
 
     Self.uploadFile = async(ctx, id, options) => {
-        const models = Self.app.models;
+        const {Dms, ClientDms} = Self.app.models;
-        let tx;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -67,23 +67,20 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
 
-        const promises = [];
-
         try {
-            const uploadedFiles = await models.Dms.uploadFile(ctx, myOptions);
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
-            uploadedFiles.forEach(dms => {
+            const promises = uploadedFiles.map(dms =>
-                const newClientDms = models.ClientDms.create({
+                ClientDms.create({
                     clientFk: id,
                     dmsFk: dms.id
-                }, myOptions);
+                }, myOptions)
 
-                promises.push(newClientDms);
+            );
-            });
+            await Promise.all(promises);
-            const resolvedPromises = await Promise.all(promises);
 
             if (tx) await tx.commit();
 
-            return resolvedPromises;
+            return uploadedFiles;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

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

@@ -19,7 +19,6 @@ module.exports = Self => {
     });
 
     Self.removeFile = async(ctx, id, options) => {
-        const models = Self.app.models;
         const myOptions = {};
         let tx;
 
@@ -32,18 +31,18 @@ module.exports = Self => {
         }
 
         try {
-            const targetTicketDms = await models.TicketDms.findById(id, null, myOptions);
+            const ticketDms = await Self.findById(id, null, myOptions);
-            const targetDms = await models.Dms.findById(targetTicketDms.dmsFk, null, myOptions);
-            const trashDmsType = await models.DmsType.findOne({where: {code: 'trash'}}, myOptions);
 
-            await models.Dms.removeFile(ctx, targetTicketDms.dmsFk, myOptions);
+            const targetDms = await Self.app.models.Dms.removeFile(ctx, ticketDms.dmsFk, myOptions);
-            await targetTicketDms.destroy(myOptions);
 
-            await targetDms.updateAttribute('dmsTypeFk', trashDmsType.id, myOptions);
+            if (!targetDms || !ticketDms)
+                throw new UserError('Try again');
+
+            const ticketDmsDestroyed = await ticketDms.destroy(myOptions);
 
             if (tx) await tx.commit();
 
-            return targetDms;
+            return ticketDmsDestroyed;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/ticket/back/methods/ticket/uploadFile.js

@@ -47,7 +47,7 @@ module.exports = Self => {
     });
 
     Self.uploadFile = async(ctx, id, options) => {
-        const models = Self.app.models;
+        const {Dms, TicketDms} = Self.app.models;
         const myOptions = {};
         let tx;
 
@@ -59,22 +59,19 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
 
-        const promises = [];
         try {
-            const uploadedFiles = await models.Dms.uploadFile(ctx, myOptions);
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
-            uploadedFiles.forEach(dms => {
-                const newTicketDms = models.TicketDms.create({
-                    ticketFk: id,
-                    dmsFk: dms.id
-                }, myOptions);
 
-                promises.push(newTicketDms);
+            const promises = uploadedFiles.map(dms => TicketDms.create({
-            });
+                ticketFk: id,
-            const resolvedPromises = await Promise.all(promises);
+                dmsFk: dms.id
+            }, myOptions));
+
+            await Promise.all(promises);
 
             if (tx) await tx.commit();
 
-            return resolvedPromises;
+            return uploadedFiles;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

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

@@ -18,13 +18,35 @@ module.exports = Self => {
         }
     });
 
-    Self.removeFile = async(ctx, id) => {
+    Self.removeFile = async(ctx, dmsFk, options) => {
-        const models = Self.app.models;
+        const myOptions = {};
-        const workerDms = await Self.findById(id);
+        let tx;
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
 
-        await models.Dms.removeFile(ctx, workerDms.dmsFk);
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
 
-        return workerDms.destroy();
+        try {
+            const WorkerDms = await Self.findOne({
+                where: {document: dmsFk}
+            }, myOptions);
+
+            const targetDms = await Self.app.models.Dms.removeFile(ctx, dmsFk, myOptions);
+
+            if (!targetDms || !WorkerDms)
+                throw new UserError('Try again');
+
+            const workerDmsDestroyed = await WorkerDms.destroy(myOptions);
+            if (tx) await tx.commit();
+
+            return workerDmsDestroyed;
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     };
 };
 

modules/worker/back/methods/worker/uploadFile.js

@@ -47,30 +47,33 @@ module.exports = Self => {
     });
 
     Self.uploadFile = async(ctx, id) => {
-        const models = Self.app.models;
+        const {Dms, WorkerDms} = Self.app.models;
-        const promises = [];
+        const myOptions = {};
-        const tx = await Self.beginTransaction({});
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
 
         try {
-            const options = {transaction: tx};
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
-
+            const promises = uploadedFiles.map(dms =>
-            const uploadedFiles = await models.Dms.uploadFile(ctx, options);
+                WorkerDms.create({
-            uploadedFiles.forEach(dms => {
-                const newWorkerDms = models.WorkerDms.create({
                     workerFk: id,
                     dmsFk: dms.id
-                }, options);
+                }, myOptions));
+            await Promise.all(promises);
 
-                promises.push(newWorkerDms);
+            if (tx) await tx.commit();
-            });
-            const resolvedPromises = await Promise.all(promises);
 
-            await tx.commit();
+            return uploadedFiles;
-
+        } catch (e) {
-            return resolvedPromises;
+            if (tx) await tx.rollback();
-        } catch (err) {
+            throw e;
-            await tx.rollback();
-            throw err;
         }
     };
 };