av6-core 1.6.5 → 1.6.7

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: {
@@ -694,4 +695,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: {
@@ -694,4 +695,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"));
       }
@@ -3528,26 +3538,28 @@ var NotificationService = class {
   // Should-send checks
   // --------------------------------------------------------------------------------------
   shouldSendEmail(cfg) {
-    return Boolean(cfg.allowEmail && cfg.serviceEvent.allowEmail && cfg.emailTemplateId);
+    return Boolean(cfg.allowEmail && cfg.serviceEvent.allowEmail);
   }
   shouldSendSms(cfg) {
-    return Boolean(cfg.allowSms && cfg.serviceEvent.allowSms && cfg.smsTemplateId);
+    return Boolean(cfg.allowSms && cfg.serviceEvent.allowSms);
   }
   shouldSendWhatsapp(cfg) {
-    return Boolean(cfg.allowWhatsapp && cfg.serviceEvent.allowWhatsapp && cfg.wpTemplateId);
+    return Boolean(cfg.allowWhatsapp && cfg.serviceEvent.allowWhatsapp);
   }
   shouldSendApp(cfg) {
-    return Boolean(cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.appNotificationTemplateId);
+    return Boolean(cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification);
   }
   shouldSendWeb(cfg) {
-    return Boolean(cfg.allowWebNotification && cfg.serviceEvent.allowWebNotification && cfg.webNotificationTemplateId);
+    return Boolean(cfg.allowWebNotification && cfg.serviceEvent.allowWebNotification);
   }
   // --------------------------------------------------------------------------------------
   // Channel processors
   // --------------------------------------------------------------------------------------
   async processEmailChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    const tpl = await this.prisma.template.findUnique({ where: { id: cfg.emailTemplateId } });
+    const tpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "EMAIL" /* EMAIL */ }
+    });
     if (!tpl) return;
     const recipients = args.recipients;
     if (!recipients.length) {
@@ -3574,7 +3586,9 @@ var NotificationService = class {
   }
   async processSmsChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    const tpl = await this.prisma.template.findUnique({ where: { id: cfg.smsTemplateId } });
+    const tpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "SMS" /* SMS */ }
+    });
     if (!tpl) return;
     const recipients = args.recipients ?? [];
     if (!recipients.length) {
@@ -3650,12 +3664,11 @@ var NotificationService = class {
   }
   async processAppChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    const tpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationTemplateId } });
+    const tpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "APP_NOTIFICATION" /* APP_NOTIFICATION */ }
+    });
     if (!tpl) return;
-    let appUrlTpl = null;
-    if (cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.appNotificationUrlTemplateId) {
-      appUrlTpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationUrlTemplateId } });
-    }
+    let appUrlTpl = tpl.url;
     const userIds = (args.recipients ?? []).map((x) => Number(x)).filter((n) => Number.isFinite(n) && n > 0);
     if (!userIds.length) {
       this.logger.info("[NotificationService] APP: no userIds resolved");
@@ -3663,7 +3676,7 @@ var NotificationService = class {
     }
     const title = renderTemplate(tpl.subject ?? "", evt.data ?? {});
     const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
-    const route = appUrlTpl ? renderTemplate(appUrlTpl.bodyText ?? "", evt.data ?? {}) : null;
+    const route = appUrlTpl ? renderTemplate(appUrlTpl ?? "", evt.data ?? {}) : null;
     const tokensMap = await this.getExpoTokensByUserIds(userIds);
     const expoProvider = new ExpoAppNotificationProvider(
       this.logger,
@@ -3742,21 +3755,21 @@ var NotificationService = class {
   }
   async processWebChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    let webTpl = null;
-    if (cfg.allowWebNotification && cfg.serviceEvent.allowWebNotification && cfg.webNotificationTemplateId) {
-      webTpl = await this.prisma.template.findUnique({ where: { id: cfg.webNotificationTemplateId } });
-    }
-    let webUrlTpl = null;
-    if (cfg.allowWebNotification && cfg.serviceEvent.allowWebNotification && cfg.webNotificationUrlTemplateId) {
-      webUrlTpl = await this.prisma.template.findUnique({ where: { id: cfg.webNotificationUrlTemplateId } });
+    const webTpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "WEB_NOTIFICATION" /* WEB_NOTIFICATION */ }
+    });
+    if (!webTpl) {
+      this.logger.error("[NotificationService] WEB: no template found");
+      return;
     }
+    let webUrlTpl = webTpl?.url;
     const recipients = args.recipients;
     if (!recipients.length) {
-      this.logger.info("[NotificationService] WEB: no recipients resolved");
+      this.logger.error("[NotificationService] WEB: no recipients resolved");
       return;
     }
     const message = renderTemplate(webTpl.bodyText ?? "", evt.data ?? {});
-    const link = webUrlTpl ? renderTemplate(webUrlTpl.bodyText ?? "", evt.data ?? {}) : null;
+    const link = webUrlTpl ? renderTemplate(webUrlTpl ?? "", evt.data ?? {}) : null;
     const provider = new WebNotificationProvider(this.prisma, this.logger);
     const bulk = await provider.sendBulk({
       source: evt.service,
@@ -3804,7 +3817,9 @@ var NotificationService = class {
   }
   async processWhatsappChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    const tpl = await this.prisma.template.findUnique({ where: { id: cfg.wpTemplateId } });
+    const tpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "WHATSAPP" /* WHATSAPP */ }
+    });
     if (!tpl) return;
     const recipients = args.recipients;
     if (!recipients.length) {
@@ -4144,6 +4159,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"));
       }
