Merge branch 'master' of http://113.177.27.200:2033/tien/upload-file-backend

src/api/controllers/v1/path.controller.js

@@ -12,6 +12,8 @@ import {
     storage as storageConfig
 } from '../../../config/vars';
 import uploadAdapter from '../../../common/services/adapters/upload-adapter';
+import { cloneDeep, forEach } from 'lodash';
+
 
 /**
  * get file and folder
@@ -23,12 +25,11 @@ exports.get = (req, res, next) => {
         const user = req.user;
 
         let path = `${storageConfig.uri}/${user.id}`;
-        // let path = storageConfig.uri;
         if (req.body.path) {
             path += req.body.path;
         }
+        // console.log(path);
         const listFile = [];
-
         fs.readdir(path, (err, files) => {
             if (files && files.length > 0) {
                 files.forEach((item) => {
@@ -44,6 +45,24 @@ exports.get = (req, res, next) => {
                 data: listFile
             });
         });
+            // test local
+        // fs.readdir(path, (err, files) => {
+        //     if (files && files.length > 0) {
+        //         files.forEach((item) => {
+        //             listFile.push({
+        //                 name: item,
+        //                 path: `${storageConfig.uri}/${user.id}${req.body.path}/${item}`,
+        //                 isFolder: fs.lstatSync(`${storageConfig.uri}/${user.id}/${req.body.path}/${item}`).isDirectory()
+        //             });
+        //         });
+        //     }
+        //     return res.json({
+        //         code: 0,
+        //         data: listFile
+        //     });
+        // });
+        
+
         return null;
         /** resize image uploaded */
     } catch (ex) {
@@ -58,14 +77,13 @@ exports.get = (req, res, next) => {
  */
 exports.create = (req, res, next) => {
     const user = req.user;
-
     let dir = `${user.id}`;
-    console.log(dir);
+    const name_folder = cloneDeep(req.body.name).trim();
     if (req.body.path) {
         dir += req.body.path;
     }
     if (req.body.name) {
-        dir += `/${req.body.name}`;
+        dir += `/${name_folder}`;
     }
     if (!fs.existsSync(dir)) {
         uploadAdapter.createFolder({ path: dir });
@@ -123,16 +141,24 @@ exports.download = (req, res, next) => {
     try {
         const user = req.user;
         const namefile = `${user.name}-${Date.now()}.zip`;
-        const dir = `${storageConfig.uri}/${user.id}/${namefile}`;
+        const dir = `${storageConfig.uri}/download/${user.id}/${namefile}`;
+        const folder = `${storageConfig.uri}/download/${user.id}`;
+
+        deleteFolderRecursive(folder);
         const output = fs.createWriteStream(dir);
         const archive = archiver('zip', {
             zlib: { level: 9 } // Sets the compression level.
         });
 
+
         archive.pipe(output);
         if (req.body.data) {
             req.body.data.forEach((e) => {
-                const path = e.path.replace(cdnConfig.uri, storageConfig.uri).replace(/ /g, '%20');
+                // const path = e.path.replace(cdnConfig.uri, storageConfig.uri).replace(/ /g, '%20');
+                const path = e.path.replace(cdnConfig.uri, storageConfig.uri);
+                // const download = path.split("/");
+                // download.splice( download.indexOf(`${user.id}`), 0, "download");     
+                // const final_path = download.join("/");
                 if (e.isFolder) {
                     archive.directory(path, e.name);
                 } else {
@@ -141,7 +167,6 @@ exports.download = (req, res, next) => {
             });
         }
         archive.finalize();
-
         return res.json({
             code: 0,
             data: {
@@ -194,3 +219,21 @@ exports.deleteMultiple = (req, res, next) => {
         return ErrorHandel(ex, req, res, next);
     }
 };
+
+
+function deleteFolderRecursive(folderPath) {
+    let files = [];
+    if (fs.existsSync(folderPath)) {
+      files = fs.readdirSync(folderPath);
+      files.forEach((file) => {
+        const currentPath = path.join(folderPath, file);
+        if (fs.lstatSync(currentPath).isDirectory()) {
+          deleteFolderRecursive(currentPath);
+        } else {
+          fs.unlinkSync(currentPath);
+          console.log('Deleted file:', currentPath);
+        }
+      });
+    
+    }
+  }

src/api/controllers/v1/staff.controller.js

@@ -84,7 +84,7 @@ exports.get = async (req, res, next) => res.json({ data: User.transform(req.loca
  */
 exports.update = async (req, res, next) => {
     const { user } = req.locals;
-    if (user.service !== "service") {
+    if (user.service !== "staff") {
         return res.status(404).json({
             code: 404,
             message : messages.NOT_FOUND
@@ -117,7 +117,7 @@ exports.update = async (req, res, next) => {
  */
 exports.delete = async (req, res, next) => {
     const { user } = req.locals;
-    if (user.service !== "service") {
+    if (user.service !== "staff") {
         return res.status(404).json({
             code: 404,
             message : messages.NOT_FOUND

src/api/middlewares/path.middleware.js

@@ -0,0 +1,14 @@
+import { handler as ErrorHandler } from './errors';
+import fs from 'fs';
+import archiver from 'archiver';
+import multer from 'multer';
+import path  from 'path';
+import { handler as ErrorHandel } from '../../middlewares/errors';
+// import ApiException from '../../../common/utils/APIException';
+import {
+
+    cdn as cdnConfig,
+    storage as storageConfig
+} from '../../../config/vars';
+import uploadAdapter from '../../../common/services/adapters/upload-adapter';
+

src/api/validations/v1/staff.validation.js

@@ -55,8 +55,8 @@ module.exports = {
                 .max(255)
                 .required(),
             phone: Joi.string()
-                .max(155)
+                .max(155),
-                .required(),
+                // .required(),
             email: Joi.string()
                 .allow(null, ''),
             gender: Joi.string()

src/common/services/adapters/upload-adapter.js

@@ -1,6 +1,8 @@
 import multer from 'multer';
 // import moment from 'moment-timezone';
 import { storage as storageConfig } from '../../../config/vars';
+import { forIn } from 'lodash';
+import { equal } from 'joi';
 
 /** storage will create folder when new date */
 // const date = new Date();
@@ -36,6 +38,8 @@ const createFolder = ({ path }) => {
     try {
         console.log(`${filePath}/${path}`);
         multer({ dest: `${filePath}/${path}` });
+    
+
         // multer({ dest: `${filePath}/images/games` });
         // multer({ dest: `${filePath}/images/stories` });
         // multer({ dest: `${filePath}/images/chapters` });
@@ -48,6 +52,7 @@ const createFolder = ({ path }) => {
         // multer({ dest: `${filePath}/images/banners` });
         // multer({ dest: `${filePath}/images/categories` });
         // multer({ dest: `${filePath}/images/upload/default` });
+        // console.log(multer);
         return true;
     } catch (ex) {
         return false;

src/config/locales/en.json

@@ -28,5 +28,12 @@
 	"log is not defined": "log is not defined",
 	"connect ETIMEDOUT 113.177.27.200:5432": "connect ETIMEDOUT 113.177.27.200:5432",
 	"Validation error: Validation isEmail on email failed": "Validation error: Validation isEmail on email failed",
-	"WHERE parameter \"id\" has invalid \"undefined\" value": "WHERE parameter \"id\" has invalid \"undefined\" value"
+	"WHERE parameter \"id\" has invalid \"undefined\" value": "WHERE parameter \"id\" has invalid \"undefined\" value",
+	"blank is not defined": "blank is not defined",
+	"equal is not defined": "equal is not defined",
+	"isEqual is not defined": "isEqual is not defined",
+	"_ is not defined": "_ is not defined",
+	"Cannot access 'splited_dir' before initialization": "Cannot access 'splited_dir' before initialization",
+	"main_dir is not defined": "main_dir is not defined",
+	"Cannot read properties of undefined (reading 'trim')": "Cannot read properties of undefined (reading 'trim')"
 }