@modular-rest/server 1.2.1 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-rest/server",
-  "version": "1.2.1",
+  "version": "1.2.4",
   "description": "a nodejs module based on KOAJS for developing Rest-APIs in a modular solution.",
   "main": "src/index.js",
   "scripts": {

package/src/application.js

@@ -80,7 +80,7 @@ async function createRest(options) {
     /**
      * Run before hook
      */
-    if (options.onBeforeInit) onBeforeInit(app);
+    if (options.onBeforeInit) options.onBeforeInit(app);
 
     /**
      * Setup default services
@@ -162,7 +162,7 @@ async function createRest(options) {
 
 
         // on after init
-        if (options.onAfterInit) onAfterInit(app);
+        if (options.onAfterInit) options.onAfterInit(app);
 
         //done
         done({ app, server });

package/src/class/db_schemas.js

@@ -7,5 +7,8 @@ module.exports = {
         fileName: String,
         owner: String,
         format: String,
+        // Tag being used as the parent dir for files
+        // uploaddir/$format/$tag/timestamp.format
+        tag: String,
     })
 }

package/src/services/data_provider/service.js

@@ -9,7 +9,7 @@ let connections = {};
 let collections = {};
 let permissionDefinitions = {};
 
-let triggers = require('./../../class/trigger_operator');
+let triggers = require('../../class/trigger_operator');
 let TypeCasters = require('./typeCasters');
 
 /**

package/src/services/file/router.js

@@ -16,7 +16,17 @@ fileRouter.use('/', middleware.auth, async (ctx, next) => {
 
 fileRouter.post('/', async (ctx) => {
 
-    let body = ctx.body;
+    let body = ctx.request.body;
+
+    // validate result
+	let bodyValidate = validateObject(body, 'tag');
+
+	// fields validation
+	if (!bodyValidate.isValid) {
+		ctx.status = 412;
+		ctx.body = reply('e', { 'e': bodyValidate.requires });
+		return;
+	}
 
     // Access validation
     let hasAccess = DataService.checkAccess('cms', 'file', AccessTypes.write, body, ctx.state.user);
@@ -37,7 +47,8 @@ fileRouter.post('/', async (ctx) => {
     else {
         await service.storeFile({
             file: file,
-            ownerId: ctx.state.user.id
+            ownerId: ctx.state.user.id,
+            tag: body.tag
         })
             .then((file) => {
                 result = reply('s', { file });
@@ -74,7 +85,6 @@ fileRouter.delete('/', async (ctx) => {
             });
     }
 
-    console.log('remove', result);
     ctx.body = result;
 });
 

package/src/services/file/service.js

@@ -22,12 +22,12 @@ class FileService {
    * @returns storedFile.fullPath
    * @returns storedFile.fileFormat
    */
-  createStoredDetail(fileType) {
+  createStoredDetail(fileType, tag) {
 
     let time = new Date().getTime();
     let fileFormat = fileType.split('/')[1];
     let fileName = `${time}.${fileFormat}`;
-    let fullPath = pathModule.join(this.directory, fileFormat, fileName);
+    let fullPath = pathModule.join(this.directory, fileFormat, tag, fileName);
 
     return { fileName, fullPath, fileFormat };
   }
@@ -39,7 +39,7 @@ class FileService {
    * @param {file} args.file file object
    * @param {string} args.ownerId file object
    */
-  storeFile({ file, ownerId }) {
+  storeFile({ file, ownerId, tag }) {
 
     if (!this.directory)
       throw 'upload directory has not been set.'
@@ -51,7 +51,7 @@ class FileService {
    * Store file and remove temp file
    */ {
 
-      storedFile = this.createStoredDetail(file.type);
+      storedFile = this.createStoredDetail(file.type, tag);
 
       fs.copyFile(file.path, storedFile.fullPath, {
         done: (err) => {
@@ -77,6 +77,7 @@ class FileService {
           fileName: storedFile.fileName,
           originalName: file.name,
           format: storedFile.fileFormat,
+          tag,
         });
 
         return doc.save().then(() => doc);
@@ -117,7 +118,7 @@ class FileService {
         .then(() => {
 
           // create file path
-          let filePath = pathModule.join(this.directory, fileDoc.format, fileDoc.fileName);
+          let filePath = pathModule.join(this.directory, fileDoc.format, fileDoc.tag, fileDoc.fileName);
 
           // Remove file from disc
           return this.removeFromDisc(filePath)