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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digione/node-custom-api",
-  "version": "0.2.0-beta6",
+  "version": "0.2.0-beta9",
   "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": "3.3.3",
     "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");