@digione/node-custom-api 0.1.9 → 0.2.0-alpha2

package/middlewares/paramQuery.d.ts

@@ -14,3 +14,6 @@ export declare const changeBodyParam: (value?: {}, { skipSystem, omit }?: {
     skipSystem?: boolean;
     omit?: any[];
 }) => (req: Request, res: Response, next: any) => any;
+export declare const changeConfigParam: (value?: {}, { skipSystem }?: {
+    skipSystem?: boolean;
+}) => (req: Request, res: Response, next: any) => any;

package/middlewares/paramQuery.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeBodyParam = exports.changeOptionParam = exports.changeQueryParam = exports.getQueryParamFile = exports.getQueryParamCUD = exports.getQueryParam = exports.getStremParam = exports.getAuthParam = void 0;
+exports.changeConfigParam = exports.changeBodyParam = exports.changeOptionParam = exports.changeQueryParam = exports.getQueryParamFile = exports.getQueryParamCUD = exports.getQueryParam = exports.getStremParam = exports.getAuthParam = void 0;
 const helper_1 = require("../utils/helper");
 const _ = require("lodash");
 const getAuthParam = (req, res, next) => {
@@ -127,6 +127,7 @@ const getQueryParam = (req, res, next) => {
 };
 exports.getQueryParam = getQueryParam;
 const getQueryParamCUD = (req, res, next) => {
+    let config = res.locals.config || {};
     res.locals.option = res.locals.option || {};
     if (req.query.include) {
         try {
@@ -144,7 +145,7 @@ const getQueryParamCUD = (req, res, next) => {
         res.locals.option['records'] = String(req.query.records).split(',');
     }
     if (req.query.ids) {
-        res.locals.option['ids'] = String(req.query.ids).split(',').slice(0, 25);
+        res.locals.option['ids'] = String(req.query.ids).split(',').slice(0, (config['maxQueryIds'] || 25));
     }
     return (0, exports.getAuthParam)(req, res, () => {
         if (req.query.lang_code) {
@@ -218,3 +219,13 @@ const changeBodyParam = (value = {}, { skipSystem = false, omit = [] } = {}) =>
     return next();
 };
 exports.changeBodyParam = changeBodyParam;
+const changeConfigParam = (value = {}, { skipSystem = false } = {}) => (req, res, next) => {
+    if (skipSystem && req.params.web_system_token) {
+        let bol = (typeof req.params.web != "undefined") || (req.params.web_system == req.params.web);
+        if (bol)
+            return next();
+    }
+    res.locals.config = Object.assign(Object.assign({}, res.locals.config || {}), value);
+    return next();
+};
+exports.changeConfigParam = changeConfigParam;

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/models/user/user.d.ts

@@ -50,9 +50,6 @@ export declare const UserAttr: {
     organ_id: {
         type: sequelize.IntegerDataType;
     };
-    member_id: {
-        type: sequelize.StringDataType;
-    };
     provider: sequelize.StringDataType;
     mobile: sequelize.StringDataType;
     mobile_code: sequelize.StringDataType;

package/models/user/user.js

@@ -58,10 +58,6 @@ exports.UserAttr = {
     organ_id: {
         type: sequelize.INTEGER({ length: 11 })
     },
-    // points:sequelize.INTEGER({length:11}),
-    member_id: {
-        type: sequelize.STRING(100)
-    },
     provider: sequelize.STRING(40),
     mobile: sequelize.STRING(20),
     mobile_code: sequelize.STRING(10)

package/package.json

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

package/utils/auth.d.ts

@@ -3,8 +3,10 @@ export declare const getTokenFromReq: (req: any) => any;
 export declare class AuthUtil {
     ref: string;
     constructor(ref: string);
-    create(id: any, { include }?: {
+    create(id: any, { include, include_token, setting }?: {
         include?: {};
+        include_token?: {};
+        setting?: {};
     }): Promise<{
         refresh_token: string;
         access_token: string;

package/utils/auth.js

@@ -11,7 +11,7 @@ const authError_1 = require("../errors/authError");
 const jwt = require("jsonwebtoken");
 const signToken = (id, expIn, opt = {}) => {
     const date = (0, helper_1.getDateTime)();
-    return jwt.sign(Object.assign({ id: id, createAt: date, expAt: date.add(expIn, 'days') }, opt), (0, helper_1.getENV)('JWT_SECRET'));
+    return jwt.sign(Object.assign({ id: id, createAt: date, expAt: date.clone().add(expIn, 'days') }, opt), (0, helper_1.getENV)('JWT_SECRET'));
 };
 const getIdFromReq = (req) => {
     try {
@@ -30,14 +30,19 @@ class AuthUtil {
     constructor(ref) {
         this.ref = ref;
     }
-    create(id, { include = {} } = {}) {
+    create(id, { include = {}, include_token = {}, setting = {} } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let refreshTokenUUID = (0, helper_1.getUUID)();
             let include_access = {};
             if (Object.keys(include).length) {
                 include_access['setting'] = JSON.stringify(include);
             }
-            let input = Object.assign({ id: refreshTokenUUID, user_id: id, expired_at: (0, helper_1.getDateTime)().add((0, helper_1.getENV)('REFRESH_TOKEN_AGE'), 'days'), token: signToken(id, (0, helper_1.getENV)('REFRESH_TOKEN_AGE'), { refresh_token_id: refreshTokenUUID }), accessToken: Object.assign({ user_id: id, expired_at: (0, helper_1.getDateTime)().add((0, helper_1.getENV)('ACCESS_TOKEN_AGE'), 'days'), token: signToken(id, (0, helper_1.getENV)('ACCESS_TOKEN_AGE'), { refresh_token_id: refreshTokenUUID }) }, include_access) }, include);
+            let rf_expire_in = Number(setting['expire_in'] || (0, helper_1.getENV)('REFRESH_TOKEN_AGE', 1));
+            let ac_expire_in = Number((0, helper_1.getENV)('ACCESS_TOKEN_AGE', 1));
+            if (rf_expire_in < ac_expire_in) {
+                ac_expire_in = rf_expire_in;
+            }
+            let input = Object.assign({ id: refreshTokenUUID, user_id: id, expired_at: (0, helper_1.getDateTime)().add(rf_expire_in, 'days'), token: signToken(id, rf_expire_in, Object.assign({ refresh_token_id: refreshTokenUUID }, include_token)), accessToken: Object.assign({ user_id: id, expired_at: (0, helper_1.getDateTime)().add(ac_expire_in, 'days'), token: signToken(id, ac_expire_in, Object.assign({ refresh_token_id: refreshTokenUUID }, include_token)) }, include_access) }, include);
             yield refresh_token_1.RefreshTokenModel.schema(this.ref, "_").create(input, {
                 include: [
                     {

package/utils/db.js

@@ -32,12 +32,12 @@ const getWhereVal = (smth) => {
     return [key, value].join(` ${smth.comparator} `);
 };
 const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket = false } = {}) => {
-    as = as ? as + delimiter : as;
+    let keyPrefix = as ? "`" + as + "`" + delimiter : as;
     let symbolKeys = Object.getOwnPropertySymbols(where);
     let rawWhere = (Object.keys(where).concat(symbolKeys)).reduce((result, key) => {
         let value = where[key];
         if (typeof value !== 'undefined') {
-            key = typeof (value) == "string" ? `${as}${key}` : key;
+            key = typeof (key) == "string" ? keyPrefix + "`" + (key.split('.').join("`.`")) + "`" : key;
             if (typeof (value) == "string") {
                 value = SqlString.escape(value);
             }
@@ -48,7 +48,7 @@ const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket
                     result = `${result}( ${op}) AND `;
                 }
                 else {
-                    result = `${result + key} IN (${value.map(i => "'" + i + "'").join(',')}) AND `;
+                    result = result + key + ` IN (${value.map(i => "'" + i + "'").join(',')}) AND `;
                 }
                 return result;
             }
@@ -62,7 +62,7 @@ const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket
                 return result;
             }
             else if (typeof value == "object" && value['val']) {
-                result = `${result}${key}=${value['val']} AND `;
+                result = result + key + `=${value['val']} AND `;
                 return result;
             }
             result = result + key + "=" + value + " AND ";

package/utils/file.d.ts

@@ -62,16 +62,23 @@ export declare class FileUtil {
         width?: number;
         height?: number;
     }): Promise<any>;
-    beforeFindFile(where?: {}, { tags, group }?: {
+    beforeFindFile(where?: {}, { attributes, tags, group, verify }?: {
+        attributes?: any;
         tags?: TagFile;
         group?: any;
-    }): {};
-    findAllFile({ where, folder, full, file_link, thumb, width, height, parent_folder, attributes, limit, offset, tag, tags, group }?: {
+        verify?: boolean;
+    }): {
+        where: {};
+        attributes: any;
+        order: any[];
+    };
+    findAllFile({ where, folder, full, file_link, thumb, verify, width, height, parent_folder, attributes, limit, offset, tag, tags, group }?: {
         where?: {};
         folder?: boolean;
         full?: boolean;
         file_link?: boolean;
         thumb?: boolean;
+        verify?: boolean;
         width?: number;
         height?: number;
         parent_folder?: string;
@@ -124,11 +131,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 +154,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 +164,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;
@@ -169,7 +178,7 @@ export declare class FileUtil {
         user_id: any;
         organ_id: any;
         organ_by: any;
-        sort: string;
+        sort: any;
         date_added: string;
         name: any;
         filename: any;
@@ -179,15 +188,18 @@ export declare class FileUtil {
         extension: string;
         type: any;
         is_hidden: any;
-        tags: TagFile;
+        tags: any;
+        custom: 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;
     }): any;
-    uploadRawFormat(files: Array<any>, { field }?: {
+    uploadRawFormat(files: Array<any>, { format, field }?: {
+        format?: boolean;
         field?: string[];
     }): Promise<any>;
     updateFile(id: string, input?: any, { paths }?: {

package/utils/file.js

@@ -108,6 +108,7 @@ class FileUtil {
     }
     afterQueryFile(data = {}, { tag = {}, file_link = false } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            delete data['thumbnail'];
             data['custom'] = data['custom'] || {};
             data['tags'] = data['tags'] || [];
             if (data['filename'] == data['path']) {
@@ -133,6 +134,7 @@ class FileUtil {
             let reqs = [], results = [];
             for (let file of files) {
                 let extension = mime.extension(file.mimetype);
+                extension = extension ? extension : String(file.mimetype).split('/')[1];
                 let input = {
                     Bucket: this.bucket,
                     Key: this.ref + "/" + (0, helper_1.getDateTime)().format('X') + '.' + (0, helper_1.getSlug)(32) + '.' + extension,
@@ -256,7 +258,7 @@ class FileUtil {
                     result[width + 'x' + height] = thumb;
                     yield (0, db_1.update)(this.ref, file_1.FileModel.getTableName().toString(), { thumb: JSON.stringify(result) }, { where: { id: item['id'] } });
                 }
-                if (item['filename'] == path) {
+                if (thumb && item['filename'] == path) {
                     yield this.getStorage();
                     let data = yield this.afterQueryFile({ filename: thumb, path: thumb });
                     thumb = data.path;
@@ -275,12 +277,12 @@ class FileUtil {
                         return null;
                     where['$folder.parent_id$'] = query['id'];
                 }
-                where = this.beforeFindFile(where, { tags, group });
+                let option = this.beforeFindFile(where, { attributes: ['id', 'extension', 'filename', 'path', 'thumb'], tags, group });
                 let result = yield file_1.FileModel.schema(this.ref, "_").findOne({
-                    raw: true, attributes: ['id', 'extension', 'filename', 'path', 'thumb'],
-                    where: Object.assign({ '$folder.slug$': slug }, where),
+                    raw: true, attributes: option.attributes,
+                    where: Object.assign({ '$folder.slug$': slug }, option.where),
                     include: [{ as: 'folder', model: folder_1.FolderModel.schema(this.ref, "_"), attributes: [] }],
-                    order: [['sort', 'asc'], ['tags', 'desc']]
+                    order: option.order
                 });
                 return this.findImageThumb(result, { width, height });
             }
@@ -298,7 +300,8 @@ class FileUtil {
             return this.findImageThumb(item, { width, height });
         });
     }
-    beforeFindFile(where = {}, { tags = [], group = undefined } = {}) {
+    beforeFindFile(where = {}, { attributes = undefined, tags = [], group = undefined, verify = false } = {}) {
+        let order = [['sort', 'asc'], ['tags', 'desc']], thumbnail = false;
         if (this.option.organ_id) {
             where[sequelize_1.Op.and] = (where[sequelize_1.Op.and] || []).concat({ [sequelize_1.Op.or]: [{ organ_id: this.option.organ_id }, { organ_by: this.option.organ_id }] });
         }
@@ -309,9 +312,11 @@ class FileUtil {
             let op = tags.reduce((total, tag) => {
                 let value = Object.keys(tag).reduce((total, key) => total.concat([`'${key}'`, `"${tag[key]}"`]), []).join(',');
                 if (value) {
-                    total = total.concat((0, sequelize_1.literal)(`JSON_CONTAINS(tags,JSON_OBJECT(${value}))`));
-                    if (tag['slug'] == "thumbnail") {
-                        total = total.concat((0, sequelize_1.literal)(`tags IS NULL`));
+                    if (tag['slug'] == "thumbnail" && !verify) {
+                        thumbnail = true;
+                    }
+                    else {
+                        total = total.concat((0, sequelize_1.literal)(`JSON_CONTAINS(tags,JSON_OBJECT(${value}))`));
                     }
                 }
                 return total;
@@ -320,9 +325,19 @@ class FileUtil {
                 where[sequelize_1.Op.and] = (where[sequelize_1.Op.and] || []).concat({ [sequelize_1.Op.or]: op });
             }
         }
-        return where;
+        if (thumbnail) {
+            let include = [[(0, sequelize_1.literal)(`IF(JSON_CONTAINS(tags,JSON_OBJECT('slug',"thumbnail")),'yes','no')`), 'thumbnail']];
+            if (typeof attributes == "undefined") {
+                attributes = { include };
+            }
+            else if (attributes instanceof Array) {
+                attributes = attributes.concat(include);
+            }
+            order = [['thumbnail', 'desc'], ['sort', 'asc']];
+        }
+        return { where, attributes, order };
     }
-    findAllFile({ where = {}, folder = false, full = false, file_link = false, thumb = false, width = 0, height = 0, parent_folder = "", attributes = undefined, limit = undefined, offset = undefined, tag = {}, tags = [], group = undefined } = {}) {
+    findAllFile({ where = {}, folder = false, full = false, file_link = false, thumb = false, verify = true, width = 0, height = 0, parent_folder = "", attributes = undefined, limit = undefined, offset = undefined, tag = {}, tags = [], group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 let include = [];
@@ -334,10 +349,10 @@ class FileUtil {
                         return [];
                     where['$folder.parent_id$'] = query['id'];
                 }
-                where = this.beforeFindFile(where, { tags, group });
                 where['is_hidden'] = where['is_hidden'] || "no";
+                let option = this.beforeFindFile(where, { attributes, tags, group, verify });
                 let result = yield file_1.FileModel.schema(this.ref, "_").findAll({
-                    attributes, raw: true, where, limit, offset, include, order: [['sort', 'asc'], ['tags', 'desc']]
+                    attributes: option.attributes, raw: true, where: option.where, limit, offset, include, order: option.order
                 });
                 result.length && (yield this.getStorage());
                 result = yield Promise.all(result.map((item) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -371,9 +386,9 @@ class FileUtil {
             if (!folder)
                 return { rows: [], count: 0 };
             where['folder_id'] = folder['id'];
-            where = this.beforeFindFile(where, { tags, group });
             where['is_hidden'] = where['is_hidden'] || "no";
-            let data = yield Promise.all([this.findAllFile({ where, full: true, file_link, limit, offset, tag, group }), file_1.FileModel.schema(this.ref, "_").count({ where })]);
+            let option = this.beforeFindFile(where, { tags, group, verify: true });
+            let data = yield Promise.all([this.findAllFile({ where, full: true, file_link, limit, offset, tag, group }), file_1.FileModel.schema(this.ref, "_").count({ where: option.where })]);
             return { rows: data[0], count: data[1] };
         });
     }
@@ -384,7 +399,7 @@ class FileUtil {
     }
     findOneFileByFolder(slug, { where = {}, full = false, file_link = false, parent_folder = "", tags = [], group = null } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (yield this.findAllFile({ where: Object.assign({ '$folder.slug$': slug }, where), folder: true, full, file_link, parent_folder, limit: 1, tags, group }))[0] || null;
+            return (yield this.findAllFile({ where: Object.assign({ '$folder.slug$': slug }, where), folder: true, full, file_link, verify: false, parent_folder, limit: 1, tags, group }))[0] || null;
         });
     }
     findOneFileById(id, { where = {}, full = true, file_link = false, parent_folder = "", tags = [], group = null } = {}) {
@@ -392,7 +407,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) {
@@ -406,6 +421,7 @@ class FileUtil {
                 let folder = yield this.createFolder(slug, { parent_id, root, name });
                 for (let file of req.files) {
                     let extension = mime.extension(file.mimetype);
+                    extension = extension ? extension : String(file.mimetype).split('/')[1];
                     let input = {
                         Bucket: this.bucket,
                         Key: this.ref + "/" + (0, helper_1.getDateTime)().format('X') + '.' + (0, helper_1.getSlug)(32) + '.' + extension,
@@ -419,7 +435,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 +486,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 +578,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 +595,30 @@ class FileUtil {
                         path = (index < 0) ? protocol + path : path;
                     }
                     let extension = mime.extension(reqs[key].mimetype);
-                    let format = Object.assign(Object.assign({}, input), { folder_id,
+                    extension = extension ? extension : String(reqs[key].mimetype).split('/')[1];
+                    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 });
+                        organ_by, sort: reqs[key].sort || 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: reqs[key].tags || tags, custom: reqs[key].custom || input['custom'], 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 +627,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 +635,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,16 +650,16 @@ 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);
             }
         });
     }
-    uploadRawFormat(files, { field = ['name', 'filename', 'path', 'mimetype', 'filesize', 'extension', 'type', 'height', 'width'] } = {}) {
+    uploadRawFormat(files, { format = false, 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, field });
         });
     }
     updateFile(id, input = {}, { paths = [] } = {}) {
@@ -672,8 +692,8 @@ class FileUtil {
     }
     remove({ where = {}, delete_object = false, error = true, tags = [], group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            where = this.beforeFindFile(where, { tags, group });
-            let files = yield file_1.FileModel.schema(this.ref, "_").findAll({ where, attributes: ['id', 'path', 'thumb'], raw: true });
+            let option = this.beforeFindFile(where, { tags, group, verify: true });
+            let files = yield file_1.FileModel.schema(this.ref, "_").findAll({ where: option.where, attributes: ['id', 'path', 'thumb'], raw: true });
             if (files.length) {
                 let paths = [], id = files.map(i => { paths = paths.concat(this.getFilePath(i)); return i['id']; });
                 yield file_1.FileModel.schema(this.ref, "_").destroy({ where: { id } });

package/utils/helper.d.ts

@@ -12,6 +12,10 @@ export declare const getDaysBetweenDates: (startDate: any, endDate: any, { utc }
 }) => any[];
 export declare const Joi_date: any;
 export declare const getENV: (str: string, def?: any) => any;
+export declare const getENVIndex: (index: string, { prefix, force }?: {
+    prefix?: string;
+    force?: boolean;
+}) => string;
 export declare const getSlug: (length?: number) => string;
 export declare const getDateMysql: (date?: any) => any;
 export declare const getTimestampMysql: (date?: any) => number;
@@ -50,6 +54,9 @@ export declare const removeHyphen: (str: string, replace?: string, { encode, rep
 export declare const getMobileNumber: (str: string, { prefix }?: {
     prefix?: string;
 }) => string;
+export declare const formatMobileNumber: (str: string, { prefix }?: {
+    prefix?: string;
+}) => string;
 export declare const removeSpace: (str: string, replace?: string) => string;
 export declare const removeAt: (str: string, replace?: string) => string;
 export declare const isNumber: (val: any, { negative }?: {
@@ -64,7 +71,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 +79,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[];
@@ -88,6 +96,7 @@ export declare const slugify: (string?: any, { lowercase }?: {
 }) => any;
 export declare const slugifyField: (string?: any) => any;
 export declare const stripHtml: (string: string) => string;
+export declare const stripEmoji: (string: string) => string;
 export declare const replaceColon: (string: string, { decode }?: {
     decode?: boolean;
 }) => string;

package/utils/helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertCurrency = exports.xorMerge = exports.xorDecode = exports.xorEncode = exports.getInstanceNumber = exports.getDomain = exports.getParent = exports.replaceColon = exports.stripHtml = exports.slugifyField = exports.slugify = exports.convertToBigEndian = exports.expandTree = exports.buildTree = exports.treeToArray = exports.randomRef = exports.multiExecArray = exports.isBase64 = exports.isNumber = exports.removeAt = exports.removeSpace = exports.getMobileNumber = exports.removeHyphen = exports.signToken = exports.getTokenDataFromTokenBySecret = exports.getUUID32 = exports.getUUID = exports.sleep = exports.getValueByLang = exports.getValueFunctionLang = exports.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getSlug = exports.getENV = exports.Joi_date = exports.getDaysBetweenDates = exports.getDateFromString = exports.getDateRangeFormat = void 0;
+exports.convertCurrency = exports.xorMerge = exports.xorDecode = exports.xorEncode = exports.getInstanceNumber = exports.getDomain = exports.getParent = exports.replaceColon = exports.stripEmoji = exports.stripHtml = exports.slugifyField = exports.slugify = exports.convertToBigEndian = exports.expandTree = exports.buildTree = exports.treeToArray = exports.randomRef = exports.multiExecArray = exports.isBase64 = exports.isNumber = exports.removeAt = exports.removeSpace = exports.formatMobileNumber = exports.getMobileNumber = exports.removeHyphen = exports.signToken = exports.getTokenDataFromTokenBySecret = exports.getUUID32 = exports.getUUID = exports.sleep = exports.getValueByLang = exports.getValueFunctionLang = exports.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getSlug = exports.getENVIndex = exports.getENV = exports.Joi_date = exports.getDaysBetweenDates = exports.getDateFromString = exports.getDateRangeFormat = void 0;
 const tslib_1 = require("tslib");
 const crypto = require("crypto");
 const dotenv = require("dotenv");
@@ -57,6 +57,13 @@ const getENV = (str, def) => {
     return process.env[str] || def;
 };
 exports.getENV = getENV;
+const getENVIndex = (index, { prefix = "dev", force = false } = {}) => {
+    if (process.env.NODE_ENV == "production" || force) {
+        return index;
+    }
+    return prefix + "_" + index;
+};
+exports.getENVIndex = getENVIndex;
 const getSlug = (length = 8) => {
     return new short_unique_id_1.default().randomUUID(length);
 };
@@ -154,14 +161,25 @@ exports.removeHyphen = removeHyphen;
 const getMobileNumber = (str, { prefix = "+66" } = {}) => {
     if (str) {
         str = str.replace(/_/g, "").replace(/-/g, "").replace(/ /g, "");
-        if (str.indexOf("+") == -1 && str.length == 10) {
-            str = str.substr(1);
+        if (str.indexOf("+") == -1 && (str.length == 10 || str.length == 9)) {
+            if (str.length == 10 && str[0] == "0")
+                str = str.substr(1);
             str = prefix + str;
         }
     }
     return str;
 };
 exports.getMobileNumber = getMobileNumber;
+const formatMobileNumber = (str, { prefix = "+66" } = {}) => {
+    if (str) {
+        str = str.replace(/_/g, "").replace(/-/g, "").replace(/ /g, "").replace(prefix, "");
+        if (str.length == 9) {
+            str = "0" + str;
+        }
+    }
+    return str;
+};
+exports.formatMobileNumber = formatMobileNumber;
 const removeSpace = (str, replace = "") => {
     return str ? str.replace(/ /g, replace) : "";
 };
@@ -228,7 +246,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 +284,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) {
@@ -350,6 +373,10 @@ const stripHtml = (string) => {
         .replace(/\n/g, '');
 };
 exports.stripHtml = stripHtml;
+const stripEmoji = (string) => {
+    return String(string).replace(/(?![*#0-9]+)[\p{Emoji}\p{Emoji_Modifier}\p{Emoji_Component}\p{Emoji_Modifier_Base}\p{Emoji_Presentation}]/gu, '').trim();
+};
+exports.stripEmoji = stripEmoji;
 const replaceColon = (string, { decode = false } = {}) => {
     if (!string || typeof (string) != 'string') {
         return string;

package/utils/metadata.js

@@ -27,11 +27,11 @@ class MetadataUtil {
                 let value = {}, type = types;
                 if (_.isObject(input[key])) {
                     let val = {};
-                    _.each(input[key], (v, k) => { val['value_' + k] = (0, helper_1.stripHtml)(v ? v.substring(0, str_length) : ""); });
+                    _.each(input[key], (v, k) => { val['value_' + k] = v ? (0, helper_1.stripEmoji)((0, helper_1.stripHtml)(v)).substring(0, str_length) : ""; });
                     value = val;
                 }
                 else {
-                    value = { value_en: (0, helper_1.stripHtml)(String(input[key] || "").substring(0, str_length)) };
+                    value = { value_en: (0, helper_1.stripEmoji)((0, helper_1.stripHtml)(String(input[key] || "")).substring(0, str_length)) };
                 }
                 if (autoType && !items[key]) {
                     let str = key.split(":");

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;
@@ -168,6 +170,14 @@ export declare class StreamUtil {
         tags?: TagFile;
         group?: any;
     }): Promise<{}>;
+    upsertBySlugField(fields: Array<any>, index: string, { ref, req, parent_slug, input, tags, group }?: {
+        ref?: string;
+        req?: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+        parent_slug?: string;
+        input?: {};
+        tags?: TagFile;
+        group?: any;
+    }): Promise<{}>;
     findStream(slug: string, namespace: string, { result, lang_code, field_exclude, multiple, relationship, file, image, is_lang, stream, use_param }?: {
         result?: any[];
         lang_code?: 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'];
@@ -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,7 +472,9 @@ class StreamUtil {
                     continue;
                 }
                 if (convert_option) {
+                    let obj_value = {};
                     if (item['field_type'] == "choice") {
+                        let opt_empty = false;
                         if (field_data['choice_data']) {
                             let data = [];
                             data = field_data['choice_data'].split('\n');
@@ -495,12 +497,16 @@ class StreamUtil {
                                         data[k] = { key, value };
                                     }
                                     else {
+                                        opt_empty = true;
                                         data[k] = { key: '', value };
                                     }
                                 }
                                 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 +516,23 @@ class StreamUtil {
                                 if (value && value.indexOf('lang:') > -1) {
                                     item['value'] = (0, i18n_1.__)({ phrase: value, locale: lang_code });
                                 }
+                                if (!item['key'])
+                                    opt_empty = true;
+                                if (convert_value && item['key']) {
+                                    obj_value[item['key']] = item['value'];
+                                }
                                 return item;
                             });
                         }
+                        if (field_data['default_value'] && !opt_empty && (item['field_value'] == '' || item['field_value'] == null)) {
+                            item['field_value'] = field_data['default_value'];
+                        }
+                        if (convert_value && typeof item['field_value'] != "undefined") {
+                            let field_value = item['field_value'];
+                            if (item['field_value'] == null && opt_empty)
+                                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 +577,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 +590,9 @@ class StreamUtil {
                                 }
                             }
                             item['data'] = data;
+                            if (convert_value && item['field_value']) {
+                                field_data['value'] = obj_value[item['field_value']];
+                            }
                         }
                         catch (err) { }
                     }
@@ -757,7 +783,7 @@ class StreamUtil {
                 if (id_stream && (streams && streams.length)) {
                     let file_id = [];
                     yield Promise.all(streams.map(({ field_type, field_slug, field_data }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        if (field_type == "multiple" && field_data && field_data['choose_stream']) {
+                        if (field_type == "multiple" && field_data && field_data['choose_stream'] && field_data['self_table'] != "yes") {
                             let stream = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { id: field_data['choose_stream'] }, raw: true, attributes: ['stream_slug', 'stream_prefix'] });
                             let table_f = stream['stream_prefix'] ? stream['stream_prefix'] + stream['stream_slug'] : stream['stream_slug'];
                             yield (0, db_1.remove)(this.ref, `${table}_${table_f}`, { where: { row_id: id } });
@@ -912,7 +938,14 @@ class StreamUtil {
     }
     upsertBySlug(slug, namespace, index, { ref = "", req = {}, parent_slug = "", input = {}, tags = [], group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let fields = yield this.getBuilder(slug, namespace, { index: "fields" }), where_folder = {};
+            let fields = yield this.getBuilder(slug, namespace, { index: "fields" });
+            return yield this.upsertBySlugField(fields, index, { ref, req, parent_slug, input, tags, group });
+        });
+    }
+    upsertBySlugField(fields, index, { ref = "", req = {}, parent_slug = "", input = {}, tags = [], group = undefined } = {}) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            fields = fields || [];
+            let where_folder = {};
             ref = ref || this.ref;
             let files = (req.file ? [req.file] : (req.files || [])).reduce((total, item) => Object.assign(total, { [item['fieldname']]: item }), {});
             let id_files = {}, fileUtil = new file_2.FileUtil(ref, this.option);
@@ -1636,8 +1669,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'];
             }
@@ -1897,11 +1932,13 @@ class StreamUtil {
                                 allow_type = new RegExp(/^(image.*)$/).test(file[field_slug]['mimetype']);
                                 if (!allow_type) {
                                     input[field_slug] = mime.extension(file[field_slug]['mimetype']);
+                                    input[field_slug] = input[field_slug] ? input[field_slug] : String(file[field_slug]['mimetype']).split('/')[1];
                                     field = Joi.string().valid('image/*');
                                 }
                             }
                             if (!allow_type && field_data['allowed_types']) {
                                 let extension = String(mime.extension(file[field_slug]['mimetype']));
+                                extension = extension ? extension : String(file[field_slug]['mimetype']).split('/')[1];
                                 if (!new RegExp(`^(${field_data['allowed_types']})$`).test(extension)) {
                                     input[field_slug] = extension;
                                     field = Joi.string().valid(...(field_data['allowed_types'].split('|') || []));

package/utils/user.d.ts

@@ -40,9 +40,9 @@ export declare const convertAddress: (data: any, { lang_code, transform }?: {
     lang_code?: string;
     transform?: boolean;
 }) => Promise<any>;
-export declare const getAddressIndex: (data: any, { condition, lang_code }?: {
+export declare const getAddressIndex: (data: any, { condition, where }?: {
     condition?: {};
-    lang_code?: string;
+    where?: {};
 }) => Promise<{}>;
 export declare const getCountry: (ref: string, { organ_id, lang_code, setting }?: {
     organ_id?: string;

package/utils/user.js

@@ -229,12 +229,11 @@ const convertAddress = (data, { lang_code = "en", transform = false } = {}) => t
     return data;
 });
 exports.convertAddress = convertAddress;
-const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    let result = {}, where = { lang_code: [lang_code, "en"] }, bol = false;
-    let order = [sequelize.literal(`FIELD(lang_code,${'\'' + where['lang_code'].join('\',\'') + '\''})`)];
+const getAddressIndex = (data, { condition = {}, where = {} } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let result = {}, bol = false;
     if (!bol && data['country'] && !condition['country_id']) {
         let country = yield country_1.CountryModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { country_name: data['country'] }), attributes: ['id'], order
+            raw: true, where: Object.assign(Object.assign({}, where), { country_name: data['country'] }), attributes: ['id']
         });
         if (country) {
             result['country_id'] = country['id'];
@@ -245,7 +244,7 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
     if (!bol && data['state'] && !condition['state_id']) {
         let country_id = condition['country_id'] || null;
         let state = yield state_1.StateModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { country_id, state_name: data['state'] }), attributes: ['id'], order
+            raw: true, where: Object.assign(Object.assign({}, where), { country_id, state_name: data['state'] }), attributes: ['id']
         });
         if (state) {
             result['state_id'] = state['id'];
@@ -256,7 +255,7 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
     if (!bol && data['city'] && !condition['city_id']) {
         let state_id = condition['state_id'] || null;
         let city = yield city_1.CityModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { state_id, city_name: data['city'] }), attributes: ['id'], order
+            raw: true, where: Object.assign(Object.assign({}, where), { state_id, city_name: data['city'] }), attributes: ['id']
         });
         if (city) {
             result['city_id'] = city['id'];
@@ -267,7 +266,7 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
     if (!bol && data['district']) {
         let city_id = condition['city_id'] || null;
         let district = yield district_1.DistrictModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { city_id, district_name: data['district'] }), attributes: ['id'], order
+            raw: true, where: Object.assign(Object.assign({}, where), { city_id, district_name: data['district'] }), attributes: ['id']
         });
         if (district)
             result['district_id'] = district['id'];
@@ -277,7 +276,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({
@@ -311,9 +317,12 @@ const getGroupSetting = (ref, id, { attributes = ['id', 'shared', 'setting'] } =
 exports.getGroupSetting = getGroupSetting;
 const getGroupPermission = (ref, id, module, { permission = {}, group_shared = undefined, organ_id = 0, attributes = ['id', 'shared', 'setting'] } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     if (typeof group_shared == "undefined") {
-        let setting = yield (0, exports.getGroupSetting)(ref, id, { attributes });
-        if (setting)
-            group_shared = setting['shared'];
+        let group = yield (0, exports.getGroupSetting)(ref, id, { attributes });
+        if (group) {
+            permission['group_setting'] = group['setting'] || {};
+            permission['admin'] = group['shared'];
+            group_shared = group['shared'];
+        }
     }
     if (typeof group_shared != "undefined" && group_shared == 0) {
         let query = yield group_permission_1.UserGroupPermissionModel.schema(ref, "_").findOne({

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");
@@ -105,7 +105,7 @@ const fileService = (setup, { userfiles = false, required = false, fileSize = 0,
     let option = setup(validate);
     let upload = userfiles ? option.array("userfiles", maxCount) : option.any();
     return upload(req, res, (err) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        return (0, exports.validateService)(Joi.object().keys({ tags: Joi.array().allow('', null).items(Joi.object().keys({ slug: Joi.string(), type: Joi.string() })) }).unknown())(req, res, () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        return (0, exports.validateService)(Joi.object().keys({ tags: Joi.array().allow('', null).items(Joi.object().keys({ slug: Joi.string(), type: Joi.string() })) }).unknown(), { field_omit: [] })(req, res, () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
             try {
                 let field = userfiles ? "userfiles" : undefined;
                 if (err) {
@@ -180,7 +180,7 @@ const multiService = ({ field = undefined, record = undefined, record_addition =
         schema['field'] = Joi.string().valid(...field);
         schema['value'] = value_schema;
     }
-    return (0, exports.validateService)(Joi.object().keys(Object.assign(Object.assign({}, schema), { records: Joi.array().items(Joi.object().keys(Object.assign({ id: Joi.number().required() }, record)).options({ stripUnknown: true })).min(1).required() })).options({ stripUnknown: true }));
+    return (0, exports.validateService)(Joi.object().keys(Object.assign(Object.assign({}, schema), { records: Joi.array().items(Joi.object().keys(Object.assign({ id: Joi.number().required() }, record)).options({ stripUnknown: true })).min(1).required() })).options({ stripUnknown: true }), { field_omit: [] });
 };
 exports.multiService = multiService;
 const streamService = ({ slug = "", name_space = "", param = "index" } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
@@ -207,7 +207,7 @@ const streamService = ({ slug = "", name_space = "", param = "index" } = {}) =>
 });
 exports.streamService = streamService;
 const importService = ({ import_type = [], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    return (0, exports.validateService)(Joi.object().keys(Object.assign({ import_type: Joi.string().valid(...import_type) }, schema)).unknown())(req, res, next);
+    return (0, exports.validateService)(Joi.object().keys(Object.assign({ import_type: Joi.string().valid(...import_type) }, schema)).unknown(), { field_omit: [] })(req, res, next);
 });
 exports.importService = importService;
 const exportService = ({ file_type = undefined, export_type = [], limit = 200, schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
@@ -240,8 +240,9 @@ const exportService = ({ file_type = undefined, export_type = [], limit = 200, s
 });
 exports.exportService = exportService;
 const printService = ({ print_type = [], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let config = res.locals.config || {};
     if (req.query.ids) {
-        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { ids: String(req.query.ids).split(',') });
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { ids: String(req.query.ids).split(',').slice(0, (config['maxQueryIds'] || 25)) });
     }
     if (print_type && !req.query.print_type) {
         req.query.print_type = print_type[0];
@@ -261,8 +262,9 @@ const printService = ({ print_type = [], schema = {} } = {}) => (req, res, next)
 });
 exports.printService = printService;
 const dataService = ({ schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let config = res.locals.config || {};
     if (req.query.ids) {
-        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { ids: String(req.query.ids).split(',') });
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { ids: String(req.query.ids).split(',').slice(0, (config['maxQueryIds'] || 25)) });
     }
     let option = Object.keys(schema || {});
     if (option.length) {
@@ -288,9 +290,23 @@ const fieldService = ({ field = [], schema = {} } = {}) => (req, res, next) => t
 });
 exports.fieldService = fieldService;
 const convertService = ({ convert_type = [], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    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);
+    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(), { field_omit: [] })(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(), { field_omit: [] })(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());