@digione/node-custom-api 0.1.8-beta2 → 0.1.9-beta2

package/models/system/file.d.ts

@@ -90,6 +90,7 @@ export declare const FileAttr: {
     upload: sequelize.TinyIntegerDataType;
     custom: sequelize.AbstractDataTypeConstructor;
     tags: sequelize.AbstractDataTypeConstructor;
+    group: sequelize.StringDataType;
     file_link: sequelize.EnumDataType<"no" | "yes">;
     file_id: sequelize.StringDataType;
     uid: sequelize.StringDataType;

package/models/system/file.js

@@ -95,6 +95,7 @@ exports.FileAttr = {
     upload: sequelize.TINYINT({ length: 1 }),
     custom: sequelize.JSON,
     tags: sequelize.JSON,
+    group: sequelize.STRING({ length: 20 }),
     file_link: sequelize.ENUM('no', 'yes'),
     file_id: sequelize.STRING({ length: 15 }),
     uid: sequelize.STRING({ length: 100 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digione/node-custom-api",
-  "version": "0.1.8-beta2",
+  "version": "0.1.9-beta2",
   "description": "Typescript node digione-api",
   "author": "Monchai Jirayupong <monchai.j@seven.co.th>",
   "license": "MIT",

package/utils/file.d.ts

@@ -124,11 +124,12 @@ export declare class FileUtil {
         tags?: TagFile;
         group?: any;
     }): Promise<any>;
-    uploadByReq(req: Request, slug: string, user_id: any, { parent_id, parent_slug, name, root, thumb, width, height, input, is_hidden, tags, group }?: {
+    uploadByReq(req: Request, slug: string, user_id: any, { parent_id, parent_slug, name, root, format, thumb, width, height, input, is_hidden, tags, group }?: {
         parent_id?: number;
         parent_slug?: string;
         name?: any;
         root?: boolean;
+        format?: boolean;
         thumb?: boolean;
         width?: number;
         height?: number;
@@ -156,7 +157,8 @@ export declare class FileUtil {
         group?: any;
     }): Promise<any>;
     allowedFileType(extension: any): Promise<any>;
-    formatFile(folder_id: any, user_id: any, reqs: Array<any>, files: Array<any>, { use_id, field, formatDateTime, input, is_hidden, tags, group }?: {
+    formatFile(folder_id: any, user_id: any, reqs: Array<any>, files: Array<any>, { format, use_id, field, formatDateTime, input, is_hidden, tags, group }?: {
+        format?: boolean;
         use_id?: boolean;
         field?: any[];
         formatDateTime?: string;
@@ -182,7 +184,8 @@ export declare class FileUtil {
         tags: TagFile;
         group: any;
     }[]>;
-    insertFileUnique(results: Array<any>, { thumb, width, height }?: {
+    insertFileUnique(results: Array<any>, { format, thumb, width, height }?: {
+        format?: boolean;
         thumb?: boolean;
         width?: number;
         height?: number;

package/utils/file.js

@@ -392,7 +392,7 @@ class FileUtil {
             return (yield this.findAllFile({ where: Object.assign({ id }, where), full, file_link, parent_folder, limit: 1, tags, group }))[0] || null;
         });
     }
-    uploadByReq(req, slug, user_id, { parent_id = 0, parent_slug = "", name = undefined, root = false, thumb = false, width = 0, height = 0, input = {}, is_hidden = undefined, tags = undefined, group = undefined } = {}) {
+    uploadByReq(req, slug, user_id, { parent_id = 0, parent_slug = "", name = undefined, root = false, format = false, thumb = false, width = 0, height = 0, input = {}, is_hidden = undefined, tags = undefined, group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             req.files = req.file ? [req.file] : (req.files || []);
             if (req.files.length && slug) {
@@ -419,7 +419,7 @@ class FileUtil {
                 }
                 let results = yield this.upload(files);
                 results = yield this.formatFile(folder['id'], user_id, reqs, results, { input, is_hidden, tags, group });
-                return yield this.insertFileUnique(results, { thumb, width, height });
+                return yield this.insertFileUnique(results, { format, thumb, width, height });
             }
             return Promise.reject(errors_1.generalError.BAD_REQUEST);
         });
@@ -557,7 +557,7 @@ class FileUtil {
             return type;
         });
     }
-    formatFile(folder_id, user_id, reqs, files, { use_id = true, field = [], formatDateTime = "X", input = {}, is_hidden = undefined, tags = undefined, group = undefined } = {}) {
+    formatFile(folder_id, user_id, reqs, files, { format = false, use_id = true, field = [], formatDateTime = "X", input = {}, is_hidden = undefined, tags = undefined, group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 let result = yield Promise.all(files.map((file, key) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -574,7 +574,7 @@ class FileUtil {
                         path = (index < 0) ? protocol + path : path;
                     }
                     let extension = mime.extension(reqs[key].mimetype);
-                    let format = Object.assign(Object.assign({}, input), { folder_id,
+                    let item = Object.assign(Object.assign({}, input), { folder_id,
                         user_id,
                         organ_id,
                         organ_by,
@@ -582,22 +582,25 @@ class FileUtil {
                         date_added, name: reqs[key].originalname || (0, helper_1.getSlug)(32), filename: reqs[key].Key || file.Key || input['filename'], path, mimetype: reqs[key].mimetype, filesize: reqs[key].size, extension: (extension ? "." + extension : ''), type: reqs[key].type || file.type || input['type'], is_hidden,
                         tags,
                         group });
+                    if (format) {
+                        item = yield this.afterQueryFile(item);
+                    }
                     if (use_id) {
-                        format['id'] = id;
+                        item['id'] = id;
                     }
                     if (reqs[key].mimetype && reqs[key].mimetype.split('/')[0] == "image") {
                         try {
                             let body = reqs[key].Body || reqs[key].buffer;
                             let image = yield jimp.read(body);
-                            format['height'] = image.bitmap.height;
-                            format['width'] = image.bitmap.width;
+                            item['height'] = image.bitmap.height;
+                            item['width'] = image.bitmap.width;
                         }
                         catch (err) { }
                     }
                     if (field.length) {
-                        format = _.pick(format, field);
+                        item = _.pick(item, field);
                     }
-                    return format;
+                    return item;
                 })));
                 return result;
             }
@@ -606,7 +609,7 @@ class FileUtil {
             }
         });
     }
-    insertFileUnique(results, { thumb = false, width = 0, height = 0 } = {}) {
+    insertFileUnique(results, { format = false, thumb = false, width = 0, height = 0 } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 let data = yield file_1.FileModel.schema(this.ref, "_").bulkCreate(results);
@@ -614,15 +617,14 @@ class FileUtil {
                     return Promise.reject(errors_1.generalError.BAD_REQUEST);
                 }
                 let result = data.map(item => item.toJSON());
-                if (thumb) {
-                    // create thumb
+                if (format || thumb) {
+                    // format or create thumb
                     result = yield Promise.all(result.map((item) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        if (item['type'] == 'i') {
-                            item['thumb'] = null;
-                            let thumb = yield this.findImageThumb(item, { width, height });
-                            return Object.assign(Object.assign({}, item), { thumb });
+                        let include = (yield this.afterQueryFile(item)) || {};
+                        if (thumb && item['type'] == 'i') {
+                            include['thumb'] = yield this.findImageThumb(item, { width, height });
                         }
-                        return item;
+                        return Object.assign(Object.assign({}, item), include);
                     })));
                 }
                 return result;
@@ -630,7 +632,7 @@ class FileUtil {
             catch (err) {
                 if (err.errors && err.errors[0].validatorKey == "not_unique") {
                     results = results.map(item => (Object.assign(Object.assign({}, item), { id: (0, uuid_1.v4)().replace(/-/gi, '').substring(0, 15) })));
-                    return yield this.insertFileUnique(results, { thumb, width, height });
+                    return yield this.insertFileUnique(results, { format, thumb, width, height });
                 }
                 return Promise.reject(errors_1.generalError.BAD_REQUEST);
             }
@@ -639,7 +641,7 @@ class FileUtil {
     uploadRawFormat(files, { field = ['name', 'filename', 'path', 'mimetype', 'filesize', 'extension', 'type', 'height', 'width'] } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let query = yield this.uploadRaw(files);
-            return yield this.formatFile(0, 0, files, query, { field });
+            return yield this.formatFile(0, 0, files, query, { format: true, field });
         });
     }
     updateFile(id, input = {}, { paths = [] } = {}) {

package/utils/stream.js

@@ -289,7 +289,7 @@ class StreamUtil {
                             }
                         }
                     }
-                    if (field['field_type'] == "multiple" || field['field_type'] == "any") {
+                    if ((field['field_type'] == "multiple" && field_data['self_table'] != "yes") || field['field_type'] == "any") {
                         delete attributes[field['field_slug']];
                     }
                 }

package/utils/validator.d.ts

@@ -57,5 +57,13 @@ export declare const convertService: ({ convert_type, schema }?: {
     convert_type?: any[];
     schema?: {};
 }) => (req: any, res: any, next: any) => Promise<any>;
+export declare const entryValidateService: ({ module, schema }?: {
+    module?: string[];
+    schema?: {};
+}) => (req: any, res: any, next: any) => Promise<any>;
+export declare const entryParamService: ({ module, schema }?: {
+    module?: string[];
+    schema?: {};
+}) => (req: any, res: any, next: any) => Promise<any>;
 export declare const createdByValidate: (req: any, res: any, next: any) => Promise<any>;
 export {};

package/utils/validator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createdByValidate = exports.convertService = exports.fieldService = exports.dataService = exports.printService = exports.exportService = exports.importService = exports.streamService = exports.multiService = exports.fileService = exports.paramService = exports.validateService = exports.validate = void 0;
+exports.createdByValidate = exports.entryParamService = exports.entryValidateService = exports.convertService = exports.fieldService = exports.dataService = exports.printService = exports.exportService = exports.importService = exports.streamService = exports.multiService = exports.fileService = exports.paramService = exports.validateService = exports.validate = void 0;
 const tslib_1 = require("tslib");
 const Joi = require("joi");
 const errors_1 = require("../errors");
@@ -291,6 +291,20 @@ const convertService = ({ convert_type = [], schema = {} } = {}) => (req, res, n
     return (0, exports.validateService)(Joi.object().keys(Object.assign({ ids: Joi.array().items(Joi.number()).min(1), convert_type: Joi.string().valid(...convert_type) }, schema)).unknown())(req, res, next);
 });
 exports.convertService = convertService;
+const entryValidateService = ({ module = ['contact'], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    return (0, exports.validateService)(Joi.object().keys(Object.assign({ module: Joi.string().valid(...module), entry_id: Joi.number().required() }, schema)).unknown())(req, res, next);
+});
+exports.entryValidateService = entryValidateService;
+const entryParamService = ({ module = ['contact'], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    if (req.query.module) {
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { module: req.query.module });
+    }
+    if (req.query.entry_id) {
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { entry_id: req.query.entry_id });
+    }
+    return (0, exports.paramService)(Joi.object().keys(Object.assign({ module: Joi.string().valid(...module), entry_id: Joi.number().required() }, schema)).unknown())(req, res, next);
+});
+exports.entryParamService = entryParamService;
 exports.createdByValidate = (0, exports.validateService)(Joi.object().keys({
     created_by: Joi.alternatives().try(Joi.string(), Joi.number()).required()
 }).unknown());