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

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'];
@@ -235,13 +235,13 @@ class StreamUtil {
         }
         return data;
     }
-    buildStream(slug, namespace, { query = true, builder = true, fetch = false, label = false, attribute = false, attributes = null, field_exclude = [], include = {}, include_all = false } = {}) {
+    buildStream(slug, namespace, { query = true, builder = true, fetch = false, label = false, attribute = false, attributes = null, field_option = {}, field_exclude = [], include = {}, include_all = false } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let build = this.builder[slug + "_" + namespace] || { stream: null, fields: null, fetchFn: [], attributes: null };
             if (!build['fields']) {
                 let data = {};
                 if (query)
-                    data = yield this.findField(slug, namespace, { field_only: false, convert_option: true, field_exclude });
+                    data = yield this.findField(slug, namespace, { field_only: false, convert_option: true, field_option, field_exclude });
                 build['fields'] = data['fields'] || [];
                 build['stream'] = _.omit(data, ['fields']);
             }
@@ -255,7 +255,7 @@ class StreamUtil {
                         delete attributes[field['field_slug']];
                     }
                     if (fetch) {
-                        if (field['is_lang'] == "yes") {
+                        if (field['is_lang'] == "yes" && field['field_type'] != "stream") {
                             label && fetchLabel.push(field);
                             fetchFn.push((0, helper_2.getValueFunctionLang)(field['field_slug']));
                         }
@@ -286,6 +286,15 @@ class StreamUtil {
                                         }
                                     }
                                     break;
+                                case "stream":
+                                    if (include[field['field_slug']] || include_all) {
+                                        label && fetchLabel.push(field);
+                                        fetchFn.push((field['is_lang'] == "yes") ? (0, helper_2.getValueFunctionLang)(field['field_slug'], { field_type: field['field_type'] }) : (0, helper_2.getValueFunctionArray)(field['field_slug']));
+                                    }
+                                    else {
+                                        delete attributes[field['field_slug']];
+                                    }
+                                    break;
                             }
                         }
                     }
@@ -303,9 +312,9 @@ class StreamUtil {
             return build;
         });
     }
-    getBuilder(slug, namespace, { query = true, index = "", builder = true, field_exclude = [] } = {}) {
+    getBuilder(slug, namespace, { query = true, index = "", builder = true, field_option = {}, field_exclude = [] } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let result = yield this.buildStream(slug, namespace, { query, builder, field_exclude });
+            let result = yield this.buildStream(slug, namespace, { query, builder, field_option, field_exclude });
             return index ? result[index] : result;
         });
     }
@@ -347,7 +356,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'] || {};
@@ -404,6 +413,15 @@ class StreamUtil {
                 else if (typeof default_value[item['field_slug']] !== 'undefined') {
                     item['field_value'] = default_value[item['field_slug']];
                 }
+                if (item['field_type'] == "stream" && item['field_value']) {
+                    try {
+                        item['field_value'] = JSON.parse(item['field_value']);
+                    }
+                    catch (err) { }
+                    if (!(item['field_value'] instanceof Array)) {
+                        item['field_value'] = [];
+                    }
+                }
                 if (item['instructions']) {
                     (0, helper_2.getValueFunctionLang)('instructions')(item, { result: item, lang_code });
                 }
@@ -468,11 +486,15 @@ class StreamUtil {
                         }
                         return Object.assign({ field_slug: i['lang_code'], field_name: `${convert_option ? (0, i18n_1.__)({ phrase: item['field_name'], locale: lang_code }) : item['field_name']} (${i['lang_code']})`, field_type: item['field_type'], field_name_raw: item['field_name'] ? item['field_name'] : "", is_required: item['is_required'] }, include);
                     });
-                    fields.push(Object.assign(Object.assign({}, item), { field_data }));
-                    continue;
+                    if (item['field_type'] != "stream") {
+                        fields.push(Object.assign(Object.assign({}, item), { field_data }));
+                        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 +517,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 +536,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 +597,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 +610,9 @@ class StreamUtil {
                                 }
                             }
                             item['data'] = data;
