@digione/node-custom-api 0.1.7 → 0.1.8-beta1

package/package.json

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

package/utils/stream.js

@@ -1742,7 +1742,7 @@ class StreamUtil {
     getValidator(streams, { schema = {}, input = {}, req = {}, isNew = false, lang = [], required = true, stripUnknown = false } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let field_lang = [];
-            let file = (req.file ? [req.file] : [].concat(req.files || [])).reduce((total, item) => Object.assign(total, { [item['fieldname']]: item }), {});
+            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 }) => {
                 let field;
                 field_data = field_data || {};

package/utils/user.d.ts

@@ -36,8 +36,9 @@ export declare const getUserInOrgan: (ref: string, { where, organ_id, attributes
     attributes?: string[];
     parent?: boolean;
 }) => Promise<sequelize.Model<any, any>>;
-export declare const convertAddress: (data: any, { lang_code }?: {
+export declare const convertAddress: (data: any, { lang_code, transform }?: {
     lang_code?: string;
+    transform?: boolean;
 }) => Promise<any>;
 export declare const getAddressIndex: (data: any, { condition, lang_code }?: {
     condition?: {};

package/utils/user.js

@@ -177,36 +177,54 @@ const getUserInOrgan = (ref, { where = {}, organ_id = "", attributes = ['id', 'o
     });
 });
 exports.getUserInOrgan = getUserInOrgan;
-const convertAddress = (data, { lang_code = "en" } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    let where = { lang_code: [lang_code, "en"], status: '1' };
+const convertAddress = (data, { lang_code = "en", transform = false } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let where = { lang_code: [lang_code, "en"], status: '1' }, limit = 1, attributes = [];
     let order = [sequelize.literal(`FIELD(lang_code,${'\'' + where['lang_code'].join('\',\'') + '\''})`)];
+    if (transform) {
+        where = { status: '1' };
+        attributes = ['lang_code'];
+        limit = undefined;
+        order = undefined;
+    }
     if (data['country_id']) {
-        let country = yield country_1.CountryModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { id: data['country_id'] }), attributes: ['country_name'], order
+        let country = yield country_1.CountryModel.schema("core", "_").findAll({
+            raw: true, where: Object.assign(Object.assign({}, where), { id: data['country_id'] }), attributes: ['country_name', ...attributes], order, limit
         });
-        if (country)
-            data['country'] = country['country_name'];
+        if (country.length) {
+            data['country'] = country[0]['country_name'];
+            if (transform)
+                data['country'] = JSON.stringify(country.reduce((total, item) => Object.assign(total, { [item['lang_code']]: item['country_name'] }), {}));
+        }
     }
     if (data['state_id']) {
-        let state = yield state_1.StateModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { id: data['state_id'] }), attributes: ['state_name'], order
+        let state = yield state_1.StateModel.schema("core", "_").findAll({
+            raw: true, where: Object.assign(Object.assign({}, where), { id: data['state_id'] }), attributes: ['state_name', ...attributes], order, limit
         });
-        if (state)
-            data['state'] = state['state_name'];
+        if (state.length) {
+            data['state'] = state[0]['state_name'];
+            if (transform)
+                data['state'] = JSON.stringify(state.reduce((total, item) => Object.assign(total, { [item['lang_code']]: item['state_name'] }), {}));
+        }
     }
     if (data['city_id']) {
-        let city = yield city_1.CityModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { id: data['city_id'] }), attributes: ['city_name'], order
+        let city = yield city_1.CityModel.schema("core", "_").findAll({
+            raw: true, where: Object.assign(Object.assign({}, where), { id: data['city_id'] }), attributes: ['city_name', ...attributes], order, limit
         });
-        if (city)
-            data['city'] = city['city_name'];
+        if (city.length) {
+            data['city'] = city[0]['city_name'];
+            if (transform)
+                data['city'] = JSON.stringify(city.reduce((total, item) => Object.assign(total, { [item['lang_code']]: item['city_name'] }), {}));
+        }
     }
     if (data['district_id']) {
-        let district = yield district_1.DistrictModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { id: data['district_id'] }), attributes: ['district_name'], order
+        let district = yield district_1.DistrictModel.schema("core", "_").findAll({
+            raw: true, where: Object.assign(Object.assign({}, where), { id: data['district_id'] }), attributes: ['district_name', ...attributes], order, limit
         });
-        if (district)
-            data['district'] = district['district_name'];
+        if (district.length) {
+            data['district'] = district[0]['district_name'];
+            if (transform)
+                data['district'] = JSON.stringify(district.reduce((total, item) => Object.assign(total, { [item['lang_code']]: item['district_name'] }), {}));
+        }
     }
     return data;
 });