3
This commit is contained in:
parent
e159858c88
commit
2312fc3d75
File diff suppressed because one or more lines are too long
@ -79,6 +79,8 @@ require('./auth/auth');
|
|||||||
|
|
||||||
app.use(bodyParser.json());
|
app.use(bodyParser.json());
|
||||||
|
|
||||||
|
app.use('/uploads', express.static(path.join(__dirname, '../uploads')));
|
||||||
|
|
||||||
app.use('/api/auth', authRoutes);
|
app.use('/api/auth', authRoutes);
|
||||||
app.enable('trust proxy');
|
app.enable('trust proxy');
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,34 @@
|
|||||||
const util = require('util');
|
const util = require('util');
|
||||||
const Multer = require('multer');
|
const Multer = require('multer');
|
||||||
|
const path = require('path');
|
||||||
|
const fs = require('fs');
|
||||||
|
|
||||||
const maxSize = 10 * 1024 * 1024;
|
const maxSize = 10 * 1024 * 1024;
|
||||||
|
|
||||||
let processFile = Multer({
|
// Ensure uploads directory exists
|
||||||
storage: Multer.memoryStorage(),
|
const uploadDir = path.join(__dirname, '../../uploads');
|
||||||
limits: { fileSize: maxSize },
|
if (!fs.existsSync(uploadDir)) {
|
||||||
}).single("file");
|
fs.mkdirSync(uploadDir, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configure disk storage
|
||||||
|
const storage = Multer.diskStorage({
|
||||||
|
destination: (req, file, cb) => cb(null, uploadDir),
|
||||||
|
filename: (req, file, cb) => {
|
||||||
|
const ext = path.extname(file.originalname);
|
||||||
|
const base = path.basename(file.originalname, ext);
|
||||||
|
const uniqueSuffix = Date.now() + '-' + Math.round(Math.random() * 1e9);
|
||||||
|
cb(null, `${base}-${uniqueSuffix}${ext}`);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Create multer instance
|
||||||
|
let processFile = Multer({
|
||||||
|
storage,
|
||||||
|
limits: { fileSize: maxSize },
|
||||||
|
}).single('file');
|
||||||
|
|
||||||
|
// Promisify for async/await
|
||||||
let processFileMiddleware = util.promisify(processFile);
|
let processFileMiddleware = util.promisify(processFile);
|
||||||
|
|
||||||
module.exports = processFileMiddleware;
|
module.exports = processFileMiddleware;
|
||||||
|
|||||||
@ -3,6 +3,7 @@ const express = require('express');
|
|||||||
|
|
||||||
const DocumentsService = require('../services/documents');
|
const DocumentsService = require('../services/documents');
|
||||||
const DocumentsDBApi = require('../db/api/documents');
|
const DocumentsDBApi = require('../db/api/documents');
|
||||||
|
const processFile = require('../middlewares/upload');
|
||||||
const wrapAsync = require('../helpers').wrapAsync;
|
const wrapAsync = require('../helpers').wrapAsync;
|
||||||
|
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
@ -66,14 +67,28 @@ const { parse } = require('json2csv');
|
|||||||
* description: Invalid input data
|
* description: Invalid input data
|
||||||
* 500:
|
* 500:
|
||||||
* description: Some server error
|
* description: Some server error
|
||||||
*/
|
router.post('/', processFile, wrapAsync(async (req, res) => {
|
||||||
router.post('/', wrapAsync(async (req, res) => {
|
|
||||||
const referer = req.headers.referer || `${req.protocol}://${req.hostname}${req.originalUrl}`;
|
const referer = req.headers.referer || `${req.protocol}://${req.hostname}${req.originalUrl}`;
|
||||||
const link = new URL(referer);
|
const link = new URL(referer);
|
||||||
await DocumentsService.create(req.body.data, req.currentUser, true, link.host);
|
// Parse data from multipart/form-data or JSON
|
||||||
|
let data = {};
|
||||||
|
if (req.body.data) {
|
||||||
|
data = req.body.data;
|
||||||
|
} else {
|
||||||
|
data = {
|
||||||
|
title: req.body.title,
|
||||||
|
document_type: req.body.document_type,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
// Attach file URL if file was uploaded
|
||||||
|
if (req.file) {
|
||||||
|
data.fileurl = `/uploads/${req.file.filename}`;
|
||||||
|
}
|
||||||
|
await DocumentsService.create(data, req.currentUser, true, link.host);
|
||||||
const payload = true;
|
const payload = true;
|
||||||
res.status(200).send(payload);
|
res.status(200).send(payload);
|
||||||
}));
|
}));
|
||||||
|
}));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @swagger
|
* @swagger
|
||||||
@ -151,11 +166,24 @@ router.post('/bulk-import', wrapAsync(async (req, res) => {
|
|||||||
* required:
|
* required:
|
||||||
* - id
|
* - id
|
||||||
* responses:
|
* responses:
|
||||||
* 200:
|
router.put('/:id', processFile, wrapAsync(async (req, res) => {
|
||||||
* description: The item data was successfully updated
|
// Parse data from multipart/form-data or JSON
|
||||||
* content:
|
let data = {};
|
||||||
* application/json:
|
if (req.body.data) {
|
||||||
* schema:
|
data = req.body.data;
|
||||||
|
} else {
|
||||||
|
data = {
|
||||||
|
title: req.body.title,
|
||||||
|
document_type: req.body.document_type,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
// Attach file URL if file was uploaded
|
||||||
|
if (req.file) {
|
||||||
|
data.fileurl = `/uploads/${req.file.filename}`;
|
||||||
|
}
|
||||||
|
await DocumentsService.update(data, req.params.id, req.currentUser);
|
||||||
|
res.status(200).send(true);
|
||||||
|
}));
|
||||||
* $ref: "#/components/schemas/Documents"
|
* $ref: "#/components/schemas/Documents"
|
||||||
* 400:
|
* 400:
|
||||||
* description: Invalid ID supplied
|
* description: Invalid ID supplied
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user