@@ -3478,26 +3487,28 @@ var NotificationService = class {
   // Should-send checks
   // --------------------------------------------------------------------------------------
   shouldSendEmail(cfg) {
-    return Boolean(cfg.allowEmail && cfg.serviceEvent.allowEmail && cfg.emailTemplateId);
+    return Boolean(cfg.allowEmail && cfg.serviceEvent.allowEmail);
   }
   shouldSendSms(cfg) {
-    return Boolean(cfg.allowSms && cfg.serviceEvent.allowSms && cfg.smsTemplateId);
+    return Boolean(cfg.allowSms && cfg.serviceEvent.allowSms);
   }
   shouldSendWhatsapp(cfg) {
-    return Boolean(cfg.allowWhatsapp && cfg.serviceEvent.allowWhatsapp && cfg.wpTemplateId);
+    return Boolean(cfg.allowWhatsapp && cfg.serviceEvent.allowWhatsapp);
   }
   shouldSendApp(cfg) {
-    return Boolean(cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.appNotificationTemplateId);
+    return Boolean(cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification);
   }
   shouldSendWeb(cfg) {
-    return Boolean(cfg.allowWebNotification && cfg.serviceEvent.allowWebNotification && cfg.webNotificationTemplateId);
+    return Boolean(cfg.allowWebNotification && cfg.serviceEvent.allowWebNotification);
   }
   // --------------------------------------------------------------------------------------
   // Channel processors
   // --------------------------------------------------------------------------------------
   async processEmailChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    const tpl = await this.prisma.template.findUnique({ where: { id: cfg.emailTemplateId } });
+    const tpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "EMAIL" /* EMAIL */ }
+    });
     if (!tpl) return;
     const recipients = args.recipients;
     if (!recipients.length) {
@@ -3524,7 +3535,9 @@ var NotificationService = class {
   }
   async processSmsChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    const tpl = await this.prisma.template.findUnique({ where: { id: cfg.smsTemplateId } });
+    const tpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "SMS" /* SMS */ }
+    });
     if (!tpl) return;
     const recipients = args.recipients ?? [];
     if (!recipients.length) {
@@ -3600,12 +3613,11 @@ var NotificationService = class {
   }
   async processAppChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    const tpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationTemplateId } });
+    const tpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "APP_NOTIFICATION" /* APP_NOTIFICATION */ }
+    });
     if (!tpl) return;
-    let appUrlTpl = null;
-    if (cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.appNotificationUrlTemplateId) {
-      appUrlTpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationUrlTemplateId } });
-    }
+    let appUrlTpl = tpl.url;
     const userIds = (args.recipients ?? []).map((x) => Number(x)).filter((n) => Number.isFinite(n) && n > 0);
     if (!userIds.length) {
       this.logger.info("[NotificationService] APP: no userIds resolved");
@@ -3613,7 +3625,7 @@ var NotificationService = class {
     }
     const title = renderTemplate(tpl.subject ?? "", evt.data ?? {});
     const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
-    const route = appUrlTpl ? renderTemplate(appUrlTpl.bodyText ?? "", evt.data ?? {}) : null;
+    const route = appUrlTpl ? renderTemplate(appUrlTpl ?? "", evt.data ?? {}) : null;
     const tokensMap = await this.getExpoTokensByUserIds(userIds);
     const expoProvider = new ExpoAppNotificationProvider(
       this.logger,
@@ -3692,21 +3704,21 @@ var NotificationService = class {
   }
   async processWebChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    let webTpl = null;
-    if (cfg.allowWebNotification && cfg.serviceEvent.allowWebNotification && cfg.webNotificationTemplateId) {
-      webTpl = await this.prisma.template.findUnique({ where: { id: cfg.webNotificationTemplateId } });
-    }
-    let webUrlTpl = null;
-    if (cfg.allowWebNotification && cfg.serviceEvent.allowWebNotification && cfg.webNotificationUrlTemplateId) {
-      webUrlTpl = await this.prisma.template.findUnique({ where: { id: cfg.webNotificationUrlTemplateId } });
+    const webTpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "WEB_NOTIFICATION" /* WEB_NOTIFICATION */ }
+    });
+    if (!webTpl) {
+      this.logger.error("[NotificationService] WEB: no template found");
+      return;
     }
+    let webUrlTpl = webTpl?.url;
     const recipients = args.recipients;
     if (!recipients.length) {
-      this.logger.info("[NotificationService] WEB: no recipients resolved");
+      this.logger.error("[NotificationService] WEB: no recipients resolved");
       return;
     }
     const message = renderTemplate(webTpl.bodyText ?? "", evt.data ?? {});
-    const link = webUrlTpl ? renderTemplate(webUrlTpl.bodyText ?? "", evt.data ?? {}) : null;
+    const link = webUrlTpl ? renderTemplate(webUrlTpl ?? "", evt.data ?? {}) : null;
     const provider = new WebNotificationProvider(this.prisma, this.logger);
     const bulk = await provider.sendBulk({
       source: evt.service,
@@ -3754,7 +3766,9 @@ var NotificationService = class {
   }
   async processWhatsappChannel(args) {
     const { cfg, evt, deliveryId } = args;
-    const tpl = await this.prisma.template.findUnique({ where: { id: cfg.wpTemplateId } });
+    const tpl = await this.prisma.template.findFirst({
+      where: { eventConfigId: cfg.id, templateType: "WHATSAPP" /* WHATSAPP */ }
+    });
     if (!tpl) return;
     const recipients = args.recipients;
     if (!recipients.length) {
@@ -4093,6 +4107,7 @@ export {
   findDifferences,
   fromTimestampToSqlDatetime,
   getDynamicValue,
+  getNestedValue,
   getPattern,
   interpolate,
   objectTo2DArray,

package/package.json

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