av6-core 1.7.6 → 1.7.8

package/dist/index.d.mts

@@ -526,6 +526,7 @@ declare function customOmit<T extends object, K extends keyof T>(obj: T, keys: K
 };
 declare function getDynamicValue(obj: Record<string, any> | null | undefined, accessorKey: string): any | null;
 declare function getNestedValue<T = unknown>(obj: unknown, path?: string | null, defaultValue?: T): T | undefined;
+declare function getNestedValueV2<T = unknown>(obj: unknown, path?: string | null, defaultValue?: T): T | undefined;
 declare function objectTo2DArray<T>(obj: Record<string, T>, maxCols: number): (string | T)[][];
 declare function toNumberOrNull(value: unknown): number | null;
 declare const getPattern: {
@@ -701,4 +702,4 @@ declare class AuditProxy<Module extends string = "OPD" | "PROCEDURE" | "GENERAL_
     createAuditedService<T extends object>(serviceName: string, service: T): T;
 }
 
-export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type BulkAtomicResult, type BulkConfig, type BulkConflictConfig, type BulkOnConflict, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type CrudContext, type CrudDelegate, type DataType, type DeepMerge, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DtoFromMapping, type DtoNullOnMissing, type DynamicCreateInput, type DynamicCrudConfig, type DynamicShortCode, type DynamicUpdateInput, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FieldConfig, type FieldRules, type FieldType, type FixedMap, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type LogicNode, type Mapper, type MergeAll, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type Op, type PaginatedResponse, type PathToSelectWithSelect, type PathValue, type PathsToSelectWithSelect, type Presence, type Recipient, type RelationConfig, type RelationStrategy, type RelationWriteConfig, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type SingleValidationMapping, type SourcePath, type Store, type ToggleActive, type TxClient, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UnionToIntersection, type UniqueConfig, type UpdateConfigByCodeInput, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, formatDatesDeep, fromTimestampToSqlDatetime, getDynamicValue, getNestedValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };
+export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type BulkAtomicResult, type BulkConfig, type BulkConflictConfig, type BulkOnConflict, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type CrudContext, type CrudDelegate, type DataType, type DeepMerge, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DtoFromMapping, type DtoNullOnMissing, type DynamicCreateInput, type DynamicCrudConfig, type DynamicShortCode, type DynamicUpdateInput, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FieldConfig, type FieldRules, type FieldType, type FixedMap, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type LogicNode, type Mapper, type MergeAll, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type Op, type PaginatedResponse, type PathToSelectWithSelect, type PathValue, type PathsToSelectWithSelect, type Presence, type Recipient, type RelationConfig, type RelationStrategy, type RelationWriteConfig, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type SingleValidationMapping, type SourcePath, type Store, type ToggleActive, type TxClient, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UnionToIntersection, type UniqueConfig, type UpdateConfigByCodeInput, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, formatDatesDeep, fromTimestampToSqlDatetime, getDynamicValue, getNestedValue, getNestedValueV2, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.d.ts

@@ -526,6 +526,7 @@ declare function customOmit<T extends object, K extends keyof T>(obj: T, keys: K
 };
 declare function getDynamicValue(obj: Record<string, any> | null | undefined, accessorKey: string): any | null;
 declare function getNestedValue<T = unknown>(obj: unknown, path?: string | null, defaultValue?: T): T | undefined;
+declare function getNestedValueV2<T = unknown>(obj: unknown, path?: string | null, defaultValue?: T): T | undefined;
 declare function objectTo2DArray<T>(obj: Record<string, T>, maxCols: number): (string | T)[][];
 declare function toNumberOrNull(value: unknown): number | null;
 declare const getPattern: {
@@ -701,4 +702,4 @@ declare class AuditProxy<Module extends string = "OPD" | "PROCEDURE" | "GENERAL_
     createAuditedService<T extends object>(serviceName: string, service: T): T;
 }
 
