@digione/node-custom-api 0.2.0-beta5 → 0.2.0-beta8

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-beta5",
+  "version": "0.2.0-beta8",
   "description": "Typescript node digione-api",
   "author": "Monchai Jirayupong <monchai.j@seven.co.th>",
   "license": "MIT",
@@ -29,6 +29,7 @@
     "moment": "2.30.1",
     "multer": "1.4.5-lts.1",
     "mysql2": "3.9.1",
+    "nanoid": "5.1.6",
     "numeral": "2.0.6",
     "php-serialize": "4.1.1",
     "raven": "2.6.4",

package/utils/file.d.ts

@@ -89,6 +89,12 @@ export declare class FileUtil {
         tags?: TagFile;
         group?: any;
     }): Promise<any[]>;
+    countFileByFolder(slug: string, { where, parent_folder, tags, group }?: {
+        where?: {};
+        parent_folder?: string;
+        tags?: any[];
+        group?: any;
+    }): Promise<number>;
     findAndCountAllFileByFolder(slug: string, { where, file_link, parent_folder, limit, offset, tag, tags, group }?: {
         where?: {};
         file_link?: boolean;

package/utils/file.js

@@ -14,7 +14,6 @@ const aws = require("aws-sdk");
 const jimp = require("jimp/dist");
 const mime = require("mime-types");
 const _ = require("lodash");
-const uuid_1 = require("uuid");
 const path = require("path");
 const fs = require("fs");
 const getBuffer = (image, { mimetype = "" } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
@@ -373,6 +372,33 @@ class FileUtil {
             }
         });
     }
+    countFileByFolder(slug, { where = {}, parent_folder = "", tags = [], group = null } = {}) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let include_folder = [];
+            if (parent_folder) {
+                where['$`f->p`.slug$'] = parent_folder;
+                include_folder.push({
+                    required: true, attributes: [],
+                    model: folder_1.FolderModel.schema(this.ref, "_"),
+                    association: new sequelize_1.BelongsTo(folder_1.FolderModel, folder_1.FolderModel, { as: "p", foreignKey: "parent_id", constraints: false })
+                });
+            }
+            where['$f.slug$'] = slug;
+            where['is_hidden'] = where['is_hidden'] || "no";
+            let option = this.beforeFindFile(where, { tags, group, verify: true });
+            return yield file_1.FileModel.schema(this.ref, "_").count({
+                where: option.where,
+                include: [
+                    {
+                        required: true, attributes: [],
+                        model: folder_1.FolderModel.schema(this.ref, "_"),
+                        association: new sequelize_1.BelongsTo(file_1.FileModel, folder_1.FolderModel, { as: "f", foreignKey: "folder_id", constraints: false }),
+                        include: include_folder
+                    }
+                ]
+            });
+        });
+    }
     findAndCountAllFileByFolder(slug, { where = {}, file_link = false, parent_folder = "", limit = undefined, offset = undefined, tag = {}, tags = [], group = null } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let where_folder = {};
@@ -583,7 +609,7 @@ class FileUtil {
             try {
                 let result = yield Promise.all(files.map((file, key) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     folder_id = reqs[key].folder ? reqs[key].folder : folder_id;
-                    let id = (0, uuid_1.v4)().replace(/-/gi, '').substring(0, 15);
+                    let id = (0, helper_1.getFileId)();
                     let organ_id = this.option.organ_id;
                     let organ_by = this.option.parent_organ_id;
                     let sort = (0, helper_1.getDateTime)().format(formatDateTime);
@@ -649,7 +675,7 @@ class FileUtil {
             }
             catch (err) {
                 if (err.errors && err.errors[0].validatorKey == "not_unique") {
-                    results = results.map(item => (Object.assign(Object.assign({}, item), { id: (0, uuid_1.v4)().replace(/-/gi, '').substring(0, 15) })));
+                    results = results.map(item => (Object.assign(Object.assign({}, item), { id: (0, helper_1.getFileId)() })));
                     return yield this.insertFileUnique(results, { format, thumb, width, height });
                 }
                 return Promise.reject(errors_1.generalError.BAD_REQUEST);

package/utils/helper.d.ts

@@ -17,6 +17,7 @@ export declare const getENVIndex: (index: string, { prefix, force }?: {
     force?: boolean;
 }) => string;
 export declare const getSlug: (length?: number) => string;
+export declare const getFileId: () => string;
 export declare const getDateMysql: (date?: any) => any;
 export declare const getTimestampMysql: (date?: any) => number;
 export declare const getDateTime: (time?: any, { utc }?: {

package/utils/helper.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertCurrency = exports.xorMerge = exports.xorDecode = exports.xorEncode = exports.getInstanceNumber = exports.getDomain = exports.getParent = exports.replaceColon = exports.stripEmoji = exports.stripHtml = exports.slugifyField = exports.slugify = exports.convertToBigEndian = exports.expandTree = exports.buildTree = exports.treeToArray = exports.randomRef = exports.multiExecArray = exports.isBase64 = exports.isNumber = exports.removeAt = exports.removeSpace = exports.formatMobileNumber = exports.getMobileNumber = exports.removeHyphen = exports.signToken = exports.getTokenDataFromTokenBySecret = exports.getUUID32 = exports.getUUID = exports.sleep = exports.getValueByLang = exports.getValueFunctionLang = exports.getValueFunctionArray = exports.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getSlug = exports.getENVIndex = exports.getENV = exports.Joi_date = exports.getDaysBetweenDates = exports.getDateFromString = exports.getDateRangeFormat = void 0;
+exports.convertCurrency = exports.xorMerge = exports.xorDecode = exports.xorEncode = exports.getInstanceNumber = exports.getDomain = exports.getParent = exports.replaceColon = exports.stripEmoji = exports.stripHtml = exports.slugifyField = exports.slugify = exports.convertToBigEndian = exports.expandTree = exports.buildTree = exports.treeToArray = exports.randomRef = exports.multiExecArray = exports.isBase64 = exports.isNumber = exports.removeAt = exports.removeSpace = exports.formatMobileNumber = exports.getMobileNumber = exports.removeHyphen = exports.signToken = exports.getTokenDataFromTokenBySecret = exports.getUUID32 = exports.getUUID = exports.sleep = exports.getValueByLang = exports.getValueFunctionLang = exports.getValueFunctionArray = exports.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getFileId = exports.getSlug = exports.getENVIndex = exports.getENV = exports.Joi_date = exports.getDaysBetweenDates = exports.getDateFromString = exports.getDateRangeFormat = void 0;
 const tslib_1 = require("tslib");
 const crypto = require("crypto");
 const dotenv = require("dotenv");
 const moment = require("moment");
 const uuid_1 = require("uuid");
 const short_unique_id_1 = require("short-unique-id");
+const nanoid_1 = require("nanoid");
 const jwt = require("jsonwebtoken");
 const Joi = require("joi");
 const date_1 = require("@joi/date");
@@ -68,6 +69,12 @@ const getSlug = (length = 8) => {
     return new short_unique_id_1.default().randomUUID(length);
 };
 exports.getSlug = getSlug;
+const getFileId = () => {
+    const alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+    const nanoid = (0, nanoid_1.customAlphabet)(alphabet, 15);
+    return nanoid();
+};
+exports.getFileId = getFileId;
 const getDateMysql = (date = undefined) => {
     try {
         return (0, exports.getDateTime)(date).format("YYYY-MM-DD HH:mm:ss");

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;
         });
     }
@@ -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 });
         });
     }