@digione/node-custom-api 0.2.0-beta4 → 0.2.0-beta6

package/middlewares/paramQuery.d.ts

@@ -1,9 +1,9 @@
 import { Request, Response } from 'express';
 export declare const getAuthParam: (req: Request, res: Response, next: any) => void;
 export declare const getStremParam: (req: Request, res: Response, next: any) => void;
-export declare const getQueryParam: (req: Request, res: Response, next: any) => void;
+export declare const getQueryParam: (req: Request, res: Response, next: any) => Promise<void | Response<any, Record<string, any>>>;
 export declare const getQueryParamCUD: (req: Request, res: Response, next: any) => void;
-export declare const getQueryParamFile: (req: Request, res: Response, next: any) => void;
+export declare const getQueryParamFile: (req: Request, res: Response, next: any) => Promise<void | Response<any, Record<string, any>>>;
 export declare const changeQueryParam: (value?: {}, { skipSystem }?: {
     skipSystem?: boolean;
 }) => (req: Request, res: Response, next: any) => any;

package/middlewares/paramQuery.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeConfigParam = exports.changeBodyParam = exports.changeOptionParam = exports.changeQueryParam = exports.getQueryParamFile = exports.getQueryParamCUD = exports.getQueryParam = exports.getStremParam = exports.getAuthParam = void 0;
+const tslib_1 = require("tslib");
 const helper_1 = require("../utils/helper");
+const errors_1 = require("../errors");
 const _ = require("lodash");
 const getAuthParam = (req, res, next) => {
     res.locals.option['hostname'] = ((0, helper_1.getENV)('NODE_ENV') == 'development' ? 'http' : 'https') + '://' + req.get('host');
@@ -77,7 +79,8 @@ const getStremParam = (req, res, next) => {
     });
 };
 exports.getStremParam = getStremParam;
-const getQueryParam = (req, res, next) => {
+const getQueryParam = (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let config = res.locals.config || {};
     res.locals.option = res.locals.option || {};
     res.locals.option['lang_code'] = 'en';
     res.locals.option['currency'] = 'thb';
@@ -93,8 +96,20 @@ const getQueryParam = (req, res, next) => {
     else {
         res.locals.include = {};
     }
+    if (config['maxQueryLimit']) {
+        req.query.limit = req.query.limit || config['maxQueryLimit'];
+    }
     if (req.query.limit) {
         res.locals.option['limit'] = Number(req.query.limit);
+        if (config['maxQueryLimit'] && res.locals.option['limit'] > config['maxQueryLimit']) {
+            try {
+                yield (0, errors_1.paramError)(`"limit" must be less than or equal to ${config['maxQueryLimit']}`, { field: "limit" });
+            }
+            catch (err) {
+                let error = new errors_1.CustomError(err);
+                return res.status(error.code).send(error);
+            }
+        }
     }
     if (req.query.offset) {
         res.locals.option['offset'] = Number(req.query.offset);
@@ -124,7 +139,7 @@ const getQueryParam = (req, res, next) => {
         }
         return next();
     });
-};
+});
 exports.getQueryParam = getQueryParam;
 const getQueryParamCUD = (req, res, next) => {
     let config = res.locals.config || {};

package/package.json

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

package/utils/stream.d.ts

@@ -76,13 +76,14 @@ export declare class StreamUtil {
         include?: any;
         include_only?: boolean;
     }): any;
-    buildStream(slug: string, namespace: string, { query, builder, fetch, label, attribute, attributes, field_exclude, include, include_all }?: {
+    buildStream(slug: string, namespace: string, { query, builder, fetch, label, attribute, attributes, field_option, field_exclude, include, include_all }?: {
         query?: boolean;
         builder?: boolean;
         fetch?: boolean;
         label?: boolean;
         attribute?: boolean;
         attributes?: any;
+        field_option?: {};
         field_exclude?: any[];
         include?: {};
         include_all?: boolean;
@@ -92,10 +93,11 @@ export declare class StreamUtil {
         fetchFn: any;
         attributes: any;
     }>;
-    getBuilder(slug: string, namespace: string, { query, index, builder, field_exclude }?: {
+    getBuilder(slug: string, namespace: string, { query, index, builder, field_option, field_exclude }?: {
         query?: boolean;
         index?: string;
         builder?: boolean;
+        field_option?: {};
         field_exclude?: any[];
     }): Promise<any>;
     getValue(slug: string, namespace: string, value: any, { query, transform, spread, spread_all, raw, lang_code }?: {
@@ -305,7 +307,7 @@ export declare class StreamUtil {
         stripUnknown?: boolean;
         builder?: boolean;
     }): Promise<Joi.ObjectSchema<any>>;
-    validate(slug: string, namespace: string, input: any, { req, isNew, default_value, lang, stripUnknown, inputLang, inputLangSeparate, prefixMessage, builder, field_exclude }?: {
+    validate(slug: string, namespace: string, input: any, { req, isNew, default_value, lang, stripUnknown, inputLang, inputLangSeparate, prefixMessage, builder, field_option, field_exclude }?: {
         req?: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
         isNew?: boolean;
         default_value?: {};
@@ -315,6 +317,7 @@ export declare class StreamUtil {
         inputLangSeparate?: boolean;
         prefixMessage?: string;
         builder?: boolean;
+        field_option?: {};
         field_exclude?: any[];
     }): Promise<any>;
     validateByField(streams: Array<any>, input: any, { req, isNew, default_value, lang, stripUnknown, inputLang, inputLangSeparate, prefixMessage }?: {

package/utils/stream.js

@@ -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']);
             }
@@ -312,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;
         });
     }
@@ -685,7 +685,7 @@ class StreamUtil {
                         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'], { field_only: true, convert_option: true });
+                                item['stream'] = yield this.findField(stream['stream_slug'], stream['stream_namespace'], { option, lang_code, field_only: true, convert_option: true });
                             }
                         }
                     }
@@ -2056,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/validator.js

@@ -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(), { field_omit: [] })(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) {