@digione/node-custom-api 0.2.0-alpha11 → 0.2.0-alpha12

package/package.json

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

package/utils/auth.d.ts

@@ -15,7 +15,9 @@ export declare class AuthUtil {
         success: number;
         token: any;
     }>;
-    refreshAccessTokenByToken(token: any): Promise<{
+    refreshAccessTokenByToken(token: any, { attributes_include }?: {
+        attributes_include?: any[];
+    }): Promise<{
         access_token: string;
     }>;
     signNotificationTokenByToken(token: any, input?: any): Promise<{

package/utils/auth.js

@@ -75,7 +75,7 @@ class AuthUtil {
             }
         });
     }
-    refreshAccessTokenByToken(token) {
+    refreshAccessTokenByToken(token, { attributes_include = [] } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 const tokenData = yield (0, helper_1.getTokenDataFromTokenBySecret)(token, (0, helper_1.getENV)('JWT_SECRET'));
@@ -84,7 +84,7 @@ class AuthUtil {
                 yield access_token_1.AccessTokenModel.schema(this.ref, "_").destroy({
                     where: { refresh_token_id: refreshTokenId }
                 });
-                let include_access = {}, attributes = (this.ref == 'core') ? ['group_id'] : ['organ_id', 'group_id', 'b2b_group_id', 'team_id'];
+                let include_access = {}, attributes = (this.ref == 'core') ? ['group_id'] : ['organ_id', 'group_id', 'b2b_group_id', 'team_id'].concat(attributes_include);
                 let refresh = yield refresh_token_1.RefreshTokenModel.schema(this.ref, "_").findOne({
                     where: { id: refreshTokenId }, attributes, raw: true
                 });

package/utils/db.d.ts

@@ -33,20 +33,23 @@ export declare const findAll: (table: string, { where, attributes, association,
     offset?: number;
     order?: any[];
 }) => Promise<Array<any>>;
-export declare const update: (ref: string, table: string, input: any, { where, default_lang, index }?: {
+export declare const update: (ref: string, table: string, input: any, { where, default_lang, index, transaction }?: {
     where?: {};
     default_lang?: string;
     index?: string;
+    transaction?: sequelize.Transaction;
 }) => Promise<[undefined, number] | {
     [x: string]: any;
 }>;
-export declare const insert: (ref: string, table: string, input: any, { index }?: {
+export declare const insert: (ref: string, table: string, input: any, { index, transaction }?: {
     index?: string;
+    transaction?: sequelize.Transaction;
 }) => Promise<{
     [x: string]: any;
 }>;
-export declare const remove: (ref: string, table: string, { where }?: {
+export declare const remove: (ref: string, table: string, { where, transaction }?: {
     where?: {};
+    transaction?: sequelize.Transaction;
 }) => Promise<number>;
 export declare const max: (ref: string, table: string, field: any, { where }?: {
     where?: {};
@@ -55,9 +58,12 @@ export declare const getNextId: (ref: string, table: any) => Promise<any>;
 export declare const getFieldAll: (table: string, { type }?: {
     type?: boolean;
 }) => Promise<any[]>;
-export declare const truncate: (table: string) => Promise<[unknown[], unknown]>;
-export declare const cloneTable: (old_table: string, new_table: string, { withRow }?: {
+export declare const truncate: (table: string, { transaction }?: {
+    transaction?: sequelize.Transaction;
+}) => Promise<[unknown[], unknown]>;
+export declare const cloneTable: (old_table: string, new_table: string, { withRow, transaction }?: {
     withRow?: boolean;
+    transaction?: sequelize.Transaction;
 }) => Promise<boolean>;
 export declare const createTable: (table: string, attributes: any, { removePrimary, field }?: {
     removePrimary?: boolean;
@@ -91,4 +97,6 @@ export declare const changeColumn: (table: string, field: string, schema: ModelA
     remove_index?: boolean;
 }) => Promise<void>;
 export declare const removeColumn: (table: string, field: string) => Promise<[unknown[], unknown]>;
-export declare const cloneColumn: (table: string, old_field: string, new_field: string) => Promise<[undefined, number]>;
+export declare const cloneColumn: (table: string, old_field: string, new_field: string, { transaction }?: {
+    transaction?: sequelize.Transaction;
+}) => Promise<[undefined, number]>;

package/utils/db.js

@@ -138,7 +138,7 @@ const findAll = (table, { where = {}, attributes = [], association = [], limit =
     }
 });
 exports.findAll = findAll;
-const update = (ref, table, input, { where = {}, default_lang = "", index = "id" } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const update = (ref, table, input, { where = {}, default_lang = "", index = "id", transaction = undefined } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     if (where['lang_code'] && (input['lang_code'] && input[index])) {
         let exist = yield (0, exports.count)(ref + "_" + table, { primaryKey: index, where: { lang_code: input['lang_code'], [index]: input[index] } });
         if (!exist) {
@@ -171,7 +171,7 @@ const update = (ref, table, input, { where = {}, default_lang = "", index = "id"
     let whereClause = (0, exports.genWhere)(where);
     let query = `UPDATE ${table} ${set} ${whereClause}`;
     try {
-        let data = yield database_1.default.query(query, { type: sequelize.QueryTypes.UPDATE });
+        let data = yield database_1.default.query(query, { type: sequelize.QueryTypes.UPDATE, transaction });
         return data;
     }
     catch (err) {
@@ -180,7 +180,7 @@ const update = (ref, table, input, { where = {}, default_lang = "", index = "id"
     return Promise.reject(errors_1.generalError.BAD_REQUEST);
 });
 exports.update = update;
-const insert = (ref, table, input, { index = "id" } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const insert = (ref, table, input, { index = "id", transaction = undefined } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     table = ref ? ref + "_" + table : table;
     let insert, rawField = "", rawValues = "";
     _.each(input, (value, key) => {
@@ -197,7 +197,7 @@ const insert = (ref, table, input, { index = "id" } = {}) => tslib_1.__awaiter(v
     }
     let query = `INSERT INTO ${table} ${insert}`;
     try {
-        let insert = yield database_1.default.query(query, { type: sequelize.QueryTypes.INSERT });
+        let insert = yield database_1.default.query(query, { type: sequelize.QueryTypes.INSERT, transaction });
         return { [index]: input[index] ? input[index] : insert[0] };
     }
     catch (err) {
@@ -206,12 +206,12 @@ const insert = (ref, table, input, { index = "id" } = {}) => tslib_1.__awaiter(v
     return Promise.reject(errors_1.generalError.BAD_REQUEST);
 });
 exports.insert = insert;
-const remove = (ref, table, { where = {} } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const remove = (ref, table, { where = {}, transaction = undefined } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     table = ref ? ref + "_" + table : table;
     let whereClause = (0, exports.genWhere)(where);
     let query = `DELETE FROM ${table} ${whereClause}`;
     try {
-        yield database_1.default.query(query, { type: sequelize.QueryTypes.DELETE });
+        yield database_1.default.query(query, { type: sequelize.QueryTypes.DELETE, transaction });
         return 1;
     }
     catch (err) {
@@ -263,16 +263,16 @@ const getFieldAll = (table, { type = false } = {}) => tslib_1.__awaiter(void 0,
     return null;
 });
 exports.getFieldAll = getFieldAll;
-const truncate = (table) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    return database_1.default.query(`TRUNCATE TABLE ${table}`, { type: sequelize.QueryTypes.RAW });
+const truncate = (table, { transaction = undefined } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    return database_1.default.query(`TRUNCATE TABLE ${table}`, { type: sequelize.QueryTypes.RAW, transaction });
 });
 exports.truncate = truncate;
-const cloneTable = (old_table, new_table, { withRow = true } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const cloneTable = (old_table, new_table, { withRow = true, transaction = undefined } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     let exist = yield (0, exports.getExistTable)(new_table);
     if (exist)
         return false;
-    yield database_1.default.query(`CREATE TABLE ${new_table} LIKE ${old_table}`, { type: sequelize.QueryTypes.RAW });
-    withRow && (yield database_1.default.query(`INSERT INTO ${new_table} SELECT * FROM ${old_table}`, { type: sequelize.QueryTypes.INSERT }));
+    yield database_1.default.query(`CREATE TABLE ${new_table} LIKE ${old_table}`, { type: sequelize.QueryTypes.RAW, transaction });
+    withRow && (yield database_1.default.query(`INSERT INTO ${new_table} SELECT * FROM ${old_table}`, { type: sequelize.QueryTypes.INSERT, transaction }));
     return true;
 });
 exports.cloneTable = cloneTable;
@@ -389,9 +389,9 @@ const removeColumn = (table, field) => tslib_1.__awaiter(void 0, void 0, void 0,
     return null;
 });
 exports.removeColumn = removeColumn;
-const cloneColumn = (table, old_field, new_field) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const cloneColumn = (table, old_field, new_field, { transaction = undefined } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        return yield database_1.default.query(`UPDATE ${table} SET ${new_field} = ${old_field}`, { type: sequelize.QueryTypes.UPDATE });
+        return yield database_1.default.query(`UPDATE ${table} SET ${new_field} = ${old_field}`, { type: sequelize.QueryTypes.UPDATE, transaction });
     }
     catch (err) { }
     return null;

package/utils/stream.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="qs" />
 import { FileUtil, TagFile } from './file';
+import { Transaction } from 'sequelize';
 import { QueryParamOption } from '../interface/param';
 import { Request } from 'express';
 import * as Joi from 'joi';
@@ -149,12 +150,13 @@ export declare class StreamUtil {
         df_lang?: string;
     }): Promise<any[]>;
     truncate(slug: string, namespace: string): Promise<true | any[]>;
-    remove(slug: string, namespace: string, index: any, { field, where, error }?: {
+    remove(slug: string, namespace: string, index: any, { field, where, error, transaction }?: {
         field?: string;
         where?: {};
         error?: boolean;
+        transaction?: Transaction;
     }): Promise<boolean>;
-    upsert(slug: string, namespace: string, input?: any, { id, req, raw_input, attributes, field, where, default_lang, builder }?: {
+    upsert(slug: string, namespace: string, input?: any, { id, req, raw_input, attributes, field, where, default_lang, builder, transaction }?: {
         id?: string;
         req?: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
         raw_input?: {};
@@ -163,6 +165,7 @@ export declare class StreamUtil {
         where?: {};
         default_lang?: string;
         builder?: boolean;
+        transaction?: Transaction;
     }): Promise<any>;
     upsertBySlug(slug: string, namespace: string, index: string, { ref, req, parent_slug, input, tags, group }?: {
         ref?: string;
@@ -246,14 +249,17 @@ export declare class StreamUtil {
         lang?: any[];
     }): Promise<any[]>;
     checkStream(slug: string, namespace: string): Promise<number>;
-    addStream(slug: string, namespace: string, input?: any, { stream, column, checkDuplicate, fields, removePrimary }?: {
+    addStream(slug: string, namespace: string, input?: any, { stream, column, checkDuplicate, fields, removePrimary, transaction }?: {
         stream?: any;
         column?: {};
         checkDuplicate?: boolean;
         fields?: Field[];
         removePrimary?: boolean;
+        transaction?: Transaction;
     }): Promise<any>;
-    updateStream(slug: string, namespace: string, input?: any): Promise<[undefined, number] | {
+    updateStream(slug: string, namespace: string, input?: any, { transaction }?: {
+        transaction?: Transaction;
+    }): Promise<[undefined, number] | {
         [x: string]: any;
     }>;
     removeStreamByNamespace(namespace: string): Promise<{

package/utils/stream.js

@@ -800,7 +800,7 @@ class StreamUtil {
             return true;
         });
     }
-    remove(slug, namespace, index, { field = "id", where = {}, error = true } = {}) {
+    remove(slug, namespace, index, { field = "id", where = {}, error = true, transaction = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let { id: id_stream, stream_prefix, fields: streams } = yield this.findField(slug, namespace, { field_only: false, field_required: false, convert_option: true });
             let table = stream_prefix ? stream_prefix + slug : slug;
@@ -814,7 +814,7 @@ class StreamUtil {
                         if (field_type == "multiple" && field_data && field_data['choose_stream'] && field_data['self_table'] != "yes") {
                             let stream = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { id: field_data['choose_stream'] }, raw: true, attributes: ['stream_slug', 'stream_prefix'] });
                             let table_f = stream['stream_prefix'] ? stream['stream_prefix'] + stream['stream_slug'] : stream['stream_slug'];
-                            yield (0, db_1.remove)(this.ref, `${table}_${table_f}`, { where: { row_id: id } });
+                            yield (0, db_1.remove)(this.ref, `${table}_${table_f}`, { where: { row_id: id }, transaction });
                         }
                         else if ((field_type == "file" || field_type == "image")) {
                             file_id = file_id.concat(query.reduce((total, item) => item[field_slug] ? total.concat(item[field_slug]) : total, []));
@@ -824,7 +824,7 @@ class StreamUtil {
                         yield this.fileUtil.removeFileById(file_id, { error: false });
                     }
                 }
-                yield (0, db_1.remove)(this.ref, table, { where });
+                yield (0, db_1.remove)(this.ref, table, { where, transaction });
             }
             else if (error) {
                 return Promise.reject(errors_1.generalError.NOT_FOUND);
@@ -832,7 +832,7 @@ class StreamUtil {
             return true;
         });
     }
-    upsert(slug, namespace, input = {}, { id = "", req = {}, raw_input = {}, attributes = [], field = "id", where = {}, default_lang = "en", builder = true } = {}) {
+    upsert(slug, namespace, input = {}, { id = "", req = {}, raw_input = {}, attributes = [], field = "id", where = {}, default_lang = "en", builder = true, transaction = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let files = {}, id_files = {};
             let lang_code = input['lang_code'] ? input['lang_code'] : default_lang;
@@ -927,11 +927,11 @@ class StreamUtil {
                 })));
             }
             if (id) {
-                yield (0, db_1.update)(this.ref, table, data, { where, default_lang });
+                yield (0, db_1.update)(this.ref, table, data, { where, default_lang, transaction });
                 query = { id };
             }
             else {
-                query = yield (0, db_1.insert)(this.ref, table, data);
+                query = yield (0, db_1.insert)(this.ref, table, data, { transaction });
                 id = query['id'];
             }
             if (!id_stream || (fields && !fields.length)) {
@@ -943,7 +943,7 @@ class StreamUtil {
                         let stream = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { id: field_data['choose_stream'] }, raw: true, attributes: ['stream_slug', 'stream_prefix'] });
                         let table_f = stream['stream_prefix'] ? stream['stream_prefix'] + stream['stream_slug'] : stream['stream_slug'];
                         if (!isNew) {
-                            yield (0, db_1.remove)(this.ref, `${table}_${table_f}`, { where: { row_id: id } });
+                            yield (0, db_1.remove)(this.ref, `${table}_${table_f}`, { where: { row_id: id }, transaction });
                         }
                         if (raw_input[field_slug]) {
                             let op = [];
@@ -956,7 +956,7 @@ class StreamUtil {
                                 if (!v)
                                     return 1;
                                 let input = { row_id: id, [slug + "_id"]: id, [table_f + "_id"]: v };
-                                yield (0, db_1.insert)(this.ref, `${table}_${table_f}`, input);
+                                yield (0, db_1.insert)(this.ref, `${table}_${table_f}`, input, { transaction });
                             })));
                         }
                     }
@@ -1439,7 +1439,7 @@ class StreamUtil {
             return yield stream_1.StreamModel.schema(this.ref, "_").count({ where: { stream_slug: slug, stream_namespace: namespace } });
         });
     }
-    addStream(slug, namespace, input = {}, { stream = undefined, column = {}, checkDuplicate = true, fields = [], removePrimary = false } = {}) {
+    addStream(slug, namespace, input = {}, { stream = undefined, column = {}, checkDuplicate = true, fields = [], removePrimary = false, transaction = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             input['stream_slug'] = slug;
             input['stream_namespace'] = namespace;
@@ -1461,10 +1461,10 @@ class StreamUtil {
                     input['stream_name'] = _.startCase(_.camelCase(input['stream_slug']));
                 }
                 input['view_options'] = input['view_options'] ? JSON.stringify(input['view_options']) : null;
-                stream = yield (0, db_1.insert)(this.ref, stream_1.StreamModel.getTableName().toString(), input);
+                stream = yield (0, db_1.insert)(this.ref, stream_1.StreamModel.getTableName().toString(), input, { transaction });
             }
             else {
-                yield (0, db_1.update)(this.ref, stream_1.StreamModel.getTableName().toString(), input);
+                yield (0, db_1.update)(this.ref, stream_1.StreamModel.getTableName().toString(), input, { transaction });
             }
             input['id'] = stream['id'];
             if (!exist && input['stream_type'] == "auto")
@@ -1475,14 +1475,14 @@ class StreamUtil {
             return stream;
         });
     }
-    updateStream(slug, namespace, input = {}) {
+    updateStream(slug, namespace, input = {}, { transaction = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let query = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { stream_slug: slug, stream_namespace: namespace }, attributes: ['id'], raw: true });
             if (!query) {
                 return Promise.reject(errors_1.generalError.NOT_FOUND);
             }
             delete input['id'];
-            return yield (0, db_1.update)(this.ref, stream_1.StreamModel.getTableName().toString(), input, { where: { id: query['id'] } });
+            return yield (0, db_1.update)(this.ref, stream_1.StreamModel.getTableName().toString(), input, { where: { id: query['id'] }, transaction });
         });
     }
     removeStreamByNamespace(namespace) {