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

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-alpha6",
   "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;
@@ -146,7 +147,7 @@ export declare class FileUtil {
         hidden?: number;
         input?: {};
     }): Promise<any>;
-    createFileByPath(files: Array<string>, slug: string, user_id: any, { parent_slug, type, name, root, upload, tags, group }?: {
+    createFileByPath(files: Array<any>, slug: string, user_id: any, { parent_slug, type, name, root, upload, tags, group }?: {
         parent_slug?: string;
         type?: string;
         name?: any;
@@ -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;
@@ -179,10 +181,11 @@ export declare class FileUtil {
         extension: string;
         type: any;
         is_hidden: any;
-        tags: TagFile;
+        tags: any;
         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);
         });
@@ -470,8 +470,13 @@ class FileUtil {
                 let folder = yield this.createFolder(slug, { parent_id, root, name });
                 let results = [], reqs = [];
                 files.forEach((item) => {
-                    results.push({ Location: item, Key: item });
-                    reqs.push({ originalname: (0, helper_1.getSlug)(32), mimetype: null, size: 0, type });
+                    let addition = {}, path = item;
+                    if (typeof item == "object") {
+                        addition = item;
+                        path = item['path'];
+                    }
+                    results.push({ Location: path, Key: path });
+                    reqs.push(Object.assign({ originalname: (0, helper_1.getSlug)(32), mimetype: null, size: 0, type }, addition));
                 });
                 results = yield this.formatFile(folder['id'], user_id, reqs, results, { input, tags, group });
                 return yield this.insertFileUnique(results);
@@ -557,7 +562,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,30 +579,31 @@ 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,
                         sort,
-                        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 });
+                        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: reqs[key].tags || 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 +612,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 +620,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 +635,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 +644,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/helper.d.ts

@@ -64,7 +64,7 @@ export declare const randomRef: ({ length_digital, length_alphabet }?: {
     length_alphabet?: number;
 }) => string;
 export declare const treeToArray: (items: Array<any>, array?: Array<any>, level?: number) => Promise<any[]>;
-export declare const buildTree: (nodes: Array<any>, { index, field_children, json_convert, key_index, key_parent, root, to_array }?: {
+export declare const buildTree: (nodes: Array<any>, { index, field_children, json_convert, key_index, key_parent, root, to_array, notfound_parent }?: {
     index?: any;
     field_children?: string;
     json_convert?: boolean;
@@ -72,6 +72,7 @@ export declare const buildTree: (nodes: Array<any>, { index, field_children, jso
     key_parent?: string;
     root?: any;
     to_array?: boolean;
+    notfound_parent?: boolean;
 }) => Promise<any[]>;
 export declare const expandTree: (items: Array<any>, { array, parent, level, prefix, field_index, field_children, key_value }?: {
     array?: any[];

package/utils/helper.js

@@ -228,7 +228,7 @@ const treeToArray = (items, array = [], level = 1) => tslib_1.__awaiter(void 0,
     return array;
 });
 exports.treeToArray = treeToArray;
-const buildTree = (nodes, { index = undefined, field_children = "children", json_convert = false, key_index = "id", key_parent = "parent", root = undefined, to_array = false } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const buildTree = (nodes, { index = undefined, field_children = "children", json_convert = false, key_index = "id", key_parent = "parent", root = undefined, to_array = false, notfound_parent = false } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     if (!nodes) {
         return null;
     }
@@ -266,11 +266,16 @@ const buildTree = (nodes, { index = undefined, field_children = "children", json
                 }
             }
             parent[field_children] = results;
+            delete children[parent[key_index]];
         }
     };
     for (let i = 0, len = roots.length; i < len; ++i) {
         findChildren(roots[i]);
     }
+    if (notfound_parent) {
+        let items = Object.keys(children).reduce((total, key) => total.concat(children[key]), []);
+        roots.unshift({ [key_index]: -1, [field_children]: items });
+    }
     if (index)
         roots = roots[0];
     if (roots && to_array) {

package/utils/stream.d.ts

@@ -40,7 +40,7 @@ export declare class StreamUtil {
     private fileUtil;
     private languageUtil;
     constructor(ref?: string, option?: QueryParamOption, fileUtil?: FileUtil);
-    findField(slug: string, namespace: string, { index, option, no_lang, field_slug, field_only, field_required, lang, lang_code, is_required, default_value, addition, include, include_only, convert_option, field_option, require, multiple_table, multiple_spread, text, bullets, multiple, relationship, file, image, field_exclude, section }?: {
+    findField(slug: string, namespace: string, { index, option, no_lang, field_slug, field_only, field_required, lang, lang_code, is_required, default_value, addition, include, include_only, convert_option, convert_value, field_option, require, multiple_table, multiple_spread, text, bullets, multiple, relationship, file, image, field_exclude, section }?: {
         index?: string;
         option?: {};
         no_lang?: boolean;
@@ -55,6 +55,7 @@ export declare class StreamUtil {
         include?: any;
         include_only?: boolean;
         convert_option?: boolean;
+        convert_value?: boolean;
         field_option?: {};
         require?: boolean;
         multiple_table?: boolean;
@@ -117,7 +118,7 @@ export declare class StreamUtil {
         result: {};
         labels: any[];
     }>;
-    genField(streams: Array<any>, { index, option, slug, id_stream, prefix, multiple_table, multiple_spread, addition, convert_option, field_option, default_value, default_lang, lang_code, no_lang, lang, country, section }?: {
+    genField(streams: Array<any>, { index, option, slug, id_stream, prefix, multiple_table, multiple_spread, addition, convert_option, convert_value, field_option, default_value, default_lang, lang_code, no_lang, lang, country, section }?: {
         index?: string;
         option?: {};
         slug?: string;
@@ -127,6 +128,7 @@ export declare class StreamUtil {
         multiple_spread?: boolean;
         addition?: {};
         convert_option?: boolean;
+        convert_value?: boolean;
         field_option?: {};
         default_value?: any;
         default_lang?: string;

package/utils/stream.js

@@ -101,7 +101,7 @@ class StreamUtil {
         this.fileUtil = fileUtil || new file_2.FileUtil(this.ref, this.option);
         this.languageUtil = new language_1.LanguageUtil(this.ref, this.option);
     }
-    findField(slug, namespace, { index = "", option = {}, no_lang = false, field_slug = [], field_only = true, field_required = true, lang = [], lang_code = "en", is_required = "", default_value = {}, addition = {}, include = undefined, include_only = false, convert_option = false, field_option = {}, require = false, multiple_table = false, multiple_spread = false, text = false, bullets = false, multiple = false, relationship = false, file = false, image = false, field_exclude = [], section = false } = {}) {
+    findField(slug, namespace, { index = "", option = {}, no_lang = false, field_slug = [], field_only = true, field_required = true, lang = [], lang_code = "en", is_required = "", default_value = {}, addition = {}, include = undefined, include_only = false, convert_option = false, convert_value = false, field_option = {}, require = false, multiple_table = false, multiple_spread = false, text = false, bullets = false, multiple = false, relationship = false, file = false, image = false, field_exclude = [], section = false } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let data;
             let where = {};
@@ -184,7 +184,7 @@ class StreamUtil {
                     }
                 }
                 if (convert_option) {
-                    data['fields'] = yield this.genField(data['fields'], { index, option, slug, id_stream: data['id'], prefix: data['stream_prefix'], multiple_table, multiple_spread, addition, field_option, default_value, lang_code, no_lang, lang, section });
+                    data['fields'] = yield this.genField(data['fields'], { index, option, slug, id_stream: data['id'], prefix: data['stream_prefix'], multiple_table, multiple_spread, addition, convert_value, field_option, default_value, lang_code, no_lang, lang, section });
                 }
                 if (field_only) {
                     return data['fields'];
@@ -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']];
                     }
                 }
@@ -347,7 +347,7 @@ class StreamUtil {
             return { result, labels };
         });
     }
-    genField(streams, { index = "", option = {}, slug = "", id_stream = "", prefix = "", multiple_table = false, multiple_spread = false, addition = {}, convert_option = true, field_option = {}, default_value = {}, default_lang = "en", lang_code = "en", no_lang = false, lang = [], country = undefined, section = false } = {}) {
+    genField(streams, { index = "", option = {}, slug = "", id_stream = "", prefix = "", multiple_table = false, multiple_spread = false, addition = {}, convert_option = true, convert_value = false, field_option = {}, default_value = {}, default_lang = "en", lang_code = "en", no_lang = false, lang = [], country = undefined, section = false } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let fields = [], sections = [];
             let exclude = option['excludeObj'] || {};
@@ -472,6 +472,7 @@ class StreamUtil {
                     continue;
                 }
                 if (convert_option) {
+                    let obj_value = {};
                     if (item['field_type'] == "choice") {
                         if (field_data['choice_data']) {
                             let data = [];
@@ -501,6 +502,9 @@ class StreamUtil {
                                 else {
                                     data[k] = { key: v, value: v };
                                 }
+                                if (convert_value && data[k]) {
+                                    obj_value[data[k]['key']] = data[k]['value'];
+                                }
                             });
                             item['data'] = data;
                         }
@@ -510,9 +514,18 @@ class StreamUtil {
                                 if (value && value.indexOf('lang:') > -1) {
                                     item['value'] = (0, i18n_1.__)({ phrase: value, locale: lang_code });
                                 }
+                                if (convert_value && item['key']) {
+                                    obj_value[item['key']] = item['value'];
+                                }
                                 return item;
                             });
                         }
+                        if (convert_value && typeof item['field_value'] != "undefined") {
+                            let field_value = item['field_value'];
+                            if (item['field_value'] == null)
+                                field_value = '';
+                            field_data['value'] = obj_value[field_value];
+                        }
                     }
                     else if (!field_option[item['field_slug']] && (item['field_type'] == "relationship" || item['field_type'] == "multiple") && field_data['choose_stream']) {
                         try {
@@ -557,6 +570,9 @@ class StreamUtil {
                                             item['title'] = item['title'] ? item['title'] : item[stream['title_column']];
                                             (0, helper_2.getValueFunctionLang)('title')(item, { result: item, lang_code });
                                             let value = item['title'] ? item['title'] : item['id'];
+                                            if (convert_value && item['id']) {
+                                                obj_value[item['id']] = value;
+                                            }
                                             return {
                                                 key: item['id'],
                                                 value
@@ -567,6 +583,9 @@ class StreamUtil {
                                 }
                             }
                             item['data'] = data;
+                            if (convert_value && item['field_value']) {
+                                field_data['value'] = obj_value[item['field_value']];
+                            }
                         }
                         catch (err) { }
                     }
@@ -1636,8 +1655,10 @@ class StreamUtil {
                     }
                 }
             }
-            let sort_order = yield field_1.FieldModel.schema(this.ref, "_").max('sort_order', { where: { stream_id: stream['id'] } });
-            field['sort_order'] = sort_order ? Number(sort_order + 1) : 1;
+            if (typeof field['sort_order'] == "undefined") {
+                let sort_order = yield field_1.FieldModel.schema(this.ref, "_").max('sort_order', { where: { stream_id: stream['id'] } });
+                field['sort_order'] = sort_order ? Number(sort_order + 1) : 1;
+            }
             if (!field['stream_id']) {
                 field['stream_id'] = stream['id'];
             }

package/utils/user.js

@@ -277,7 +277,14 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
 exports.getAddressIndex = getAddressIndex;
 const getCountry = (ref, { organ_id = "", lang_code = "en", setting = {} } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     let where = { status: 1, lang_code }, default_country;
-    if (setting['country_id']) {
+    if (organ_id) {
+        let query = yield organ_1.UserOrganModel.schema(ref, "_").findOne({ where: { id: organ_id }, attributes: ['setting'], raw: true });
+        setting = query ? (query['setting'] || {}) : {};
+    }
+    if (setting['mobile_code']) {
+        where['mobilecode'] = setting['mobile_code'].split(",");
+    }
+    else if (setting['country_id']) {
         where['id'] = setting['country_id'].split(",");
     }
     let data = yield country_1.CountryModel.schema("core", "_").findAll({

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());