@digione/node-custom-api 0.1.9-alpha10 → 0.1.9-alpha13

package/package.json

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

package/utils/db.js

@@ -32,12 +32,12 @@ const getWhereVal = (smth) => {
     return [key, value].join(` ${smth.comparator} `);
 };
 const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket = false } = {}) => {
-    as = as ? "`" + as + "`" + delimiter : as;
+    let keyPrefix = as ? "`" + as + "`" + delimiter : as;
     let symbolKeys = Object.getOwnPropertySymbols(where);
     let rawWhere = (Object.keys(where).concat(symbolKeys)).reduce((result, key) => {
         let value = where[key];
         if (typeof value !== 'undefined') {
-            key = typeof (value) == "string" ? `${as}${key}` : key;
+            key = typeof (key) == "string" ? keyPrefix + "`" + key + "`" : key;
             if (typeof (value) == "string") {
                 value = SqlString.escape(value);
             }
@@ -48,7 +48,7 @@ const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket
                     result = `${result}( ${op}) AND `;
                 }
                 else {
-                    result = result + "`" + key + "`" + ` IN (${value.map(i => "'" + i + "'").join(',')}) AND `;
+                    result = result + key + ` IN (${value.map(i => "'" + i + "'").join(',')}) AND `;
                 }
                 return result;
             }
@@ -62,10 +62,10 @@ const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket
                 return result;
             }
             else if (typeof value == "object" && value['val']) {
-                result = result + "`" + key + "`" + `=${value['val']} AND `;
+                result = result + key + `=${value['val']} AND `;
                 return result;
             }
-            result = result + "`" + key + "`" + "=" + value + " AND ";
+            result = result + key + "=" + value + " AND ";
         }
         return result;
     }, "");

package/utils/helper.d.ts

@@ -50,6 +50,9 @@ export declare const removeHyphen: (str: string, replace?: string, { encode, rep
 export declare const getMobileNumber: (str: string, { prefix }?: {
     prefix?: string;
 }) => string;
+export declare const formatMobileNumber: (str: string, { prefix }?: {
+    prefix?: string;
+}) => string;
 export declare const removeSpace: (str: string, replace?: string) => string;
 export declare const removeAt: (str: string, replace?: string) => string;
 export declare const isNumber: (val: any, { negative }?: {

package/utils/helper.js

@@ -1,6 +1,6 @@
 "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.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.getMobileNumber = exports.removeHyphen = exports.signToken = exports.getTokenDataFromTokenBySecret = exports.getUUID32 = exports.getUUID = exports.sleep = exports.getValueByLang = exports.getValueFunctionLang = exports.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getSlug = 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.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.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getSlug = 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");
@@ -154,14 +154,25 @@ exports.removeHyphen = removeHyphen;
 const getMobileNumber = (str, { prefix = "+66" } = {}) => {
     if (str) {
         str = str.replace(/_/g, "").replace(/-/g, "").replace(/ /g, "");
-        if (str.indexOf("+") == -1 && str.length == 10) {
-            str = str.substr(1);
+        if (str.indexOf("+") == -1 && (str.length == 10 || str.length == 9)) {
+            if (str.length == 10 && str[0] == "0")
+                str = str.substr(1);
             str = prefix + str;
         }
     }
     return str;
 };
 exports.getMobileNumber = getMobileNumber;
+const formatMobileNumber = (str, { prefix = "+66" } = {}) => {
+    if (str) {
+        str = str.replace(/_/g, "").replace(/-/g, "").replace(/ /g, "").replace(prefix, "");
+        if (str.length == 9) {
+            str = "0" + str;
+        }
+    }
+    return str;
+};
+exports.formatMobileNumber = formatMobileNumber;
 const removeSpace = (str, replace = "") => {
     return str ? str.replace(/ /g, replace) : "";
 };

package/utils/user.js

@@ -317,9 +317,11 @@ 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['setting'] = group['setting'] || {};
+            group_shared = group['shared'];
+        }
     }
     if (typeof group_shared != "undefined" && group_shared == 0) {
         let query = yield group_permission_1.UserGroupPermissionModel.schema(ref, "_").findOne({