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

upload dms files into new folder structure #1548
gitea/salix/dev There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2019-06-20 07:46:30 +02:00
parent 6e029a3623
commit e45d95ac10
7 changed files with 100 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
node_modules
dist/*
e2e/dms/*
npm-debug.log
.eslintcache
datasources.*.json

25
back/methods/dms/downloadFile.js
View File

@ -36,40 +36,31 @@ module.exports = Self => {
Self.downloadFile = async function(ctx, id) {
const env = process.env.NODE_ENV;
const storageConnector = Self.app.dataSources.storage.connector;
const models = Self.app.models;
const dms = await Self.findById(id, {
include: {
relation: 'dmsType',
scope: {
fields: ['path', 'readRoleFk'],
include: {
relation: 'readRole'
}
}
}
});
const dms = await Self.findById(id);
const hasReadRole = await models.DmsType.hasReadRole(ctx, dms.dmsTypeFk);
if (!hasReadRole)
throw new UserError(`You don't have enough privileges`);
if (env && env != 'development') {
const path = `/${dms.companyFk}/${dms.dmsType().path}/${dms.file}`;
const pathHash = storageConnector.getPathHash(dms.id);
file = {
path: `/var/lib/salix/dms/${path}`,
contentType: 'application/octet-stream',
container: pathHash,
name: dms.file
};
} else {
file = {
path: `${process.cwd()}/README.md`,
contentType: 'text/plain',
name: `README.md`
container: 'temp',
name: `file.txt`
};
}
await fs.access(file.path);
let stream = fs.createReadStream(file.path);
const stream = await models.Container.downloadStream(file.container, file.name);
return [stream, file.contentType, `filename="${file.name}"`];
};
};

14
back/methods/dms/removeFile.js
View File

@ -1,5 +1,4 @@
const UserError = require('vn-loopback/util/user-error');
const fs = require('fs-extra');
module.exports = Self => {
Self.remoteMethodCtx('removeFile', {
@ -23,24 +22,13 @@ module.exports = Self => {
Self.removeFile = async(ctx, id) => {
const models = Self.app.models;
const trashDmsType = await models.DmsType.findOne({where: {code: 'trash'}});
const dms = await models.Dms.findById(id);
const dmsType = await models.DmsType.findById(dms.dmsTypeFk);
const trashDmsType = await models.DmsType.findOne({
where: {
code: 'trash'
}
});
const hasWriteRole = await models.DmsType.hasWriteRole(ctx, dms.dmsTypeFk);
if (!hasWriteRole)
throw new UserError(`You don't have enough privileges`);
const file = await models.Container.getFile(dmsType.path, dms.file);
const originPath = `${file.client.root}/${dmsType.path}/${file.name}`;
const destinationPath = `${file.client.root}/${trashDmsType.path}/${file.name}`;
await fs.rename(originPath, destinationPath);
return dms.updateAttribute('dmsTypeFk', trashDmsType.id);
};
};

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

@ -1,5 +1,6 @@
const fs = require('fs-extra');
const UserError = require('vn-loopback/util/user-error');
const fs = require('fs-extra');
const md5 = require('md5');
module.exports = Self => {
Self.remoteMethodCtx('uploadFile', {
@ -7,9 +8,6 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: [
{
arg: 'options',
type: 'object'
}, {
arg: 'warehouseId',
type: 'Number',
description: ''
@ -33,8 +31,7 @@ module.exports = Self => {
arg: 'hasFile',
type: 'Boolean',
description: ''
}
],
}],
returns: {
type: 'Object',
root: true
@ -45,23 +42,20 @@ module.exports = Self => {
}
});
Self.uploadFile = async(ctx, options) => {
const models = Self.app.models;
Self.uploadFile = async(ctx, options = {}) => {
const storageConnector = Self.app.dataSources.storage.connector;
const myUserId = ctx.req.accessToken.userId;
const myWorker = await models.Worker.findOne({where: {userFk: myUserId}});
const args = ctx.args;
const models = Self.app.models;
const fileOptions = {};
const args = ctx.args;
let tx;
let myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
Object.assign(options, options);
if (!myOptions.transaction) {
if (!options.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
options.transaction = tx;
}
try {
@ -69,26 +63,43 @@ module.exports = Self => {
if (!hasWriteRole)
throw new UserError(`You don't have enough privileges`);
// Create final folder if not exists
const dmsType = await models.DmsType.findById(args.dmsTypeId);
await models.Container.getContainer(dmsType.path).catch(async err => {
if (err.code === 'ENOENT') {
await models.Container.createContainer({
name: dmsType.path
});
}
});
// Upload file to temporary path
const uploaded = await models.Container.upload('temp', ctx.req, ctx.result, fileOptions);
const tempContainer = await getContainer('temp');
const uploaded = await models.Container.upload(tempContainer.name, ctx.req, ctx.result, fileOptions);
const files = Object.values(uploaded.files).map(file => {
return file[0];
});
const promises = [];
const addedDms = [];
for (const file of files) {
const newDms = await createDms(ctx, file.name, options);
const pathHash = storageConnector.getPathHash(newDms.id);
const container = await getContainer(pathHash);
files.forEach(file => {
const newDms = Self.create({
const originPath = `${tempContainer.client.root}/${tempContainer.name}/${file.name}`;
const destinationPath = `${container.client.root}/${pathHash}/${newDms.file}`;
fs.rename(originPath, destinationPath);
addedDms.push(newDms);
}
if (tx) await tx.commit();
return addedDms;
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
};
async function createDms(ctx, fileName, options) {
const models = Self.app.models;
const storageConnector = Self.app.dataSources.storage.connector;
const myUserId = ctx.req.accessToken.userId;
const myWorker = await models.Worker.findOne({where: {userFk: myUserId}});
const args = ctx.args;
const newDms = await Self.create({
workerFk: myWorker.id,
dmsTypeFk: args.dmsTypeId,
companyFk: args.companyId,
@ -96,32 +107,35 @@ module.exports = Self => {
reference: args.reference,
description: args.description,
hasFile: args.hasFile
}, myOptions).then(newDms => {
const extension = storageConnector.getFileExtension(file.name);
const fileName = `${newDms.id}.${extension}`;
}, options);
return newDms.updateAttribute('file', fileName, myOptions);
}).then(dms => {
return models.Container.getContainer('temp').then(container => {
const originPath = `${container.client.root}/${container.name}/${file.name}`;
const destinationPath = `${container.client.root}/${dmsType.path}/${dms.file}`;
const extension = storageConnector.getFileExtension(fileName);
fileName = `${newDms.id}.${extension}`;
return fs.rename(originPath, destinationPath).then(() => {
return dms;
});
});
return newDms.updateAttribute('file', fileName, options);
}
/**
* Returns a container instance
* If doesn't exists creates a new one
*
* @param {String} name Container name
* @return {Object} Container instance
*/
async function getContainer(name) {
const models = Self.app.models;
let container;
try {
container = await models.Container.getContainer(name);
} catch (err) {
if (err.code === 'ENOENT') {
container = await models.Container.createContainer({
name: name
});
} else throw err;
}
promises.push(newDms);
});
const resolvedPromise = await Promise.all(promises);
if (tx) await tx.commit();
return resolvedPromise;
} catch (e) {
if (tx) await tx.rollback();
throw e;
return container;
}
};
};

