@digione/node-custom-api 0.1.9-alpha9 → 0.1.9-beta10

package/package.json

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

package/utils/user.d.ts

@@ -40,9 +40,9 @@ 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 }?: {
+export declare const getAddressIndex: (data: any, { condition, where }?: {
     condition?: {};
-    lang_code?: string;
+    where?: {};
 }) => Promise<{}>;
 export declare const getCountry: (ref: string, { organ_id, lang_code, setting }?: {
     organ_id?: string;

package/utils/user.js

@@ -229,11 +229,11 @@ const convertAddress = (data, { lang_code = "en", transform = false } = {}) => t
     return data;
 });
 exports.convertAddress = convertAddress;
-const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const getAddressIndex = (data, { condition = {}, where = {} } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     let result = {}, bol = false;
     if (!bol && data['country'] && !condition['country_id']) {
         let country = yield country_1.CountryModel.schema("core", "_").findOne({
-            raw: true, where: { country_name: data['country'] }, attributes: ['id']
+            raw: true, where: Object.assign(Object.assign({}, where), { country_name: data['country'] }), attributes: ['id']
         });
         if (country) {
             result['country_id'] = country['id'];
@@ -244,7 +244,7 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
     if (!bol && data['state'] && !condition['state_id']) {
         let country_id = condition['country_id'] || null;
         let state = yield state_1.StateModel.schema("core", "_").findOne({
-            raw: true, where: { country_id, state_name: data['state'] }, attributes: ['id']
+            raw: true, where: Object.assign(Object.assign({}, where), { country_id, state_name: data['state'] }), attributes: ['id']
         });
         if (state) {
             result['state_id'] = state['id'];
@@ -255,7 +255,7 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
     if (!bol && data['city'] && !condition['city_id']) {
         let state_id = condition['state_id'] || null;
         let city = yield city_1.CityModel.schema("core", "_").findOne({
-            raw: true, where: { state_id, city_name: data['city'] }, attributes: ['id']
+            raw: true, where: Object.assign(Object.assign({}, where), { state_id, city_name: data['city'] }), attributes: ['id']
         });
         if (city) {
             result['city_id'] = city['id'];
@@ -266,7 +266,7 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
     if (!bol && data['district']) {
         let city_id = condition['city_id'] || null;
         let district = yield district_1.DistrictModel.schema("core", "_").findOne({
-            raw: true, where: { city_id, district_name: data['district'] }, attributes: ['id']
+            raw: true, where: Object.assign(Object.assign({}, where), { city_id, district_name: data['district'] }), attributes: ['id']
         });
         if (district)
             result['district_id'] = district['id'];