@digione/node-custom-api 0.1.4 → 0.1.6-beta1

package/package.json

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

package/utils/stream.js

@@ -572,6 +572,11 @@ class StreamUtil {
                             field_data['code']['field_value'] = default_value[field_data['code']['field_target']] || field_data['code']['field_value'];
                         }
                     }
+                    else if (item['field_type'] == "map") {
+                        if (field_data['range'] && field_data['range']['field_target']) {
+                            field_data['range']['field_value'] = default_value[field_data['range']['field_target']];
+                        }
+                    }
                 }
                 fields.push(Object.assign(Object.assign({}, item), { field_data }));
             }
@@ -1468,7 +1473,7 @@ class StreamUtil {
                     opt['defaultValue'] = field_data['default_value'];
                 }
                 if (changeTable) {
-                    let fields = [];
+                    let fields = [], range = {};
                     switch (field['field_type']) {
                         case (field['is_lang'] == "yes" ? field['field_type'] : ""):
                             opt['defaultValue'] = undefined;
@@ -1510,7 +1515,7 @@ class StreamUtil {
                             break;
                         case "datetime":
                             fields = [field_slug];
-                            let range = field_data['range'] || {};
+                            range = field_data['range'] || {};
                             if (range['field_target']) {
                                 fields.push(range['field_target']);
                             }
@@ -1560,6 +1565,16 @@ class StreamUtil {
                             opt['defaultValue'] = _.isNumber(opt['defaultValue']) ? opt['defaultValue'] : undefined;
                             yield (0, db_1.addColumn)(`${this.ref}_${table}`, field_slug, Object.assign({ type: sequelize.INTEGER({ length: 11 }) }, opt));
                             break;
+                        case "map":
+                            fields = [field_slug];
+                            range = field_data['range'] || {};
+                            if (range['field_target']) {
+                                fields.push(range['field_target']);
+                            }
+                            for (let field_slug of fields) {
+                                yield (0, db_1.addColumn)(`${this.ref}_${table}`, field_slug, Object.assign({ type: sequelize.STRING(20) }, opt));
+                            }
+                            break;
                     }
                 }
             }
@@ -1711,8 +1726,15 @@ class StreamUtil {
             case "multiple":
                 field_data = _.pick(field_data, ['choose_stream', 'skip_data', 'self_table', 'regex']);
                 break;
+            case "map":
+                if (field_data['range.field_target']) {
+                    let result = dottie.transform(field_data);
+                    field_data['range'] = result['range'];
+                }
+                field_data = _.pick(field_data, ['range']);
+                break;
             default:
-                field_data = null;
+                field_data = {};
                 break;
         }
         return field_data;
@@ -1843,6 +1865,15 @@ class StreamUtil {
                             field = Joi.alternatives(Joi.number(), field);
                         }
                         break;
+                    case "map":
+                        field = Joi.string();
+                        if (!is_required)
+                            field = field.allow(null, '');
+                        if (field_data['range'] && field_data['range']['field_target']) {
+                            schema[field_data['range']['field_target']] = field.regex(/^(\+|-)?(?:180(?:(?:\.0{1,6})?)|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:(?:\.[0-9]{1,6})?))$/).messages({ 'string.pattern.base': `${field_slug} invalid format` });
+                        }
+                        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;
                 }
                 field = field || Joi.any();
                 if (is_required)

package/utils/validator.d.ts

@@ -12,11 +12,12 @@ export declare const validate: (schema: Joi.AnySchema, body?: any, { arrayIndex,
     arrayIndex?: boolean;
     prefixMessage?: string;
 }) => Promise<any>;
-export declare const validateService: (schema: Joi.ObjectSchema, { organ_id, created_by, web_id, purgeUpdate }?: {
+export declare const validateService: (schema: Joi.ObjectSchema, { organ_id, created_by, web_id, purgeUpdate, field_omit }?: {
     organ_id?: boolean;
     created_by?: boolean;
     web_id?: boolean;
     purgeUpdate?: boolean;
+    field_omit?: string[];
 }) => (req: any, res: any, next: any) => Promise<any>;
 export declare const paramService: (schema: Joi.AnySchema) => (req: any, res: any, next: any) => Promise<any>;
 export declare const fileService: (setup: any, { userfiles, required, fileSize, fileTypes, maxCount, qualityImage, resizeImage }?: OptionFile) => (req: any, res: any, next: any) => any;

package/utils/validator.js

@@ -40,7 +40,7 @@ const validate = (schema, body = {}, { arrayIndex = false, prefixMessage = "" }
     return result.value;
 });
 exports.validate = validate;
-const validateService = (schema, { organ_id = true, created_by = true, web_id = true, purgeUpdate = true } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const validateService = (schema, { organ_id = true, created_by = true, web_id = true, purgeUpdate = true, field_omit = ["id"] } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     if (created_by) {
         const token = req.headers['authorization'] ? req.headers['authorization'].split(' ')[1] : null;
         if (token && !res.locals.user_id) {
@@ -70,6 +70,9 @@ const validateService = (schema, { organ_id = true, created_by = true, web_id =
     if (web_id && res.locals.web_id) {
         req.body['web_id'] = res.locals.web_id;
     }
+    if (field_omit && field_omit.length) {
+        req.body = _.omit(req.body, field_omit);
+    }
     try {
         req.body = yield (0, exports.validate)(schema, req.body);
     }
@@ -228,6 +231,11 @@ const exportService = ({ file_type = undefined, export_type = [], limit = 200, s
     if (req.query.export_type) {
         res.locals.option['export_type'] = req.query.export_type;
     }
+    let option = Object.keys(schema || {});
+    if (option.length) {
+        let value = _.pick(req.query, option);
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), value);
+    }
     return (0, exports.paramService)(Joi.object().keys(Object.assign({ all_data: Joi.number().allow(null, ''), export_type: Joi.string().valid(...export_type), limit: Joi.number().max(limit) }, schema)).unknown())(req, res, next);
 });
 exports.exportService = exportService;
@@ -244,6 +252,11 @@ const printService = ({ print_type = [], schema = {} } = {}) => (req, res, next)
     if (req.query.preset) {
         res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { preset: req.query.preset });
     }
+    let option = Object.keys(schema || {});
+    if (option.length) {
+        let value = _.pick(req.query, option);
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), value);
+    }
     return (0, exports.paramService)(Joi.object().keys(Object.assign({ ids: Joi.string().required(), print_type: Joi.string().valid(...print_type), preset: Joi.string() }, schema)).unknown())(req, res, next);
 });
 exports.printService = printService;
@@ -251,6 +264,11 @@ const dataService = ({ schema = {} } = {}) => (req, res, next) => tslib_1.__awai
     if (req.query.ids) {
         res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { ids: String(req.query.ids).split(',') });
     }
+    let option = Object.keys(schema || {});
+    if (option.length) {
+        let value = _.pick(req.query, option);
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), value);
+    }
     return (0, exports.paramService)(Joi.object().keys(Object.assign({ ids: Joi.string().required(), preset: Joi.string() }, schema)).unknown())(req, res, next);
 });
 exports.dataService = dataService;
@@ -261,6 +279,11 @@ const fieldService = ({ field = [], schema = {} } = {}) => (req, res, next) => t
     if (req.query.field) {
         res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { field: req.query.field });
     }
+    let option = Object.keys(schema || {});
+    if (option.length) {
+        let value = _.pick(req.query, option);
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), value);
+    }
     return (0, exports.paramService)(Joi.object().keys(Object.assign({ field: Joi.string().valid(...field) }, schema)).unknown())(req, res, next);
 });
 exports.fieldService = fieldService;