av6-core 1.6.6 → 1.6.8

package/dist/index.d.mts

@@ -525,6 +525,7 @@ declare function customOmit<T extends object, K extends keyof T>(obj: T, keys: K
     omitted: Pick<T, 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 objectTo2DArray<T>(obj: Record<string, T>, maxCols: number): (string | T)[][];
 declare function toNumberOrNull(value: unknown): number | null;
 declare const getPattern: {
@@ -622,7 +623,6 @@ type EmitPayload = {
     service: string;
     shortCode: string;
     data?: Record<string, any>;
-    dataWp?: any[];
 };
 type ILogger = winston.Logger | Console;
 type NotificationEmitterDeps = {
@@ -694,4 +694,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, fromTimestampToSqlDatetime, getDynamicValue, 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, fromTimestampToSqlDatetime, getDynamicValue, getNestedValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.d.ts

@@ -525,6 +525,7 @@ declare function customOmit<T extends object, K extends keyof T>(obj: T, keys: K
     omitted: Pick<T, 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 objectTo2DArray<T>(obj: Record<string, T>, maxCols: number): (string | T)[][];
 declare function toNumberOrNull(value: unknown): number | null;
 declare const getPattern: {
@@ -622,7 +623,6 @@ type EmitPayload = {
     service: string;
     shortCode: string;
     data?: Record<string, any>;
-    dataWp?: any[];
 };
 type ILogger = winston.Logger | Console;
 type NotificationEmitterDeps = {
@@ -694,4 +694,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, fromTimestampToSqlDatetime, getDynamicValue, 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, fromTimestampToSqlDatetime, getDynamicValue, getNestedValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.js

@@ -39,6 +39,7 @@ __export(index_exports, {
   findDifferences: () => findDifferences,
   fromTimestampToSqlDatetime: () => fromTimestampToSqlDatetime,
   getDynamicValue: () => getDynamicValue,
+  getNestedValue: () => getNestedValue,
   getPattern: () => getPattern,
   interpolate: () => interpolate,
   objectTo2DArray: () => objectTo2DArray,
@@ -1329,6 +1330,15 @@ function getDynamicValue(obj, accessorKey) {
   }
   return result === void 0 ? null : result;
 }
+function getNestedValue(obj, path, defaultValue) {
+  if (!obj || !path) return defaultValue;
+  const normalizedPath = path.replace(/\[(\d+)\]/g, ".$1");
+  const result = normalizedPath.split(".").reduce((acc, key) => {
+    if (acc == null) return void 0;
+    return acc[key];
+  }, obj);
+  return result === void 0 ? defaultValue : result;
+}
 function objectTo2DArray(obj, maxCols) {
   if (maxCols < 2) {
     throw new Error("maxCols must be at least 2");
@@ -3168,9 +3178,9 @@ async function resolveAllRecipients(args) {
       }
       if (r.sourceType === "KEY_VALUE") {
         const recs = toArray(cfg.recipients).map((x) => {
-          const userIdVal = args.evtData?.[x.userId];
-          const level1Val = args.evtData?.[x.level1Id];
-          const level2Val = x.level2Id ? args.evtData?.[x.level2Id] : void 0;
+          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;
           return {
             userId: userIdVal != null ? Number(userIdVal) : null,
             level1Id: level1Val != null ? Number(level1Val) : null,
@@ -3205,7 +3215,7 @@ async function resolveAllRecipients(args) {
     }
     if (r.sourceType === "KEY_VALUE") {
       for (const k of toArray(cfg.recipients)) {
-        const v = args.evtData?.[k];
+        const v = getNestedValue(args.evtData, k);
         if (typeof v === "string") res[type].push(v);
         if (Array.isArray(v)) res[type].push(...v.filter((x) => typeof x === "string"));
       }
@@ -3379,7 +3389,7 @@ var WhatsAppProvider = class {
       }
     };
     if (inp.fileUrl) {
-      requestBody.template.headerValues = [inp.fileUrl];
+      requestBody.template.headerValues = inp.fileUrl;
       if (inp.fileName) requestBody.template.fileName = inp.fileName;
     }
     const headers = {
@@ -3816,6 +3826,10 @@ var NotificationService = class {
       this.logger.info("[NotificationService] WhatsApp: no recipients resolved");
       return;
     }
+    const message = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
+    const dataWp = tpl.extra?.bodyValues?.map((x) => getNestedValue(evt.data, x));
+    const fileUrls = tpl.extra?.fileUrls?.map((x) => getNestedValue(evt.data, x));
+    const fileName = getNestedValue(tpl.extra?.fileName);
     const apiKey = cfg.serviceEvent.wpApiKey ?? "";
     if (!apiKey.trim()) {
       await this.writeSystemFailureItem({
@@ -3840,9 +3854,11 @@ var NotificationService = class {
     const bulk = await this.sendWhatsappBulkSafe({
       provider: waProvider,
       recipients,
-      bodyValues: evt.dataWp ?? [],
+      bodyValues: dataWp ?? [],
       concurrency: 5,
-      includeMaster: Boolean(cfg.serviceEvent.masterPhone)
+      includeMaster: Boolean(cfg.serviceEvent.masterPhone),
+      fileName,
+      fileUrls
     });
     for (const it of bulk.items) {
       await this.prisma.eventDeliveryItem.create({
@@ -3850,8 +3866,7 @@ var NotificationService = class {
           deliveryId,
           notificationType: "WHATSAPP" /* WHATSAPP */,
           recipient: it.recipient,
-          messageContent: null,
-          // Interakt template; body content not stored
+          messageContent: message,
           thirdPartyResponse: it.meta ?? void 0,
           isSent: it.ok,
           sentAt: it.ok ? /* @__PURE__ */ new Date() : null,
@@ -3940,7 +3955,9 @@ var NotificationService = class {
           recipients: uniq,
           bodyValues: args.bodyValues,
           includeMaster: args.includeMaster,
-          concurrency: args.concurrency
+          concurrency: args.concurrency,
+          fileName: args.fileName,
+          fileUrl: args.fileUrls
         });
         const items2 = (bulkRes?.items ?? []).map((x) => ({
           recipient: String(x.recipient ?? ""),
@@ -4149,6 +4166,7 @@ var AuditProxy = class {
   findDifferences,
   fromTimestampToSqlDatetime,
   getDynamicValue,
+  getNestedValue,
   getPattern,
   interpolate,
   objectTo2DArray,

package/dist/index.mjs

@@ -1279,6 +1279,15 @@ function getDynamicValue(obj, accessorKey) {
   }
   return result === void 0 ? null : result;
 }
+function getNestedValue(obj, path, defaultValue) {
+  if (!obj || !path) return defaultValue;
+  const normalizedPath = path.replace(/\[(\d+)\]/g, ".$1");
+  const result = normalizedPath.split(".").reduce((acc, key) => {
+    if (acc == null) return void 0;
+    return acc[key];
+  }, obj);
+  return result === void 0 ? defaultValue : result;
+}
 function objectTo2DArray(obj, maxCols) {
   if (maxCols < 2) {
     throw new Error("maxCols must be at least 2");
@@ -3118,9 +3127,9 @@ async function resolveAllRecipients(args) {
       }
       if (r.sourceType === "KEY_VALUE") {
         const recs = toArray(cfg.recipients).map((x) => {
-          const userIdVal = args.evtData?.[x.userId];
-          const level1Val = args.evtData?.[x.level1Id];
-          const level2Val = x.level2Id ? args.evtData?.[x.level2Id] : void 0;
+          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;
           return {
             userId: userIdVal != null ? Number(userIdVal) : null,
             level1Id: level1Val != null ? Number(level1Val) : null,
@@ -3155,7 +3164,7 @@ async function resolveAllRecipients(args) {
     }
     if (r.sourceType === "KEY_VALUE") {
       for (const k of toArray(cfg.recipients)) {
-        const v = args.evtData?.[k];
+        const v = getNestedValue(args.evtData, k);
         if (typeof v === "string") res[type].push(v);
         if (Array.isArray(v)) res[type].push(...v.filter((x) => typeof x === "string"));
       }
@@ -3329,7 +3338,7 @@ var WhatsAppProvider = class {
       }
     };
     if (inp.fileUrl) {
-      requestBody.template.headerValues = [inp.fileUrl];
+      requestBody.template.headerValues = inp.fileUrl;
       if (inp.fileName) requestBody.template.fileName = inp.fileName;
     }
     const headers = {
@@ -3766,6 +3775,10 @@ var NotificationService = class {
       this.logger.info("[NotificationService] WhatsApp: no recipients resolved");
       return;
     }
+    const message = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
+    const dataWp = tpl.extra?.bodyValues?.map((x) => getNestedValue(evt.data, x));
+    const fileUrls = tpl.extra?.fileUrls?.map((x) => getNestedValue(evt.data, x));
+    const fileName = getNestedValue(tpl.extra?.fileName);
     const apiKey = cfg.serviceEvent.wpApiKey ?? "";
     if (!apiKey.trim()) {
       await this.writeSystemFailureItem({
@@ -3790,9 +3803,11 @@ var NotificationService = class {
     const bulk = await this.sendWhatsappBulkSafe({
       provider: waProvider,
       recipients,
-      bodyValues: evt.dataWp ?? [],
+      bodyValues: dataWp ?? [],
       concurrency: 5,
-      includeMaster: Boolean(cfg.serviceEvent.masterPhone)
+      includeMaster: Boolean(cfg.serviceEvent.masterPhone),
+      fileName,
+      fileUrls
     });
     for (const it of bulk.items) {
       await this.prisma.eventDeliveryItem.create({
@@ -3800,8 +3815,7 @@ var NotificationService = class {
           deliveryId,
           notificationType: "WHATSAPP" /* WHATSAPP */,
           recipient: it.recipient,
-          messageContent: null,
-          // Interakt template; body content not stored
+          messageContent: message,
           thirdPartyResponse: it.meta ?? void 0,
           isSent: it.ok,
           sentAt: it.ok ? /* @__PURE__ */ new Date() : null,
@@ -3890,7 +3904,9 @@ var NotificationService = class {
           recipients: uniq,
           bodyValues: args.bodyValues,
           includeMaster: args.includeMaster,
-          concurrency: args.concurrency
+          concurrency: args.concurrency,
+          fileName: args.fileName,
+          fileUrl: args.fileUrls
         });
         const items2 = (bulkRes?.items ?? []).map((x) => ({
           recipient: String(x.recipient ?? ""),
@@ -4098,6 +4114,7 @@ export {
   findDifferences,
   fromTimestampToSqlDatetime,
   getDynamicValue,
+  getNestedValue,
   getPattern,
   interpolate,
   objectTo2DArray,

package/package.json

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