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

package/package.json

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

package/utils/stream.js

@@ -743,7 +743,7 @@ class StreamUtil {
             if (!Object.keys(data).length) {
                 return Promise.reject(errors_1.generalError.BAD_REQUEST);
             }
-            if (req.files) {
+            if (req && req.files) {
                 files = _.reduce(req.files, (total, item) => {
                     total[item['fieldname']] = item;
                     return total;
@@ -1742,7 +1742,7 @@ class StreamUtil {
     getValidator(streams, { schema = {}, input = {}, req = {}, isNew = false, lang = [], required = true, stripUnknown = false } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let field_lang = [];
-            let file = (req.file ? [req.file] : [].concat(req.files || [])).reduce((total, item) => Object.assign(total, { [item['fieldname']]: item }), {});
+            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 }) => {
                 let field;
                 field_data = field_data || {};

package/utils/validator.d.ts

@@ -53,5 +53,9 @@ export declare const fieldService: ({ field, schema }?: {
     field?: any[];
     schema?: {};
 }) => (req: any, res: any, next: any) => Promise<any>;
+export declare const convertService: ({ convert_type, schema }?: {
+    convert_type?: any[];
+    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.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.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");
@@ -231,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;
@@ -247,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;
@@ -254,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;
@@ -264,9 +279,18 @@ 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;
+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);
+});
+exports.convertService = convertService;
 exports.createdByValidate = (0, exports.validateService)(Joi.object().keys({
     created_by: Joi.alternatives().try(Joi.string(), Joi.number()).required()
 }).unknown());