+                            if (convert_value && item['field_value']) {
+                                field_data['value'] = obj_value[item['field_value']];
+                            }
                         }
                         catch (err) { }
                     }
@@ -635,6 +681,14 @@ class StreamUtil {
                             field_data['range']['field_value'] = default_value[field_data['range']['field_target']];
                         }
                     }
+                    else if (item['field_type'] == "stream") {
+                        if (field_data['choose_stream']) {
+                            let stream = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { id: field_data['choose_stream'] }, raw: true, attributes: ['stream_slug', 'stream_namespace'] });
+                            if (stream) {
+                                item['stream'] = yield this.findField(stream['stream_slug'], stream['stream_namespace'], { option, lang_code, field_only: true, convert_option: true });
+                            }
+                        }
+                    }
                 }
                 fields.push(Object.assign(Object.assign({}, item), { field_data }));
             }
@@ -757,7 +811,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 } });
@@ -787,7 +841,7 @@ class StreamUtil {
             stream = stream || {};
             let id_stream = stream['id'], stream_prefix = stream['stream_prefix'];
             if (fields && fields.length) {
-                fields = fields.filter(({ is_lang, field_type, field_data }) => field_type && (is_lang == "yes" || (field_type == "multiple" && field_data['self_table'] != "yes") || field_type == "image" || field_type == "file" || field_data['field_type'] == "encrypt"));
+                fields = fields.filter(({ is_lang, field_type, field_data }) => field_type && (is_lang == "yes" || (field_type == "multiple" && field_data['self_table'] != "yes") || field_type == "image" || field_type == "file" || field_data['field_type'] == "encrypt" || field_type == "stream"));
             }
             if (!Object.keys(raw_input).length) {
                 raw_input = input;
@@ -867,6 +921,9 @@ class StreamUtil {
                     else if (field_type == "multiple") {
                         fields_post.push(fields[index]);
                     }
+                    else if (field_type == "stream" && input[field_slug]) {
+                        data[field_slug] = JSON.stringify(input[field_slug]);
+                    }
                 })));
             }
             if (id) {
@@ -912,7 +969,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);
@@ -923,8 +987,8 @@ class StreamUtil {
             }
             let folder = yield fileUtil.createFolder(index, { parent_id: where_folder['parent_id'] });
             let where_file = { folder_id: folder['id'], is_hidden: "yes" };
-            where_file = fileUtil.beforeFindFile(where_file, { tags, group });
-            let query = yield file_1.FileModel.schema(ref, "_").findAll({ where: where_file, attributes: ['id', 'name'], raw: true });
+            let option_file = fileUtil.beforeFindFile(where_file, { tags, group, verify: true });
+            let query = yield file_1.FileModel.schema(ref, "_").findAll({ where: option_file.where, attributes: ['id', 'name'], raw: true });
             id_files = query.reduce((total, item) => Object.assign(total, { [item['name']]: item['id'] }), {});
             let input_files = [];
             yield Promise.all(fields.map(({ field_type, field_slug, field_data }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -1633,11 +1697,19 @@ class StreamUtil {
                                 yield (0, db_1.addColumn)(`${this.ref}_${table}`, field_slug, Object.assign({ type: sequelize.STRING(20) }, opt));
                             }
                             break;
+                        case "stream":
+                            if (field_data['self_table'] == "yes") {
+                                opt['defaultValue'] = undefined;
+                                yield (0, db_1.addColumn)(`${this.ref}_${table}`, field_slug, Object.assign({ type: sequelize.TEXT('long') }, opt));
+                            }
+                            break;
                     }
                 }
             }
-            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'];
             }
@@ -1791,6 +1863,9 @@ class StreamUtil {
                 }
                 field_data = _.pick(field_data, ['range']);
                 break;
