@digione/node-custom-api 0.1.9-beta12 → 0.1.9-beta14

package/package.json

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

package/utils/user.js

@@ -317,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.js

@@ -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* () {
@@ -288,11 +288,11 @@ 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())(req, res, next);
+    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* () {