av6-core 1.0.2 → 1.0.3

package/dist/index.d.mts

@@ -126,6 +126,8 @@ interface DropdownRequest {
     shortCode: string;
     searchColumns: string[];
     searchText?: string;
+    fixedSearch?: Record<string, ColValue>;
+    fixedNotSearch?: Record<string, ColValue>;
 }
 interface DropdownRequestService<T extends DynamicShortCode> extends DropdownRequest {
     shortCodeData: T;
@@ -280,4 +282,4 @@ interface CreateTransaction {
  */
 declare function findDifferences<T extends Record<string, any>>(obj1: T, obj2: T): CreateTransaction[];
 
-export { type CacheAdapter, type CalculationRes, type CommonExcelRequest, type CommonFilterRequest, type CommonServiceResponse, type Config, type Context, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, type PaginatedResponse, type SearchRequest, type SearchRequestService, type Store, type ToggleActive, type UpdateStatusRequestRepository, type ValidationErrorItem, commonService, customOmit, findDifferences, getDynamicValue, getPattern, objectTo2DArray, toNumberOrNull, type updateStatusParams };
+export { type CacheAdapter, type CalculationRes, type ColValue, type CommonExcelRequest, type CommonFilterRequest, type CommonServiceResponse, type Config, type Context, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, type PaginatedResponse, type SearchRequest, type SearchRequestService, type Store, type ToggleActive, type UpdateStatusRequestRepository, type ValidationErrorItem, commonService, customOmit, findDifferences, getDynamicValue, getPattern, objectTo2DArray, toNumberOrNull, type updateStatusParams };

package/dist/index.d.ts

@@ -126,6 +126,8 @@ interface DropdownRequest {
     shortCode: string;
     searchColumns: string[];
     searchText?: string;
+    fixedSearch?: Record<string, ColValue>;
+    fixedNotSearch?: Record<string, ColValue>;
 }
 interface DropdownRequestService<T extends DynamicShortCode> extends DropdownRequest {
     shortCodeData: T;
@@ -280,4 +282,4 @@ interface CreateTransaction {
  */
 declare function findDifferences<T extends Record<string, any>>(obj1: T, obj2: T): CreateTransaction[];
 
-export { type CacheAdapter, type CalculationRes, type CommonExcelRequest, type CommonFilterRequest, type CommonServiceResponse, type Config, type Context, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, type PaginatedResponse, type SearchRequest, type SearchRequestService, type Store, type ToggleActive, type UpdateStatusRequestRepository, type ValidationErrorItem, commonService, customOmit, findDifferences, getDynamicValue, getPattern, objectTo2DArray, toNumberOrNull, type updateStatusParams };
+export { type CacheAdapter, type CalculationRes, type ColValue, type CommonExcelRequest, type CommonFilterRequest, type CommonServiceResponse, type Config, type Context, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, type PaginatedResponse, type SearchRequest, type SearchRequestService, type Store, type ToggleActive, type UpdateStatusRequestRepository, type ValidationErrorItem, commonService, customOmit, findDifferences, getDynamicValue, getPattern, objectTo2DArray, toNumberOrNull, type updateStatusParams };

package/dist/index.js

@@ -322,10 +322,17 @@ var commonRepository = (serviceDeps) => {
     async commonDropdownSearch({
       searchText,
       searchColumns,
-      shortCodeData
+      shortCodeData,
+      fixedSearch,
+      fixedNotSearch
     }) {
       logger.info("entering::commonSearch::repository");
       const tableName = shortCodeData.tableName;
+      const rootCondition = await this.generateRootCondition({
+        fixedSearch,
+        fixedNotSearch
+      });
+      const customWhereClause = { ...rootCondition };
       const whereClause = {};
       if (searchText && searchColumns.length > 0) {
         whereClause.OR = searchColumns.map((column) => {
@@ -352,7 +359,7 @@ var commonRepository = (serviceDeps) => {
         });
       }
       const query = {
-        where: { ...whereClause, ...fixWhere },
+        where: { ...whereClause, ...fixWhere, ...customWhereClause },
         select: selectClause
       };
       const results = await model.findMany(query);
@@ -456,18 +463,39 @@ var commonRepository = (serviceDeps) => {
       logger.info("exiting::commonUpdateStatus::repository");
       return results;
     },
-    async commonFunctionForFixedSearch({
-      searchText,
-      sortBy,
-      sortDir,
-      searchColumns,
-      // now [{ col: string, type: string }, ...]
+    async generateRootCondition({
       fixedSearch,
-      // now { [fieldName]: { type: string, value: any[] } }
       fixedNotSearch
-      // same structure
     }) {
-      logger.info("entering::fixedSearch::repository");
+      function mergeTopLevel(objA, objB) {
+        for (const k of Object.keys(objB)) {
+          if (objA[k] === void 0) {
+            objA[k] = objB[k];
+          } else {
+            objA[k] = deepMerge(objA[k], objB[k]);
+          }
+        }
+      }
+      function deepMerge(a, b) {
+        if (isPlainObject(a) && isPlainObject(b)) {
+          const result = { ...a };
+          for (const key of Object.keys(b)) {
+            if (result[key] === void 0) {
+              result[key] = b[key];
+            } else {
+              result[key] = deepMerge(result[key], b[key]);
+            }
+          }
+          return result;
+        }
+        if ((0, import_util2.isDeepStrictEqual)(a, b) || isPlainObject(b) && Object.keys(b).length === 0) {
+          return a;
+        }
+        if (isPlainObject(a) && Object.keys(a).length === 0) {
+          return b;
+        }
+        return { AND: [a, b] };
+      }
       const rootCondition = {};
       if (fixedSearch) {
         for (const [field, defObj] of Object.entries(fixedSearch)) {
@@ -502,35 +530,24 @@ var commonRepository = (serviceDeps) => {
           mergeTopLevel(rootCondition, cond);
         }
       }
-      function mergeTopLevel(objA, objB) {
-        for (const k of Object.keys(objB)) {
-          if (objA[k] === void 0) {
-            objA[k] = objB[k];
-          } else {
-            objA[k] = deepMerge(objA[k], objB[k]);
-          }
-        }
-      }
-      function deepMerge(a, b) {
-        if (isPlainObject(a) && isPlainObject(b)) {
-          const result = { ...a };
-          for (const key of Object.keys(b)) {
-            if (result[key] === void 0) {
-              result[key] = b[key];
-            } else {
-              result[key] = deepMerge(result[key], b[key]);
-            }
-          }
-          return result;
-        }
-        if ((0, import_util2.isDeepStrictEqual)(a, b) || isPlainObject(b) && Object.keys(b).length === 0) {
-          return a;
-        }
-        if (isPlainObject(a) && Object.keys(a).length === 0) {
-          return b;
-        }
-        return { AND: [a, b] };
-      }
+      return rootCondition;
+    },
+    async commonFunctionForFixedSearch({
+      searchText,
+      sortBy,
+      sortDir,
+      searchColumns,
+      // now [{ col: string, type: string }, ...]
+      fixedSearch,
+      // now { [fieldName]: { type: string, value: any[] } }
+      fixedNotSearch
+      // same structure
+    }) {
+      logger.info("entering::fixedSearch::repository");
+      const rootCondition = await this.generateRootCondition({
+        fixedSearch,
+        fixedNotSearch
+      });
       let searchOR;
       if (searchText && searchColumns && searchColumns.length > 0) {
         searchOR = [];

package/dist/index.mjs

@@ -280,10 +280,17 @@ var commonRepository = (serviceDeps) => {
     async commonDropdownSearch({
       searchText,
       searchColumns,
-      shortCodeData
+      shortCodeData,
+      fixedSearch,
+      fixedNotSearch
     }) {
       logger.info("entering::commonSearch::repository");
       const tableName = shortCodeData.tableName;
+      const rootCondition = await this.generateRootCondition({
+        fixedSearch,
+        fixedNotSearch
+      });
+      const customWhereClause = { ...rootCondition };
       const whereClause = {};
       if (searchText && searchColumns.length > 0) {
         whereClause.OR = searchColumns.map((column) => {
@@ -310,7 +317,7 @@ var commonRepository = (serviceDeps) => {
         });
       }
       const query = {
-        where: { ...whereClause, ...fixWhere },
+        where: { ...whereClause, ...fixWhere, ...customWhereClause },
         select: selectClause
       };
       const results = await model.findMany(query);
@@ -414,18 +421,39 @@ var commonRepository = (serviceDeps) => {
       logger.info("exiting::commonUpdateStatus::repository");
       return results;
     },
-    async commonFunctionForFixedSearch({
-      searchText,
-      sortBy,
-      sortDir,
-      searchColumns,
-      // now [{ col: string, type: string }, ...]
+    async generateRootCondition({
       fixedSearch,
-      // now { [fieldName]: { type: string, value: any[] } }
       fixedNotSearch
-      // same structure
     }) {
-      logger.info("entering::fixedSearch::repository");
+      function mergeTopLevel(objA, objB) {
+        for (const k of Object.keys(objB)) {
+          if (objA[k] === void 0) {
+            objA[k] = objB[k];
+          } else {
+            objA[k] = deepMerge(objA[k], objB[k]);
+          }
+        }
+      }
+      function deepMerge(a, b) {
+        if (isPlainObject(a) && isPlainObject(b)) {
+          const result = { ...a };
+          for (const key of Object.keys(b)) {
+            if (result[key] === void 0) {
+              result[key] = b[key];
+            } else {
+              result[key] = deepMerge(result[key], b[key]);
+            }
+          }
+          return result;
+        }
+        if (isDeepStrictEqual2(a, b) || isPlainObject(b) && Object.keys(b).length === 0) {
+          return a;
+        }
+        if (isPlainObject(a) && Object.keys(a).length === 0) {
+          return b;
+        }
+        return { AND: [a, b] };
+      }
       const rootCondition = {};
       if (fixedSearch) {
         for (const [field, defObj] of Object.entries(fixedSearch)) {
@@ -460,35 +488,24 @@ var commonRepository = (serviceDeps) => {
           mergeTopLevel(rootCondition, cond);
         }
       }
-      function mergeTopLevel(objA, objB) {
-        for (const k of Object.keys(objB)) {
-          if (objA[k] === void 0) {
-            objA[k] = objB[k];
-          } else {
-            objA[k] = deepMerge(objA[k], objB[k]);
-          }
-        }
-      }
-      function deepMerge(a, b) {
-        if (isPlainObject(a) && isPlainObject(b)) {
-          const result = { ...a };
-          for (const key of Object.keys(b)) {
-            if (result[key] === void 0) {
-              result[key] = b[key];
-            } else {
-              result[key] = deepMerge(result[key], b[key]);
-            }
-          }
-          return result;
-        }
-        if (isDeepStrictEqual2(a, b) || isPlainObject(b) && Object.keys(b).length === 0) {
-          return a;
-        }
-        if (isPlainObject(a) && Object.keys(a).length === 0) {
-          return b;
-        }
-        return { AND: [a, b] };
-      }
+      return rootCondition;
+    },
+    async commonFunctionForFixedSearch({
+      searchText,
+      sortBy,
+      sortDir,
+      searchColumns,
+      // now [{ col: string, type: string }, ...]
+      fixedSearch,
+      // now { [fieldName]: { type: string, value: any[] } }
+      fixedNotSearch
+      // same structure
+    }) {
+      logger.info("entering::fixedSearch::repository");
+      const rootCondition = await this.generateRootCondition({
+        fixedSearch,
+        fixedNotSearch
+      });
       let searchOR;
       if (searchText && searchColumns && searchColumns.length > 0) {
         searchOR = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",