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

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-beta2",
   "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/stream.js

@@ -956,8 +956,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* () {