+            case "stream":
+                field_data = _.pick(field_data, ['choose_stream', 'self_table']);
+                break;
             default:
                 field_data = {};
                 break;
@@ -1801,7 +1876,8 @@ class StreamUtil {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let field_lang = [];
             let file = req ? ((req.file ? [req.file] : [].concat(req.files || [])).reduce((total, item) => Object.assign(total, { [item['fieldname']]: item }), {})) : {};
-            streams.forEach(({ field_type, field_slug, is_required, is_lang, field_data, data }) => {
+            for (let val of streams) {
+                let { field_type, field_slug, is_required, is_lang, field_data, data } = val;
                 let field;
                 field_data = field_data || {};
                 is_required = (is_required == "yes" && (isNew || (!input[field_slug] && typeof input[field_slug] != "undefined")));
@@ -1897,11 +1973,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('|') || []));
@@ -1932,6 +2010,18 @@ class StreamUtil {
                         }
                         field = field.regex(/^(\+|-)?(?:90(?:(?:\.0{1,6})?)|(?:[0-9]|[1-8][0-9])(?:(?:\.[0-9]{1,6})?))$/).messages({ 'string.pattern.base': `${field_slug} invalid format` });
                         break;
+                    case "stream":
+                        if (field_data['choose_stream']) {
+                            let stream = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { id: field_data['choose_stream'] }, raw: true, attributes: ['stream_slug', 'stream_namespace'] });
+                            if (stream) {
+                                let streams = yield this.findField(stream['stream_slug'], stream['stream_namespace'], { field_only: true, convert_option: true });
+                                let validator = yield this.getValidator(streams, { isNew: true, required: is_required, lang, stripUnknown: true });
+                                field = Joi.array().items(validator);
+                            }
+                        }
+                        field = field || Joi.array();
+                        field = is_required ? field.required().min(1) : field.allow(null);
+                        break;
                 }
                 field = field || Joi.any();
                 if (is_required)
@@ -1939,12 +2029,12 @@ class StreamUtil {
                 if (is_lang == "yes") {
                     if (!lang.length) {
                         field_lang.push({ field_slug, field });
-                        return;
+                        continue;
                     }
                     field = Joi.object().keys(lang.reduce((total, i) => Object.assign(total, { [i['lang_code']]: field }), {}));
                 }
                 schema[field_slug] = field;
-            });
+            }
             if (field_lang.length) {
                 lang = yield this.languageUtil.getLangsLive();
                 for (let item of field_lang) {
@@ -1966,9 +2056,9 @@ class StreamUtil {
             return yield this.getValidator(streams, { req, isNew, required, lang, stripUnknown });
         });
     }
-    validate(slug, namespace, input, { req = {}, isNew = false, default_value = {}, lang = [], stripUnknown = false, inputLang = false, inputLangSeparate = true, prefixMessage = "", builder = true, field_exclude = [] } = {}) {
+    validate(slug, namespace, input, { req = {}, isNew = false, default_value = {}, lang = [], stripUnknown = false, inputLang = false, inputLangSeparate = true, prefixMessage = "", builder = true, field_option = {}, field_exclude = [] } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let streams = yield this.getBuilder(slug, namespace, { index: "fields", builder, field_exclude });
+            let streams = yield this.getBuilder(slug, namespace, { index: "fields", builder, field_option, field_exclude });
             return this.validateByField(streams, input, { req, isNew, default_value, lang, stripUnknown, inputLang, inputLangSeparate, prefixMessage });
         });
     }

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");
@@ -104,8 +104,9 @@ const fileService = (setup, { userfiles = false, required = false, fileSize = 0,
     }
     let option = setup(validate);
     let upload = userfiles ? option.array("userfiles", maxCount) : option.any();
+    let schema = userfiles ? { tags: Joi.array().allow('', null).items(Joi.object().keys({ slug: Joi.string(), type: Joi.string() })) } : { tags: Joi.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(schema).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 +181,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 +208,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 +241,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 +263,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 +291,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());