@digione/node-custom-api 0.2.0-beta1 → 0.2.0-beta3

package/models/user/user.d.ts

@@ -50,9 +50,6 @@ export declare const UserAttr: {
     organ_id: {
         type: sequelize.IntegerDataType;
     };
-    member_id: {
-        type: sequelize.StringDataType;
-    };
     provider: sequelize.StringDataType;
     mobile: sequelize.StringDataType;
     mobile_code: sequelize.StringDataType;

package/models/user/user.js

@@ -58,10 +58,6 @@ exports.UserAttr = {
     organ_id: {
         type: sequelize.INTEGER({ length: 11 })
     },
-    // points:sequelize.INTEGER({length:11}),
-    member_id: {
-        type: sequelize.STRING(100)
-    },
     provider: sequelize.STRING(40),
     mobile: sequelize.STRING(20),
     mobile_code: sequelize.STRING(10)

package/package.json

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

package/utils/file.d.ts

@@ -62,16 +62,23 @@ export declare class FileUtil {
         width?: number;
         height?: number;
     }): Promise<any>;
-    beforeFindFile(where?: {}, { tags, group }?: {
+    beforeFindFile(where?: {}, { attributes, tags, group, verify }?: {
+        attributes?: any;
         tags?: TagFile;
         group?: any;
-    }): {};
-    findAllFile({ where, folder, full, file_link, thumb, width, height, parent_folder, attributes, limit, offset, tag, tags, group }?: {
+        verify?: boolean;
+    }): {
+        where: {};
+        attributes: any;
+        order: any[];
+    };
+    findAllFile({ where, folder, full, file_link, thumb, verify, width, height, parent_folder, attributes, limit, offset, tag, tags, group }?: {
         where?: {};
         folder?: boolean;
         full?: boolean;
         file_link?: boolean;
         thumb?: boolean;
+        verify?: boolean;
         width?: number;
         height?: number;
         parent_folder?: string;

package/utils/file.js

@@ -108,6 +108,7 @@ class FileUtil {
     }
     afterQueryFile(data = {}, { tag = {}, file_link = false } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            delete data['thumbnail'];
             data['custom'] = data['custom'] || {};
             data['tags'] = data['tags'] || [];
             if (data['filename'] == data['path']) {
@@ -276,12 +277,12 @@ class FileUtil {
                         return null;
                     where['$folder.parent_id$'] = query['id'];
                 }
-                where = this.beforeFindFile(where, { tags, group });
+                let option = this.beforeFindFile(where, { attributes: ['id', 'extension', 'filename', 'path', 'thumb'], tags, group });
                 let result = yield file_1.FileModel.schema(this.ref, "_").findOne({
-                    raw: true, attributes: ['id', 'extension', 'filename', 'path', 'thumb'],
-                    where: Object.assign({ '$folder.slug$': slug }, where),
+                    raw: true, attributes: option.attributes,
+                    where: Object.assign({ '$folder.slug$': slug }, option.where),
                     include: [{ as: 'folder', model: folder_1.FolderModel.schema(this.ref, "_"), attributes: [] }],
-                    order: [['sort', 'asc'], ['tags', 'desc']]
+                    order: option.order
                 });
                 return this.findImageThumb(result, { width, height });
             }
@@ -299,7 +300,8 @@ class FileUtil {
             return this.findImageThumb(item, { width, height });
         });
     }
-    beforeFindFile(where = {}, { tags = [], group = undefined } = {}) {
+    beforeFindFile(where = {}, { attributes = undefined, tags = [], group = undefined, verify = false } = {}) {
+        let order = [['sort', 'asc'], ['tags', 'desc']], thumbnail = false;
         if (this.option.organ_id) {
             where[sequelize_1.Op.and] = (where[sequelize_1.Op.and] || []).concat({ [sequelize_1.Op.or]: [{ organ_id: this.option.organ_id }, { organ_by: this.option.organ_id }] });
         }
@@ -310,9 +312,11 @@ class FileUtil {
             let op = tags.reduce((total, tag) => {
                 let value = Object.keys(tag).reduce((total, key) => total.concat([`'${key}'`, `"${tag[key]}"`]), []).join(',');
                 if (value) {
-                    total = total.concat((0, sequelize_1.literal)(`JSON_CONTAINS(tags,JSON_OBJECT(${value}))`));
-                    if (tag['slug'] == "thumbnail") {
-                        total = total.concat((0, sequelize_1.literal)(`tags IS NULL`));
+                    if (tag['slug'] == "thumbnail" && !verify) {
+                        thumbnail = true;
+                    }
+                    else {
+                        total = total.concat((0, sequelize_1.literal)(`JSON_CONTAINS(tags,JSON_OBJECT(${value}))`));
                     }
                 }
                 return total;
@@ -321,9 +325,19 @@ class FileUtil {
                 where[sequelize_1.Op.and] = (where[sequelize_1.Op.and] || []).concat({ [sequelize_1.Op.or]: op });
             }
         }
-        return where;
+        if (thumbnail) {
+            let include = [[(0, sequelize_1.literal)(`IF(JSON_CONTAINS(tags,JSON_OBJECT('slug',"thumbnail")),'yes','no')`), 'thumbnail']];
+            if (typeof attributes == "undefined") {
+                attributes = { include };
+            }
+            else if (attributes instanceof Array) {
+                attributes = attributes.concat(include);
+            }
+            order = [['thumbnail', 'desc'], ['sort', 'asc']];
+        }
+        return { where, attributes, order };
     }
-    findAllFile({ where = {}, folder = false, full = false, file_link = false, thumb = false, width = 0, height = 0, parent_folder = "", attributes = undefined, limit = undefined, offset = undefined, tag = {}, tags = [], group = undefined } = {}) {
+    findAllFile({ where = {}, folder = false, full = false, file_link = false, thumb = false, verify = true, width = 0, height = 0, parent_folder = "", attributes = undefined, limit = undefined, offset = undefined, tag = {}, tags = [], group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 let include = [];
@@ -335,10 +349,10 @@ class FileUtil {
                         return [];
                     where['$folder.parent_id$'] = query['id'];
                 }
-                where = this.beforeFindFile(where, { tags, group });
                 where['is_hidden'] = where['is_hidden'] || "no";
+                let option = this.beforeFindFile(where, { attributes, tags, group, verify });
                 let result = yield file_1.FileModel.schema(this.ref, "_").findAll({
-                    attributes, raw: true, where, limit, offset, include, order: [['sort', 'asc'], ['tags', 'desc']]
+                    attributes: option.attributes, raw: true, where: option.where, limit, offset, include, order: option.order
                 });
                 result.length && (yield this.getStorage());
                 result = yield Promise.all(result.map((item) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -372,9 +386,9 @@ class FileUtil {
             if (!folder)
                 return { rows: [], count: 0 };
             where['folder_id'] = folder['id'];
-            where = this.beforeFindFile(where, { tags, group });
             where['is_hidden'] = where['is_hidden'] || "no";
-            let data = yield Promise.all([this.findAllFile({ where, full: true, file_link, limit, offset, tag, group }), file_1.FileModel.schema(this.ref, "_").count({ where })]);
+            let option = this.beforeFindFile(where, { tags, group, verify: true });
+            let data = yield Promise.all([this.findAllFile({ where, full: true, file_link, limit, offset, tag, group }), file_1.FileModel.schema(this.ref, "_").count({ where: option.where })]);
             return { rows: data[0], count: data[1] };
         });
     }
@@ -385,7 +399,7 @@ class FileUtil {
     }
     findOneFileByFolder(slug, { where = {}, full = false, file_link = false, parent_folder = "", tags = [], group = null } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (yield this.findAllFile({ where: Object.assign({ '$folder.slug$': slug }, where), folder: true, full, file_link, parent_folder, limit: 1, tags, group }))[0] || null;
+            return (yield this.findAllFile({ where: Object.assign({ '$folder.slug$': slug }, where), folder: true, full, file_link, verify: false, parent_folder, limit: 1, tags, group }))[0] || null;
         });
     }
     findOneFileById(id, { where = {}, full = true, file_link = false, parent_folder = "", tags = [], group = null } = {}) {
@@ -678,8 +692,8 @@ class FileUtil {
     }
     remove({ where = {}, delete_object = false, error = true, tags = [], group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            where = this.beforeFindFile(where, { tags, group });
-            let files = yield file_1.FileModel.schema(this.ref, "_").findAll({ where, attributes: ['id', 'path', 'thumb'], raw: true });
+            let option = this.beforeFindFile(where, { tags, group, verify: true });
+            let files = yield file_1.FileModel.schema(this.ref, "_").findAll({ where: option.where, attributes: ['id', 'path', 'thumb'], raw: true });
             if (files.length) {
                 let paths = [], id = files.map(i => { paths = paths.concat(this.getFilePath(i)); return i['id']; });
                 yield file_1.FileModel.schema(this.ref, "_").destroy({ where: { id } });

package/utils/helper.d.ts

@@ -27,7 +27,12 @@ export declare const getValueFunctionFile: (key: any) => (value: any, { result,
     json?: {};
     fileUtil?: any;
 }) => Promise<void>;
-export declare const getValueFunctionLang: (key: any) => (value?: {}, { result, transform, spread, spread_all, raw, lang_code }?: {
+export declare const getValueFunctionArray: (key: any) => (value: any, { result }: {
+    result?: {};
+}) => void;
+export declare const getValueFunctionLang: (key: any, { field_type }?: {
+    field_type?: string;
+}) => (value?: {}, { result, transform, spread, spread_all, raw, lang_code }?: {
     result?: {};
     transform?: boolean;
     spread?: boolean;

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.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.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.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");
@@ -101,7 +101,22 @@ const getValueFunctionFile = (key) => {
     });
 };
 exports.getValueFunctionFile = getValueFunctionFile;
-const getValueFunctionLang = (key) => {
+const getValueFunctionArray = (key) => {
+    return (value, { result = {} }) => {
+        if (value[key]) {
+            try {
+                result[key] = JSON.parse(value[key]);
+            }
+            catch (err) { }
+            ;
+        }
+        if (!(result[key] instanceof Array)) {
+            result[key] = [];
+        }
+    };
+};
+exports.getValueFunctionArray = getValueFunctionArray;
+const getValueFunctionLang = (key, { field_type = "" } = {}) => {
     return (value = {}, { result = {}, transform = true, spread = false, spread_all = false, raw = false, lang_code = "" } = {}) => {
         if (raw || typeof value[key] == "undefined")
             return;
@@ -125,6 +140,9 @@ const getValueFunctionLang = (key) => {
             return;
         }
         result[key] = bol ? (obj[lang_code] || obj['en']) : value[key];
+        if (field_type == "stream") {
+            (0, exports.getValueFunctionArray)(key)({ [key]: result[key] }, { result });
+        }
     };
 };
 exports.getValueFunctionLang = getValueFunctionLang;

package/utils/stream.js

@@ -255,7 +255,7 @@ class StreamUtil {
                         delete attributes[field['field_slug']];
                     }
                     if (fetch) {
-                        if (field['is_lang'] == "yes") {
+                        if (field['is_lang'] == "yes" && field['field_type'] != "stream") {
                             label && fetchLabel.push(field);
                             fetchFn.push((0, helper_2.getValueFunctionLang)(field['field_slug']));
                         }
@@ -286,6 +286,15 @@ class StreamUtil {
                                         }
                                     }
                                     break;
+                                case "stream":
+                                    if (include[field['field_slug']] || include_all) {
+                                        label && fetchLabel.push(field);
+                                        fetchFn.push((field['is_lang'] == "yes") ? (0, helper_2.getValueFunctionLang)(field['field_slug'], { field_type: field['field_type'] }) : (0, helper_2.getValueFunctionArray)(field['field_slug']));
+                                    }
+                                    else {
+                                        delete attributes[field['field_slug']];
+                                    }
+                                    break;
                             }
                         }
                     }
@@ -404,6 +413,15 @@ class StreamUtil {
                 else if (typeof default_value[item['field_slug']] !== 'undefined') {
                     item['field_value'] = default_value[item['field_slug']];
                 }
+                if (item['field_type'] == "stream" && item['field_value']) {
+                    try {
+                        item['field_value'] = JSON.parse(item['field_value']);
+                    }
+                    catch (err) { }
+                    if (!(item['field_value'] instanceof Array)) {
+                        item['field_value'] = [];
+                    }
+                }
                 if (item['instructions']) {
                     (0, helper_2.getValueFunctionLang)('instructions')(item, { result: item, lang_code });
                 }
@@ -661,6 +679,14 @@ class StreamUtil {
                             field_data['range']['field_value'] = default_value[field_data['range']['field_target']];
                         }
                     }
+                    else if (item['field_type'] == "stream") {
+                        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 });
+                            }
+                        }
+                    }
                 }
                 fields.push(Object.assign(Object.assign({}, item), { field_data }));
             }
@@ -813,7 +839,7 @@ class StreamUtil {
             stream = stream || {};
             let id_stream = stream['id'], stream_prefix = stream['stream_prefix'];
             if (fields && fields.length) {
-                fields = fields.filter(({ is_lang, field_type, field_data }) => field_type && (is_lang == "yes" || (field_type == "multiple" && field_data['self_table'] != "yes") || field_type == "image" || field_type == "file" || field_data['field_type'] == "encrypt"));
+                fields = fields.filter(({ is_lang, field_type, field_data }) => field_type && (is_lang == "yes" || (field_type == "multiple" && field_data['self_table'] != "yes") || field_type == "image" || field_type == "file" || field_data['field_type'] == "encrypt" || field_type == "stream"));
             }
             if (!Object.keys(raw_input).length) {
                 raw_input = input;
@@ -893,6 +919,9 @@ class StreamUtil {
                     else if (field_type == "multiple") {
                         fields_post.push(fields[index]);
                     }
+                    else if (field_type == "stream" && input[field_slug]) {
+                        data[field_slug] = JSON.stringify(input[field_slug]);
+                    }
                 })));
             }
             if (id) {
@@ -956,8 +985,8 @@ class StreamUtil {
             }
             let folder = yield fileUtil.createFolder(index, { parent_id: where_folder['parent_id'] });
             let where_file = { folder_id: folder['id'], is_hidden: "yes" };
-            where_file = fileUtil.beforeFindFile(where_file, { tags, group });
-            let query = yield file_1.FileModel.schema(ref, "_").findAll({ where: where_file, attributes: ['id', 'name'], raw: true });
+            let option_file = fileUtil.beforeFindFile(where_file, { tags, group, verify: true });
+            let query = yield file_1.FileModel.schema(ref, "_").findAll({ where: option_file.where, attributes: ['id', 'name'], raw: true });
             id_files = query.reduce((total, item) => Object.assign(total, { [item['name']]: item['id'] }), {});
             let input_files = [];
             yield Promise.all(fields.map(({ field_type, field_slug, field_data }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -1666,6 +1695,12 @@ class StreamUtil {
                                 yield (0, db_1.addColumn)(`${this.ref}_${table}`, field_slug, Object.assign({ type: sequelize.STRING(20) }, opt));
                             }
                             break;
+                        case "stream":
+                            if (field_data['self_table'] == "yes") {
+                                opt['defaultValue'] = undefined;
+                                yield (0, db_1.addColumn)(`${this.ref}_${table}`, field_slug, Object.assign({ type: sequelize.TEXT('long') }, opt));
+                            }
+                            break;
                     }
                 }
             }
@@ -1826,6 +1861,9 @@ class StreamUtil {
                 }
                 field_data = _.pick(field_data, ['range']);
                 break;
+            case "stream":
+                field_data = _.pick(field_data, ['choose_stream', 'self_table']);
+                break;
             default:
                 field_data = {};
                 break;
@@ -1836,7 +1874,8 @@ class StreamUtil {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let field_lang = [];
             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 }) => {
+            for (let val of streams) {
+                let { field_type, field_slug, is_required, is_lang, field_data, data } = val;
                 let field;
                 field_data = field_data || {};
                 is_required = (is_required == "yes" && (isNew || (!input[field_slug] && typeof input[field_slug] != "undefined")));
@@ -1969,6 +2008,18 @@ class StreamUtil {
                         }
                         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;
+                    case "stream":
+                        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) {
+                                let streams = yield this.findField(stream['stream_slug'], stream['stream_namespace'], { field_only: true, convert_option: true });
+                                let validator = yield this.getValidator(streams, { isNew: true, required: is_required, lang, stripUnknown: true });
+                                field = Joi.array().items(validator);
+                            }
+                        }
+                        field = field || Joi.array();
+                        field = is_required ? field.required().min(1) : field.allow(null);
+                        break;
                 }
                 field = field || Joi.any();
                 if (is_required)
@@ -1976,12 +2027,12 @@ class StreamUtil {
                 if (is_lang == "yes") {
                     if (!lang.length) {
                         field_lang.push({ field_slug, field });
-                        return;
+                        continue;
                     }
                     field = Joi.object().keys(lang.reduce((total, i) => Object.assign(total, { [i['lang_code']]: field }), {}));
                 }
                 schema[field_slug] = field;
-            });
+            }
             if (field_lang.length) {
                 lang = yield this.languageUtil.getLangsLive();
                 for (let item of field_lang) {