verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

refs #6184 saveCmr #1788

Merged
guillermo merged 58 commits from 6184-saveCmr into dev 2024-02-13 06:47:06 +00:00
Conversation 2 Commits 58 Files Changed 27 +71 -66
4 changed files with 71 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 45fd96cee6 - Show all commits

46
back/methods/dms/uploadFile.js
View File

@ -49,7 +49,6 @@ module.exports = Self => {
Self.uploadFile = async(ctx, options) => { Self.uploadFile = async(ctx, options) => {
const models = Self.app.models; const models = Self.app.models;
const TempContainer = models.TempContainer; const TempContainer = models.TempContainer;
const DmsContainer = models.DmsContainer;
const fileOptions = {}; const fileOptions = {};
const args = ctx.args; const args = ctx.args;
@ -79,19 +78,21 @@ module.exports = Self => {
const addedDms = []; const addedDms = [];
for (const uploadedFile of files) { for (const uploadedFile of files) {
const newDms = await createDms(ctx, uploadedFile, myOptions);
const pathHash = DmsContainer.getHash(newDms.id);
const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name); const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name);
srcFile = path.join(file.client.root, file.container, file.name); srcFile = path.join(file.client.root, file.container, file.name);
const dmsContainer = await DmsContainer.container(pathHash); const data = {
const dstFile = path.join(dmsContainer.client.root, pathHash, newDms.file); workerFk: ctx.req.accessToken.userId,
dmsTypeFk: args.dmsTypeId,
await fs.move(srcFile, dstFile, { companyFk: args.companyId,
overwrite: true warehouseFk: args.warehouseId,
}); reference: args.reference,
description: args.description,
contentType: file.type,
hasFile: args.hasFile
};
const extension = await models.DmsContainer.getFileExtension(uploadedFile.name);
const newDms = await Self.createFromFile(data, extension, srcFile, myOptions);
addedDms.push(newDms); addedDms.push(newDms);
} }
@ -107,27 +108,4 @@ module.exports = Self => {
throw e; 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 Self.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);
}
}; };

30
back/models/dms.js
View File

@ -1,4 +1,6 @@
const UserError = require('vn-loopback/util/user-error'); const UserError = require('vn-loopback/util/user-error');
const fs = require('fs-extra');
const path = require('path');
module.exports = Self => { module.exports = Self => {
require('../methods/dms/downloadFile')(Self); require('../methods/dms/downloadFile')(Self);
@ -35,4 +37,32 @@ module.exports = Self => {
return [stream, dms.contentType, `filename="${dms.file}"`]; return [stream, dms.contentType, `filename="${dms.file}"`];
}; };
Self.getPath = async function(dms) {
const models = Self.app.models;
const pathHash = await models.DmsContainer.getHash(dms.id);
const dmsContainer = await models.DmsContainer.container(pathHash);
const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
return dstFile;
};
Self.createWithExtension = async function(data, extension, options) {
const newDms = await Self.create(data, options);
return newDms.updateAttribute('file', `${newDms.id}.${extension}`, options);
};
Self.createFromFile = async function(data, extension, srcFile, options) {
const dms = await Self.createWithExtension(data, extension, options);
const dstFile = await Self.getPath(dms);
await fs.move(srcFile, dstFile, {overwrite: true});
return dms;
};
Self.createFromStream = async function(data, extension, stream, options) {
const dms = await Self.createWithExtension(data, extension, options);
const dstFile = await Self.getPath(dms);
const writeStream = await fs.createWriteStream(dstFile);
await readStream.pipe(writeStream);
return dms;
};
}; };

33
modules/route/back/methods/route/downloadCmrsZip.js
View File

@ -45,32 +45,29 @@ module.exports = Self => {
const zipConfig = await models.ZipConfig.findOne(null, myOptions); const zipConfig = await models.ZipConfig.findOne(null, myOptions);
let totalSize = 0; let totalSize = 0;
ids = ids.split(','); ids = ids.split(',');
try {
const baseUrl = (await Self.app.models.Url.getUrl()).replace('#!', 'api');
for (const id of ids) { 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( for (const id of ids) {
`${baseUrl}Routes/${id}/cmr`, { if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
const response = await axios.get(
`${baseUrl}Routes/${id}/cmr`, {
...myOptions, ...myOptions,
headers: { headers: {
Authorization: ctx.req.accessToken.id Authorization: ctx.req.accessToken.id
}, },
responseType: 'arraybuffer', responseType: 'arraybuffer',
}); });
if (response.headers['content-type'] !== 'application/pdf') if (response.headers['content-type'] !== 'application/pdf')
throw new UserError(`The response is not a PDF`); throw new UserError(`The response is not a PDF`);
zip.file(`${id}.pdf`, response.data, { binary: true }); zip.file(`${id}.pdf`, response.data, {binary: true});
}
const zipStream = zip.generateNodeStream({ streamFiles: true });
return [zipStream, 'application/zip', `filename="cmrs.zip"`];
} catch (e) {
throw e;
} }
const zipStream = zip.generateNodeStream({streamFiles: true});
return [zipStream, 'application/zip', `filename="cmrs.zip"`];
}; };
}; };

28
modules/ticket/back/methods/ticket/saveCmr.js
View File

@ -41,31 +41,31 @@ module.exports = Self => {
if (ticket.cmrFk) { if (ticket.cmrFk) {
const hasDmsCmr = await models.TicketDms.findOne({ const hasDmsCmr = await models.TicketDms.findOne({
where: { ticketFk: ticketId }, where: {ticketFk: ticketId},
include: { include: {
relation: 'dms', relation: 'dms',
fields: ['dmsFk'], fields: ['dmsFk'],
scope: { scope: {
where: { dmsTypeFk: dmsTypeCmr.id } where: {dmsTypeFk: dmsTypeCmr.id}
} }
} }
}, myOptions); }, myOptions);
if (!hasDmsCmr.dms()) { if (!hasDmsCmr.dms()) {
const zip = await models.Route.downloadCmrsZip(ctx, ticket.cmrFk.toString(), myOptions); const zip = await models.Route.downloadCmrsZip(ctx, ticket.cmrFk.toString(), myOptions);
ctx.req.file = Object.assign({}, zip); const stream = Object.assign({}, zip);
const ctxUploadFile = { const data = {
...ctx, workerFk: ctx.req.accessToken.userId,
args: { dmsTypeFk: dmsTypeCmr.id,
warehouseId: ticket.warehouseFk, companyFk: ticket.companyFk,
companyId: ticket.companyFk, warehouseFk: ticket.warehouseFk,
dmsTypeId: dmsTypeCmr.id, reference: ticket.id,
reference: ticket.id, description: `${ticket.cmrFk} - ${ticket.id}`,
description: `${ticket.cmrFk} - ${ticket.id}`, contentType: '?',
hasFile: false hasFile: false
}
}; };
const dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
const dms = await models.Dms.createFromStream(data, 'zip', stream, myOptions);
await models.TicketDms.create({ await models.TicketDms.create({
ticketFk: ticketId, ticketFk: ticketId,
dmsFk: dms[0].id dmsFk: dms[0].id