-export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type BulkAtomicResult, type BulkConfig, type BulkConflictConfig, type BulkOnConflict, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type CrudContext, type CrudDelegate, type DataType, type DeepMerge, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DtoFromMapping, type DtoNullOnMissing, type DynamicCreateInput, type DynamicCrudConfig, type DynamicShortCode, type DynamicUpdateInput, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FieldConfig, type FieldRules, type FieldType, type FixedMap, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type LogicNode, type Mapper, type MergeAll, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type Op, type PaginatedResponse, type PathToSelectWithSelect, type PathValue, type PathsToSelectWithSelect, type Presence, type Recipient, type RelationConfig, type RelationStrategy, type RelationWriteConfig, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type SingleValidationMapping, type SourcePath, type Store, type ToggleActive, type TxClient, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UnionToIntersection, type UniqueConfig, type UpdateConfigByCodeInput, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, formatDatesDeep, fromTimestampToSqlDatetime, getDynamicValue, getNestedValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };
+export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type BulkAtomicResult, type BulkConfig, type BulkConflictConfig, type BulkOnConflict, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type CrudContext, type CrudDelegate, type DataType, type DeepMerge, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DtoFromMapping, type DtoNullOnMissing, type DynamicCreateInput, type DynamicCrudConfig, type DynamicShortCode, type DynamicUpdateInput, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FieldConfig, type FieldRules, type FieldType, type FixedMap, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type LogicNode, type Mapper, type MergeAll, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type Op, type PaginatedResponse, type PathToSelectWithSelect, type PathValue, type PathsToSelectWithSelect, type Presence, type Recipient, type RelationConfig, type RelationStrategy, type RelationWriteConfig, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type SingleValidationMapping, type SourcePath, type Store, type ToggleActive, type TxClient, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UnionToIntersection, type UniqueConfig, type UpdateConfigByCodeInput, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, formatDatesDeep, fromTimestampToSqlDatetime, getDynamicValue, getNestedValue, getNestedValueV2, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.js

@@ -41,6 +41,7 @@ __export(index_exports, {
   fromTimestampToSqlDatetime: () => fromTimestampToSqlDatetime,
   getDynamicValue: () => getDynamicValue,
   getNestedValue: () => getNestedValue,
+  getNestedValueV2: () => getNestedValueV2,
   getPattern: () => getPattern,
   interpolate: () => interpolate,
   objectTo2DArray: () => objectTo2DArray,
@@ -1343,6 +1344,25 @@ function getNestedValue(obj, path, defaultValue) {
   }, obj);
   return result === void 0 ? defaultValue : result;
 }
