back/models/dms.js

@@ -62,7 +62,7 @@ module.exports = Self => {
         const dms = await Self.createWithExtension(data, extension, options);
         const dstFile = await Self.getPath(dms);
         const writeStream = await fs.createWriteStream(dstFile);
-        await readStream.pipe(writeStream);
+        await stream.pipe(writeStream);
         return dms;
     };
 };

modules/route/back/methods/route/downloadCmrsZip.js

@@ -1,6 +1,4 @@
 const JSZip = require('jszip');
-const axios = require('axios');
-const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
     Self.remoteMethodCtx('downloadCmrsZip', {
@@ -42,28 +40,11 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const zipConfig = await models.ZipConfig.findOne(null, myOptions);
-        let totalSize = 0;
         ids = ids.split(',');
 
-        const baseUrl = (await Self.app.models.Url.getUrl()).replace('#!', 'api');
-
         for (const id of ids) {
-            if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
+            const data = models.Route.generateCmrPdf(id);
-
+            zip.file(`${id}.pdf`, data, {binary: true});
-            const response = await axios.get(
-                `${baseUrl}Routes/${id}/cmr`, {
-                    ...myOptions,
-                    headers: {
-                        Authorization: ctx.req.accessToken.id
-                    },
-                    responseType: 'arraybuffer',
-                });
-
-            if (response.headers['content-type'] !== 'application/pdf')
-                throw new UserError(`The response is not a PDF`);
-
-            zip.file(`${id}.pdf`, response.data, {binary: true});
         }
 
         const zipStream = zip.generateNodeStream({streamFiles: true});

modules/route/back/methods/route/generateCmrPdf.js

@@ -0,0 +1,64 @@
+const axios = require('axios');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('generateCmrPdf', {
+        description: 'Generate a pdf of a cmr',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'string',
+                description: 'The cmr',
+            }
+        ],
+        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: '/generateCmrPdf',
+            verb: 'GET'
+        }
+    });
+
+    Self.generateCmrPdf = async function(ctx, id, options) {
+        const models = Self.app.models;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const zipConfig = await models.ZipConfig.findOne(null, myOptions);
+        let totalSize = 0;
+
+        const baseUrl = (await Self.app.models.Url.getUrl()).replace('#!', 'api');
+
+        if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
+
+        const response = await axios.get(
+            `${baseUrl}Routes/${id}/cmr`, {
+                ...myOptions,
+                headers: {
+                    Authorization: ctx.req.accessToken.id
+                },
+                responseType: 'arraybuffer',
+            });
+
+        if (response.headers['content-type'] !== 'application/pdf')
+            throw new UserError(`The response is not a PDF`);
+
+        return response.data;
+    };
+};

modules/route/back/models/route.js

@@ -17,6 +17,7 @@ module.exports = Self => {
     require('../methods/route/cmr')(Self);
     require('../methods/route/getExternalCmrs')(Self);
     require('../methods/route/downloadCmrsZip')(Self);
+    require('../methods/route/generateCmrPdf')(Self);
     require('../methods/route/getExpeditionSummary')(Self);
     require('../methods/route/getByWorker')(Self);
 

modules/ticket/back/methods/ticket/saveCmr.js

@@ -1,3 +1,5 @@
+const {Readable} = require('stream');
+
 module.exports = Self => {
     Self.remoteMethodCtx('saveCmr', {
         description: 'Save cmr',
@@ -51,9 +53,9 @@ module.exports = Self => {
                         }
                     }, myOptions);
 
-                    if (!hasDmsCmr.dms()) {
+                    if (!hasDmsCmr?.dms()) {
-                        const zip = await models.Route.downloadCmrsZip(ctx, ticket.cmrFk.toString(), myOptions);
+                        const response = await models.Route.generateCmrPdf(ctx, ticket.cmrFk.toString(), myOptions);
-                        const stream = Object.assign({}, zip);
+                        const pdfStream = Readable.from(Buffer.from(response));
                         const data = {
                             workerFk: ctx.req.accessToken.userId,
                             dmsTypeFk: dmsTypeCmr.id,
@@ -61,14 +63,14 @@ module.exports = Self => {
                             warehouseFk: ticket.warehouseFk,
                             reference: ticket.id,
                             description: `${ticket.cmrFk} - ${ticket.id}`,
-                            contentType: '?',
+                            contentType: 'application/pdf',
-                            hasFile: false
+                            hasFile: true
                         };
 
-                        const dms = await models.Dms.createFromStream(data, 'zip', stream, myOptions);
+                        const dms = await models.Dms.createFromStream(data, 'pdf', pdfStream, myOptions);
                         await models.TicketDms.create({
                             ticketFk: ticketId,
-                            dmsFk: dms[0].id
+                            dmsFk: dms.id
                         }, myOptions);
                     }
                 }