10
loopback/server/boot/root.js
View File

@ -1,5 +1,3 @@
const uuid = require('uuid/v1');
module.exports = function(app) {
let models = app.models();
models.forEach(function(model) {
@ -33,14 +31,6 @@ module.exports = function(app) {
router.get('/status', app.loopback.status());
app.use(router);
const storageConnector = app.dataSources.storage.connector;
storageConnector.getFilename = function(file) {
return `${uuid()}.${storageConnector.getFileExtension(file.name)}`;
};
storageConnector.getFileExtension = function(fileName) {
return fileName.split('.').pop();
};
/*
let ds = app.dataSources.auth;
//ds.automigrate(function() {

18
loopback/server/boot/storage.js Normal file
View File

@ -0,0 +1,18 @@
const uuid = require('uuid/v1');
const md5 = require('md5');
module.exports = app => {
const storageConnector = app.dataSources.storage.connector;
storageConnector.getFilename = function(file) {
return `${uuid()}.${storageConnector.getFileExtension(file.name)}`;
};
storageConnector.getFileExtension = function(fileName) {
return fileName.split('.').pop();
};
storageConnector.getPathHash = function(id) {
return md5(id).substring(0, 2);
};
};

9
modules/client/back/methods/client-dms/removeFile.js
View File

@ -20,14 +20,11 @@ module.exports = Self => {
Self.removeFile = async(ctx, id) => {
const models = Self.app.models;
const targetClientDms = await models.ClientDms.findById(id);
const targetDms = await models.Dms.findById(targetClientDms.dmsFk);
const trashDmsType = await models.DmsType.findOne({where: {code: 'trash'}});
const clientDms = await models.ClientDms.findById(id);
await models.Dms.removeFile(ctx, targetClientDms.dmsFk);
await targetClientDms.destroy();
await models.Dms.removeFile(ctx, clientDms.dmsFk);
return targetDms.updateAttribute('dmsTypeFk', trashDmsType.id);
return clientDms.destroy();
};
};