+function getNestedValueV2(obj, path, defaultValue) {
+  if (!obj || !path) return defaultValue;
+  const normalizedPath = path.replace(/\[(\d+)\]/g, ".$1");
+  const keys = normalizedPath.split(".");
+  const resolve = (current, index) => {
+    if (current == null) return void 0;
+    if (index >= keys.length) return current;
+    const key = keys[index];
+    if (key.endsWith("[]")) {
+      const arrayKey = key.replace("[]", "");
+      const arr = current[arrayKey];
+      if (!Array.isArray(arr)) return void 0;
+      return arr.map((item) => resolve(item, index + 1));
+    }
+    return resolve(current[key], index + 1);
+  };
+  const result = resolve(obj, 0);
+  return result === void 0 ? defaultValue : result;
+}
 function objectTo2DArray(obj, maxCols) {
   if (maxCols < 2) {
     throw new Error("maxCols must be at least 2");
@@ -3204,9 +3224,9 @@ async function resolveAllRecipients(args) {
       }
       if (r.sourceType === "KEY_VALUE") {
         const recs = toArray(cfg.recipients).map((x) => {
-          const userIdVal = getNestedValue(args.evtData, x.userId);
-          const level1Val = getNestedValue(args.evtData, x.level1Id);
-          const level2Val = x.level2Id ? getNestedValue(args.evtData, x.level2Id) : void 0;
+          const userIdVal = getNestedValueV2(args.evtData, x.userId);
+          const level1Val = getNestedValueV2(args.evtData, x.level1Id);
+          const level2Val = x.level2Id ? getNestedValueV2(args.evtData, x.level2Id) : void 0;
           return {
             userId: userIdVal != null ? Number(userIdVal) : null,
             level1Id: level1Val != null ? Number(level1Val) : null,
@@ -3241,7 +3261,7 @@ async function resolveAllRecipients(args) {
     }
     if (r.sourceType === "KEY_VALUE") {
       for (const k of toArray(cfg.recipients)) {
-        const v = getNestedValue(args.evtData, k);
+        const v = getNestedValueV2(args.evtData, k);
         if (typeof v === "string") res[type].push(v);
         if (Array.isArray(v)) res[type].push(...v.filter((x) => typeof x === "string"));
       }
@@ -3934,7 +3954,7 @@ var NotificationService = class {
       fileUrls
     });
     for (const it of bulk.items) {
-      await this.prisma.eventDeliveryItem.create({
+      const deliveryItem = await this.prisma.eventDeliveryItem.create({
         data: {
           deliveryId,
           notificationType: "WHATSAPP" /* WHATSAPP */,
@@ -3947,6 +3967,15 @@ var NotificationService = class {
           error: it.ok ? null : it.error ?? "failed"
         }
       });
+      if (it.ok && tpl.webHookUrl) {
+        const res = await fetch(tpl.webHookUrl, {
+          method: "POST",
+          body: JSON.stringify({ id: deliveryItem.id })
+        });
+        if (!res.ok) {
+          this.logger.error("[NotificationService] WhatsApp webhook failed", res.statusText);
+        }
+      }
     }
   }
   // --------------------------------------------------------------------------------------
@@ -4243,6 +4272,7 @@ var AuditProxy = class {
   fromTimestampToSqlDatetime,
   getDynamicValue,
   getNestedValue,
+  getNestedValueV2,
   getPattern,
   interpolate,
   objectTo2DArray,

package/dist/index.mjs

@@ -1291,6 +1291,25 @@ function getNestedValue(obj, path, defaultValue) {
   }, obj);
   return result === void 0 ? defaultValue : result;
 }
+function getNestedValueV2(obj, path, defaultValue) {
+  if (!obj || !path) return defaultValue;
+  const normalizedPath = path.replace(/\[(\d+)\]/g, ".$1");
+  const keys = normalizedPath.split(".");
+  const resolve = (current, index) => {
+    if (current == null) return void 0;
+    if (index >= keys.length) return current;
+    const key = keys[index];
+    if (key.endsWith("[]")) {
+      const arrayKey = key.replace("[]", "");
+      const arr = current[arrayKey];
+      if (!Array.isArray(arr)) return void 0;
+      return arr.map((item) => resolve(item, index + 1));
+    }
+    return resolve(current[key], index + 1);
+  };
+  const result = resolve(obj, 0);
+  return result === void 0 ? defaultValue : result;
+}
 function objectTo2DArray(obj, maxCols) {
   if (maxCols < 2) {
     throw new Error("maxCols must be at least 2");
@@ -3152,9 +3171,9 @@ async function resolveAllRecipients(args) {
       }
       if (r.sourceType === "KEY_VALUE") {
         const recs = toArray(cfg.recipients).map((x) => {
-          const userIdVal = getNestedValue(args.evtData, x.userId);
-          const level1Val = getNestedValue(args.evtData, x.level1Id);
-          const level2Val = x.level2Id ? getNestedValue(args.evtData, x.level2Id) : void 0;
+          const userIdVal = getNestedValueV2(args.evtData, x.userId);
+          const level1Val = getNestedValueV2(args.evtData, x.level1Id);
+          const level2Val = x.level2Id ? getNestedValueV2(args.evtData, x.level2Id) : void 0;
           return {
             userId: userIdVal != null ? Number(userIdVal) : null,
             level1Id: level1Val != null ? Number(level1Val) : null,
@@ -3189,7 +3208,7 @@ async function resolveAllRecipients(args) {
     }
     if (r.sourceType === "KEY_VALUE") {
       for (const k of toArray(cfg.recipients)) {
-        const v = getNestedValue(args.evtData, k);
+        const v = getNestedValueV2(args.evtData, k);
         if (typeof v === "string") res[type].push(v);
         if (Array.isArray(v)) res[type].push(...v.filter((x) => typeof x === "string"));
       }
@@ -3882,7 +3901,7 @@ var NotificationService = class {
       fileUrls
     });
     for (const it of bulk.items) {
-      await this.prisma.eventDeliveryItem.create({
+      const deliveryItem = await this.prisma.eventDeliveryItem.create({
         data: {
           deliveryId,
           notificationType: "WHATSAPP" /* WHATSAPP */,
@@ -3895,6 +3914,15 @@ var NotificationService = class {
           error: it.ok ? null : it.error ?? "failed"
         }
       });
+      if (it.ok && tpl.webHookUrl) {
+        const res = await fetch(tpl.webHookUrl, {
+          method: "POST",
+          body: JSON.stringify({ id: deliveryItem.id })
+        });
+        if (!res.ok) {
+          this.logger.error("[NotificationService] WhatsApp webhook failed", res.statusText);
+        }
+      }
     }
   }
   // --------------------------------------------------------------------------------------
@@ -4190,6 +4218,7 @@ export {
   fromTimestampToSqlDatetime,
   getDynamicValue,
   getNestedValue,
+  getNestedValueV2,
   getPattern,
   interpolate,
   objectTo2DArray,

package/package.json

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