@provis/provis-common-be-module 2.2.17 → 2.2.19

package/dist/class/main.repository.d.ts

@@ -22,6 +22,6 @@ export declare class MainRepository<T> extends Repository<T> {
     private generateRawCount;
     private generateRawOrder;
     private convertRawFilter;
-    generateRawFilter(search: ISearchQuery[], additionalSearchOr?: ISearchQuery[][] | undefined, aliasTable?: string): string;
+    generateRawFilter(search: ISearchQuery[], additionalSearchOr?: ISearchQuery[][], aliasTable?: string): string;
     getData(rawQuery: string, page: number, limit: number, orderBy?: string): Promise<[number, any[]]>;
 }

package/dist/class/main.repository.js

@@ -268,19 +268,20 @@ class MainRepository extends typeorm_1.Repository {
                 const condition = this.convertRawFilter(data, aliasTable);
                 rawQueryFilter += ` AND ${condition}`;
             }
-        }); // -> WHERE 1=1 AND source = 'KALOG'
-        let rawQueryFilteOr = '1=1';
-        if (additionalSearchOr) {
-            additionalSearchOr.forEach((searchOr) => {
-                searchOr.filter(Boolean).forEach((data) => {
+        });
+        if (additionalSearchOr && additionalSearchOr.length > 0) {
+            additionalSearchOr.forEach((orGroup) => {
+                const orConditions = [];
+                orGroup.filter(Boolean).forEach((data) => {
                     if (data) {
                         const condition = this.convertRawFilter(data, aliasTable);
-                        rawQueryFilter += ` OR ${condition}`;
+                        orConditions.push(condition);
                     }
                 });
-                rawQueryFilter += `AND (${rawQueryFilteOr})`;
-                rawQueryFilteOr = '1=1';
-            }); // -> WHERE 1=1 AND source = 'KALOG' AND (1=1) AND (1=1 OR policyNumber='1233567890')
+                if (orConditions.length > 0) {
+                    rawQueryFilter += ` AND (${orConditions.join(' OR ')})`;
+                }
+            });
         }
         return rawQueryFilter;
     }

package/dist/constants/product/cargo.d.ts

@@ -5,5 +5,35 @@ declare const cargo: {
         PAID: string;
         CANCEL: string;
     };
+    TYPE: {
+        TYPE_ICCA_FLB: {
+            code: string;
+            desc: {
+                id: string;
+                en: string;
+            };
+        };
+        TYPE_ICCC_FLB: {
+            code: string;
+            desc: {
+                id: string;
+                en: string;
+            };
+        };
+        TYPE_ICCA_INV: {
+            code: string;
+            desc: {
+                id: string;
+                en: string;
+            };
+        };
+        TYPE_ICCC_INV: {
+            code: string;
+            desc: {
+                id: string;
+                en: string;
+            };
+        };
+    };
 };
 export default cargo;

package/dist/constants/product/cargo.js

@@ -7,5 +7,35 @@ const cargo = {
         PAID: '200',
         CANCEL: '300',
     },
+    TYPE: {
+        TYPE_ICCA_FLB: {
+            code: 'ICCA-FLB',
+            desc: {
+                id: '',
+                en: 'Institute Cargo Clause (A) 01/01/09 - First Loss Basis',
+            },
+        },
+        TYPE_ICCC_FLB: {
+            code: 'ICCC-FLB',
+            desc: {
+                id: '',
+                en: 'Institute Cargo Clause (C) 01/01/09 - First Loss Basis',
+            },
+        },
+        TYPE_ICCA_INV: {
+            code: 'ICCA-INV',
+            desc: {
+                id: '',
+                en: 'Institute Cargo Clause (C) 01/01/09 - Invoice value +10%',
+            },
+        },
+        TYPE_ICCC_INV: {
+            code: 'ICCC-INV',
+            desc: {
+                id: '',
+                en: 'Institute Cargo Clause (A) 01/01/09 - Invoice value +10%',
+            },
+        },
+    }
 };
 exports.default = cargo;

package/dist/helpers/getCargoType.d.ts

@@ -0,0 +1,2 @@
+declare function getCargoType(code: string, lang?: string): string | null;
+export default getCargoType;

package/dist/helpers/getCargoType.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cargo_1 = require("../constants/product/cargo");
+function getCargoType(code, lang = 'en') {
+    var _a;
+    const match = Object.values(cargo_1.default.TYPE).find((item) => item.code === code);
+    return ((_a = match === null || match === void 0 ? void 0 : match.desc) === null || _a === void 0 ? void 0 : _a[lang]) || null;
+}
+exports.default = getCargoType;

package/dist/helpers/index.d.ts

@@ -21,4 +21,5 @@ import generateHashString from "./generateHashString";
 import mergeObj from "./mergeObj";
 import combineObj from "./combineObj";
 import calculateByType from './calculateByType';
-export { addDateTime, amountDescription, axiosGet, axiosPost, axiosPut, compareDiffObj, convertCurrencySymbol, convertDateTimeFormat, convertObjToNumber, convertToCurrency, filterObj, generateRelationId, getCurrentDate, getDiffValue, getObjByKeys, loop, loopBackward, searchValue, readExcel, generateHashString, mergeObj, combineObj, calculateByType, };
+import getCargoType from "./getCargoType";
+export { addDateTime, amountDescription, axiosGet, axiosPost, axiosPut, compareDiffObj, convertCurrencySymbol, convertDateTimeFormat, convertObjToNumber, convertToCurrency, filterObj, generateRelationId, getCurrentDate, getDiffValue, getObjByKeys, loop, loopBackward, searchValue, readExcel, generateHashString, mergeObj, combineObj, calculateByType, getCargoType, };

package/dist/helpers/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateByType = exports.combineObj = exports.mergeObj = exports.generateHashString = exports.readExcel = exports.searchValue = exports.loopBackward = exports.loop = exports.getObjByKeys = exports.getDiffValue = exports.getCurrentDate = exports.generateRelationId = exports.filterObj = exports.convertToCurrency = exports.convertObjToNumber = exports.convertDateTimeFormat = exports.convertCurrencySymbol = exports.compareDiffObj = exports.axiosPut = exports.axiosPost = exports.axiosGet = exports.amountDescription = exports.addDateTime = void 0;
+exports.getCargoType = exports.calculateByType = exports.combineObj = exports.mergeObj = exports.generateHashString = exports.readExcel = exports.searchValue = exports.loopBackward = exports.loop = exports.getObjByKeys = exports.getDiffValue = exports.getCurrentDate = exports.generateRelationId = exports.filterObj = exports.convertToCurrency = exports.convertObjToNumber = exports.convertDateTimeFormat = exports.convertCurrencySymbol = exports.compareDiffObj = exports.axiosPut = exports.axiosPost = exports.axiosGet = exports.amountDescription = exports.addDateTime = void 0;
 const addDateTime_1 = require("./addDateTime");
 exports.addDateTime = addDateTime_1.default;
 const amountDescription_1 = require("./amountDescription");
@@ -47,3 +47,5 @@ const combineObj_1 = require("./combineObj");
 exports.combineObj = combineObj_1.default;
 const calculateByType_1 = require("./calculateByType");
 exports.calculateByType = calculateByType_1.default;
+const getCargoType_1 = require("./getCargoType");
+exports.getCargoType = getCargoType_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@provis/provis-common-be-module",
-  "version": "2.2.17",
+  "version": "2.2.19",
   "description": "This common module for Provis internal backend use lib",
   "main": "dist/index.js",
   "scripts": {