av6-core 1.4.8 → 1.4.10

package/dist/index.js

@@ -2196,6 +2196,15 @@ var uinConfigService = (uinDeps) => {
   };
 };
 
+// src/types/notification.ts
+var TemplateType = /* @__PURE__ */ ((TemplateType2) => {
+  TemplateType2["EMAIL"] = "EMAIL";
+  TemplateType2["SMS"] = "SMS";
+  TemplateType2["WHATSAPP"] = "WHATSAPP";
+  TemplateType2["APP_NOTIFICATION"] = "APP_NOTIFICATION";
+  return TemplateType2;
+})(TemplateType || {});
+
 // src/providers/app.provider.ts
 var AppNotificationProvider = class {
   async send(args) {
@@ -2226,7 +2235,7 @@ var AppNotificationProvider = class {
 // src/providers/email.providers.ts
 var import_nodemailer = __toESM(require("nodemailer"));
 var EmailProvider = class {
-  constructor(prisma, logger = console, serviceDomain = "FIXUJI", EMAIL_USERNAME = "info@aerialview6.com") {
+  constructor(prisma, logger = console, serviceDomain = "LEVEL2", EMAIL_USERNAME = "info@aerialview6.com") {
     this.prisma = prisma;
     this.logger = logger;
     this.serviceDomain = serviceDomain;
@@ -2483,101 +2492,256 @@ function normalizeEmail(v) {
 function normalizePhone(v) {
   return v.replace(/[^\d]/g, "");
 }
-function normalize(t, v) {
+function initRes() {
+  return {
+    ["EMAIL" /* EMAIL */]: [],
+    ["SMS" /* SMS */]: [],
+    ["WHATSAPP" /* WHATSAPP */]: [],
+    ["APP_NOTIFICATION" /* APP_NOTIFICATION */]: []
+  };
+}
+function normalizeByType(type, v) {
   if (!v) return "";
-  if (t === "EMAIL") return normalizeEmail(v);
-  if (t === "APP_NOTIFICATION") return v.trim();
+  if (type === "EMAIL" /* EMAIL */) return normalizeEmail(v);
+  if (type === "APP_NOTIFICATION" /* APP_NOTIFICATION */) return v.trim();
   return normalizePhone(v);
 }
-async function pickStaffValues(prisma, staffIds, field) {
-  const staff = await prisma.staff.findMany({
-    where: { id: { in: staffIds } },
-    select: { email: true, contactNo: true, userId: true, isActive: true }
-  });
-  const out = [];
-  for (const s of staff) {
-    if (field === "EMAIL") out.push(s.email ?? "");
-    if (field === "CONTACT_NO") out.push(s.contactNo ?? "");
-    if (field === "USER_ID") out.push(s.userId ? String(s.userId) : "");
-  }
-  return out;
+function pickFromStaffRow(type, valueField, row) {
+  if (valueField === "EMAIL") return row.email ?? "";
+  if (valueField === "CONTACT_NO") return row.contactNo ?? "";
+  if (valueField === "USER_ID") return row.userId != null ? String(row.userId) : "";
+  return type === "EMAIL" /* EMAIL */ ? row.email ?? "" : row.contactNo ?? "";
 }
-async function resolveRecipients(args) {
+var getUsersFromRoleAndLevel1Level2 = async (args) => {
+  switch (args.serviceDomain) {
+    case "FIXUJI":
+      const users = await args.prisma.userAreaMapping.findMany({
+        where: {
+          areaId: args.level1Ids.length ? {
+            in: args.level1Ids
+          } : void 0,
+          isActive: true,
+          userAreaDeptMappings: {
+            some: {
+              deptId: args.level2Ids.length ? {
+                in: args.level2Ids
+              } : void 0,
+              isActive: true,
+              userRoleMappings: {
+                some: {
+                  roleId: {
+                    in: args.roles
+                  },
+                  isActive: true
+                }
+              }
+            }
+          }
+        },
+        select: {
+          userId: true
+        },
+        distinct: ["userId"]
+      });
+      const userIds = users.map((r) => r.userId);
+      return userIds;
+    case "AV6": {
+      const { roles, level1Ids } = args;
+      const result = await args.prisma.$queryRawUnsafe(
+        `
+          SELECT
+                distinct scc.staff_id AS staff_id
+            FROM
+                staff_roles sr
+            LEFT JOIN staff_collection_center scc 
+                        ON
+                scc.staff_id = sr.staff_id
+                AND scc.staff_id = sr.staff_id
+            WHERE
+                sr.is_active = 1
+                and scc.is_active = 1
+            ${roles.length ? `AND sr.role_id IN (${roles.map(() => "?").join(",")})` : ""}
+            ${level1Ids.length ? `AND scc.collection_center_id IN (${level1Ids.map(() => "?").join(",")})` : ""}
+        `,
+        ...roles,
+        ...level1Ids
+      );
+      const staffIds = result.map((r) => r.staff_id);
+      return staffIds;
+    }
+    default: {
+      const users2 = await args.prisma.userLevel1Mapping.findMany({
+        where: {
+          level1Id: {
+            in: args.level1Ids.length ? {
+              in: args.level1Ids
+            } : void 0
+          },
+          isActive: true,
+          userLevel1Level2Mappings: {
+            some: {
+              level2Id: {
+                in: args.level2Ids.length ? {
+                  in: args.level2Ids
+                } : void 0
+              },
+              isActive: true,
+              userRoleMappings: {
+                some: {
+                  roleId: {
+                    in: args.roles
+                  },
+                  isActive: true
+                }
+              }
+            }
+          }
+        },
+        select: {
+          userId: true
+        },
+        distinct: ["userId"]
+      });
+      const userIds2 = users2.map((r) => r.userId);
+      return userIds2;
+    }
+  }
+};
+var getStaffInfoFromStaffIds = async (args) => {
+  let staffById = /* @__PURE__ */ new Map();
+  if (args.staffIds.length) {
+    switch (args.serviceDomain) {
+      case "AV6":
+        const staffRows = await args.prisma.staff.findMany({
+          where: { id: { in: args.staffIds } },
+          select: { id: true, email: true, contactNo: true }
+        });
+        staffById = new Map(
+          staffRows.map((s) => [s.id, { email: s.email ?? null, contactNo: s.contactNo ?? null, userId: null }])
+        );
+        break;
+      case "LEVEL2": {
+        const result2 = await args.prisma.user.findMany({
+          where: {
+            id: {
+              in: args.staffIds
+            },
+            isActive: true
+          },
+          select: {
+            phoneNumber: true,
+            email: true
+          }
+        });
+        staffById = new Map(
+          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+        );
+        break;
+      }
+      default:
+        const result = await args.prisma.user.findMany({
+          where: {
+            id: {
+              in: args.staffIds
+            },
+            isActive: true
+          },
+          select: {
+            phoneNumber: true,
+            email: true
+          }
+        });
+        staffById = new Map(
+          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+        );
+        break;
+    }
+  }
+  return staffById;
+};
+async function resolveAllRecipients(args) {
+  const res = initRes();
   const rules = await args.prisma.eventRecipientRule.findMany({
-    where: { eventConfigId: args.eventConfig.id, templateType: args.templateType, isActive: true },
-    orderBy: { sortOrder: "asc" }
+    where: { eventConfigId: args.eventConfig.id, isActive: true },
+    orderBy: [{ templateType: "asc" }, { sortOrder: "asc" }]
+  });
+  const staffIdsFromStaffRules = /* @__PURE__ */ new Set();
+  const roleIdsNeeded = /* @__PURE__ */ new Set();
+  const level1IdsNeeded = /* @__PURE__ */ new Set();
+  const level2IdsNeeded = /* @__PURE__ */ new Set();
+  const onlyActiveByRuleId = /* @__PURE__ */ new Map();
+  for (const r of rules) {
+    const cfg = r.config ?? {};
+    if (r.sourceType === "STAFFS") {
+      for (const id of toArray(cfg.userIds)) staffIdsFromStaffRules.add(Number(id));
+    }
+    if (r.sourceType === "ROLES") {
+      for (const id of toArray(cfg.roleIds)) roleIdsNeeded.add(Number(id));
+      onlyActiveByRuleId.set(r.id, cfg.onlyActive ?? true);
+    }
+    for (const id of toArray(cfg.level1Ids)) level1IdsNeeded.add(Number(id));
+    for (const id of toArray(cfg.level2Ids)) level2IdsNeeded.add(Number(id));
+  }
+  const staffIdsFromRoleRules = /* @__PURE__ */ new Set();
+  const serviceDomain = args.eventConfig.serviceEvent.serviceDomain;
+  if (roleIdsNeeded.size) {
+    const mappings = await getUsersFromRoleAndLevel1Level2({
+      prisma: args.prisma,
+      roles: Array.from(roleIdsNeeded),
+      level1Ids: Array.from(level1IdsNeeded),
+      level2Ids: Array.from(level2IdsNeeded),
+      serviceDomain
+    });
+    for (const id of mappings) {
+      staffIdsFromRoleRules.add(Number(id));
+    }
+  }
+  const allStaffIds = Array.from(
+    /* @__PURE__ */ new Set([...Array.from(staffIdsFromStaffRules), ...Array.from(staffIdsFromRoleRules)])
+  );
+  const staffById = await getStaffInfoFromStaffIds({
+    prisma: args.prisma,
+    staffIds: allStaffIds,
+    serviceDomain
   });
-  const out = [];
   for (const r of rules) {
+    const type = r.templateType;
     const cfg = r.config ?? {};
-    const valueField = cfg.valueField ?? defaultValueField(args.templateType);
+    const valueField = cfg.valueField ?? defaultValueField(type);
     if (r.sourceType === "HARDCODE") {
-      out.push(...toArray(cfg.recipients).map(String));
+      for (const v of toArray(cfg.recipients)) res[type].push(String(v));
       continue;
     }
     if (r.sourceType === "KEY_VALUE") {
-      const keys = toArray(cfg.keys);
-      for (const k of keys) {
+      for (const k of toArray(cfg.keys)) {
         const v = args.evtData?.[k];
-        if (typeof v === "string") out.push(v);
-        if (Array.isArray(v)) out.push(...v.filter((x) => typeof x === "string"));
+        if (typeof v === "string") res[type].push(v);
+        if (Array.isArray(v)) res[type].push(...v.filter((x) => typeof x === "string"));
       }
       continue;
     }
     if (r.sourceType === "STAFFS") {
-      const staffIds = toArray(cfg.staffIds);
-      const userIds = toArray(cfg.userIds);
-      const onlyActive = cfg.onlyActive ?? true;
-      let resolvedStaffIds = [];
-      if (staffIds.length) {
-        resolvedStaffIds = staffIds;
-      } else if (userIds.length) {
-        const staff = await args.prisma.staff.findMany({
-          where: {
-            userId: { in: userIds },
-            ...onlyActive ? { isActive: 1 } : {}
-          },
-          select: { id: true }
-        });
-        resolvedStaffIds = staff.map((s) => s.id);
+      const userIds = toArray(cfg.userIds).map(Number);
+      for (const sid of userIds) {
+        const s = staffById.get(sid);
+        if (!s) continue;
+        res[type].push(pickFromStaffRow(type, valueField, s));
       }
-      if (!resolvedStaffIds.length) continue;
-      if (onlyActive && staffIds.length) {
-        const staff = await args.prisma.staff.findMany({
-          where: { id: { in: resolvedStaffIds }, isActive: 1 },
-          select: { id: true }
-        });
-        resolvedStaffIds = staff.map((s) => s.id);
-      }
-      out.push(...await pickStaffValues(args.prisma, resolvedStaffIds, valueField));
       continue;
     }
     if (r.sourceType === "ROLES") {
-      const roleIds = toArray(cfg.roleIds);
-      const onlyActive = cfg.onlyActive ?? true;
-      if (!roleIds.length) continue;
-      const mappings = await args.prisma.staff_roles.findMany({
-        where: {
-          role_id: { in: roleIds },
-          ...onlyActive ? { is_active: 1 } : {}
-        },
-        select: { staff_id: true }
-      });
-      let staffIds = mappings.map((m) => m.staff_id).filter(Boolean);
-      if (onlyActive && staffIds.length) {
-        const staff = await args.prisma.staff.findMany({
-          where: { id: { in: staffIds }, isActive: 1 },
-          select: { id: true }
-        });
-        staffIds = staff.map((s) => s.id);
+      for (const sid of staffIdsFromRoleRules) {
+        const s = staffById.get(sid);
+        if (!s) continue;
+        res[type].push(pickFromStaffRow(type, valueField, s));
       }
-      if (!staffIds.length) continue;
-      out.push(...await pickStaffValues(args.prisma, staffIds, valueField));
       continue;
     }
   }
-  const norm = out.map((x) => normalize(args.templateType, String(x || ""))).filter(Boolean);
-  return dedupe(norm);
+  for (const t of Object.values(TemplateType)) {
+    res[t] = dedupe(res[t].map((x) => normalizeByType(t, String(x || ""))).filter(Boolean));
+  }
+  return res;
 }
 
 // src/utils/renderer.ts
@@ -2608,17 +2772,22 @@ var NotificationService = class {
     const cfg = await this.loadEventConfigOrThrow(evt);
     const delivery = await this.createDeliveryParent(cfg, evt);
     const tasks = [];
+    const allRecipients = await this.getRecipients(cfg, evt);
     if (this.shouldSendEmail(cfg)) {
-      tasks.push(this.processEmailChannel({ cfg, evt, deliveryId: delivery.id }));
+      tasks.push(this.processEmailChannel({ cfg, evt, deliveryId: delivery.id, recipients: allRecipients.EMAIL }));
     }
     if (this.shouldSendSms(cfg)) {
-      tasks.push(this.processSmsChannel({ cfg, evt, deliveryId: delivery.id }));
+      tasks.push(this.processSmsChannel({ cfg, evt, deliveryId: delivery.id, recipients: allRecipients.SMS }));
     }
     if (this.shouldSendWhatsapp(cfg)) {
-      tasks.push(this.processWhatsappChannel({ cfg, evt, deliveryId: delivery.id }));
+      tasks.push(
+        this.processWhatsappChannel({ cfg, evt, deliveryId: delivery.id, recipients: allRecipients.WHATSAPP })
+      );
     }
     if (this.shouldSendApp(cfg)) {
-      tasks.push(this.processAppChannel({ cfg, evt, deliveryId: delivery.id }));
+      tasks.push(
+        this.processAppChannel({ cfg, evt, deliveryId: delivery.id, recipients: allRecipients.APP_NOTIFICATION })
+      );
     }
     const settled = await Promise.allSettled(tasks);
     for (const r of settled) {
@@ -2709,13 +2878,13 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.emailTemplateId } });
     if (!tpl) return;
-    const recipients = await this.getRecipients(cfg.id, "EMAIL" /* EMAIL */, evt);
+    const recipients = args.recipients;
     if (!recipients.length) {
       this.logger.info("[NotificationService] Email: no recipients resolved");
       return;
     }
     const msg = renderEmailTemplate({ body: tpl.bodyHtml ?? "", subject: tpl.subject ?? "" }, evt.data ?? {});
-    const provider = new EmailProvider(this.prisma, this.logger, cfg.serviceDomain);
+    const provider = new EmailProvider(this.prisma, this.logger, cfg.serviceEvent.serviceDomain);
     await this.sendPerRecipient({
       deliveryId,
       notificationType: "EMAIL" /* EMAIL */,
@@ -2736,7 +2905,7 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.smsTemplateId } });
     if (!tpl) return;
-    const recipients = await this.getRecipients(cfg.id, "SMS" /* SMS */, evt);
+    const recipients = args.recipients;
     if (!recipients.length) {
       this.logger.info("[NotificationService] SMS: no recipients resolved");
       return;
@@ -2767,7 +2936,7 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationTemplateId } });
     if (!tpl) return;
-    const recipients = await this.getRecipients(cfg.id, "APP_NOTIFICATION" /* APP_NOTIFICATION */, evt);
+    const recipients = args.recipients;
     if (!recipients.length) {
       this.logger.info("[NotificationService] APP: no recipients resolved");
       return;
@@ -2795,7 +2964,7 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.wpTemplateId } });
     if (!tpl) return;
-    const recipients = await this.getRecipients(cfg, "WHATSAPP" /* WHATSAPP */, evt);
+    const recipients = args.recipients;
     if (!recipients.length) {
       this.logger.info("[NotificationService] WhatsApp: no recipients resolved");
       return;
@@ -2848,15 +3017,13 @@ var NotificationService = class {
   // --------------------------------------------------------------------------------------
   // Recipient resolution
   // --------------------------------------------------------------------------------------
-  async getRecipients(eventConfig, templateType, evt) {
-    const recipients = await resolveRecipients({
+  async getRecipients(eventConfig, evt) {
+    const recipients = await resolveAllRecipients({
       prisma: this.prisma,
       eventConfig,
-      templateType,
       evtData: evt.data ?? {}
-      // serviceDomain/level columns are ignored for now (as requested)
     });
-    return Array.from(new Set((recipients ?? []).filter(Boolean)));
+    return recipients;
   }
   // --------------------------------------------------------------------------------------
   // Generic send helpers

package/dist/index.mjs

@@ -2146,6 +2146,15 @@ var uinConfigService = (uinDeps) => {
   };
 };
 
+// src/types/notification.ts
+var TemplateType = /* @__PURE__ */ ((TemplateType2) => {
+  TemplateType2["EMAIL"] = "EMAIL";
+  TemplateType2["SMS"] = "SMS";
+  TemplateType2["WHATSAPP"] = "WHATSAPP";
+  TemplateType2["APP_NOTIFICATION"] = "APP_NOTIFICATION";
+  return TemplateType2;
+})(TemplateType || {});
+
 // src/providers/app.provider.ts
 var AppNotificationProvider = class {
   async send(args) {
@@ -2176,7 +2185,7 @@ var AppNotificationProvider = class {
 // src/providers/email.providers.ts
 import nodemailer from "nodemailer";
 var EmailProvider = class {
-  constructor(prisma, logger = console, serviceDomain = "FIXUJI", EMAIL_USERNAME = "info@aerialview6.com") {
+  constructor(prisma, logger = console, serviceDomain = "LEVEL2", EMAIL_USERNAME = "info@aerialview6.com") {
     this.prisma = prisma;
     this.logger = logger;
     this.serviceDomain = serviceDomain;
@@ -2433,101 +2442,256 @@ function normalizeEmail(v) {
 function normalizePhone(v) {
   return v.replace(/[^\d]/g, "");
 }
-function normalize(t, v) {
+function initRes() {
+  return {
+    ["EMAIL" /* EMAIL */]: [],
+    ["SMS" /* SMS */]: [],
+    ["WHATSAPP" /* WHATSAPP */]: [],
+    ["APP_NOTIFICATION" /* APP_NOTIFICATION */]: []
+  };
+}
+function normalizeByType(type, v) {
   if (!v) return "";
-  if (t === "EMAIL") return normalizeEmail(v);
-  if (t === "APP_NOTIFICATION") return v.trim();
+  if (type === "EMAIL" /* EMAIL */) return normalizeEmail(v);
+  if (type === "APP_NOTIFICATION" /* APP_NOTIFICATION */) return v.trim();
   return normalizePhone(v);
 }
-async function pickStaffValues(prisma, staffIds, field) {
-  const staff = await prisma.staff.findMany({
-    where: { id: { in: staffIds } },
-    select: { email: true, contactNo: true, userId: true, isActive: true }
-  });
-  const out = [];
-  for (const s of staff) {
-    if (field === "EMAIL") out.push(s.email ?? "");
-    if (field === "CONTACT_NO") out.push(s.contactNo ?? "");
-    if (field === "USER_ID") out.push(s.userId ? String(s.userId) : "");
-  }
-  return out;
+function pickFromStaffRow(type, valueField, row) {
+  if (valueField === "EMAIL") return row.email ?? "";
+  if (valueField === "CONTACT_NO") return row.contactNo ?? "";
+  if (valueField === "USER_ID") return row.userId != null ? String(row.userId) : "";
+  return type === "EMAIL" /* EMAIL */ ? row.email ?? "" : row.contactNo ?? "";
 }
-async function resolveRecipients(args) {
+var getUsersFromRoleAndLevel1Level2 = async (args) => {
+  switch (args.serviceDomain) {
+    case "FIXUJI":
+      const users = await args.prisma.userAreaMapping.findMany({
+        where: {
+          areaId: args.level1Ids.length ? {
+            in: args.level1Ids
+          } : void 0,
+          isActive: true,
+          userAreaDeptMappings: {
+            some: {
+              deptId: args.level2Ids.length ? {
+                in: args.level2Ids
+              } : void 0,
+              isActive: true,
+              userRoleMappings: {
+                some: {
+                  roleId: {
+                    in: args.roles
+                  },
+                  isActive: true
+                }
+              }
+            }
+          }
+        },
+        select: {
+          userId: true
+        },
+        distinct: ["userId"]
+      });
+      const userIds = users.map((r) => r.userId);
+      return userIds;
+    case "AV6": {
+      const { roles, level1Ids } = args;
+      const result = await args.prisma.$queryRawUnsafe(
+        `
+          SELECT
+                distinct scc.staff_id AS staff_id
+            FROM
+                staff_roles sr
+            LEFT JOIN staff_collection_center scc 
+                        ON
+                scc.staff_id = sr.staff_id
+                AND scc.staff_id = sr.staff_id
+            WHERE
+                sr.is_active = 1
+                and scc.is_active = 1
+            ${roles.length ? `AND sr.role_id IN (${roles.map(() => "?").join(",")})` : ""}
+            ${level1Ids.length ? `AND scc.collection_center_id IN (${level1Ids.map(() => "?").join(",")})` : ""}
+        `,
+        ...roles,
+        ...level1Ids
+      );
+      const staffIds = result.map((r) => r.staff_id);
+      return staffIds;
+    }
+    default: {
+      const users2 = await args.prisma.userLevel1Mapping.findMany({
+        where: {
+          level1Id: {
+            in: args.level1Ids.length ? {
+              in: args.level1Ids
+            } : void 0
+          },
+          isActive: true,
+          userLevel1Level2Mappings: {
+            some: {
+              level2Id: {
+                in: args.level2Ids.length ? {
+                  in: args.level2Ids
+                } : void 0
+              },
+              isActive: true,
+              userRoleMappings: {
+                some: {
+                  roleId: {
+                    in: args.roles
+                  },
+                  isActive: true
+                }
+              }
+            }
+          }
+        },
+        select: {
+          userId: true
+        },
+        distinct: ["userId"]
+      });
+      const userIds2 = users2.map((r) => r.userId);
+      return userIds2;
+    }
+  }
+};
+var getStaffInfoFromStaffIds = async (args) => {
+  let staffById = /* @__PURE__ */ new Map();
+  if (args.staffIds.length) {
+    switch (args.serviceDomain) {
+      case "AV6":
+        const staffRows = await args.prisma.staff.findMany({
+          where: { id: { in: args.staffIds } },
+          select: { id: true, email: true, contactNo: true }
+        });
+        staffById = new Map(
+          staffRows.map((s) => [s.id, { email: s.email ?? null, contactNo: s.contactNo ?? null, userId: null }])
+        );
+        break;
+      case "LEVEL2": {
+        const result2 = await args.prisma.user.findMany({
+          where: {
+            id: {
+              in: args.staffIds
+            },
+            isActive: true
+          },
+          select: {
+            phoneNumber: true,
+            email: true
+          }
+        });
+        staffById = new Map(
+          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+        );
+        break;
+      }
+      default:
+        const result = await args.prisma.user.findMany({
+          where: {
+            id: {
+              in: args.staffIds
+            },
+            isActive: true
+          },
+          select: {
+            phoneNumber: true,
+            email: true
+          }
+        });
+        staffById = new Map(
+          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+        );
+        break;
+    }
+  }
+  return staffById;
+};
+async function resolveAllRecipients(args) {
+  const res = initRes();
   const rules = await args.prisma.eventRecipientRule.findMany({
-    where: { eventConfigId: args.eventConfig.id, templateType: args.templateType, isActive: true },
-    orderBy: { sortOrder: "asc" }
+    where: { eventConfigId: args.eventConfig.id, isActive: true },
+    orderBy: [{ templateType: "asc" }, { sortOrder: "asc" }]
+  });
+  const staffIdsFromStaffRules = /* @__PURE__ */ new Set();
+  const roleIdsNeeded = /* @__PURE__ */ new Set();
+  const level1IdsNeeded = /* @__PURE__ */ new Set();
+  const level2IdsNeeded = /* @__PURE__ */ new Set();
+  const onlyActiveByRuleId = /* @__PURE__ */ new Map();
+  for (const r of rules) {
+    const cfg = r.config ?? {};
+    if (r.sourceType === "STAFFS") {
+      for (const id of toArray(cfg.userIds)) staffIdsFromStaffRules.add(Number(id));
+    }
+    if (r.sourceType === "ROLES") {
+      for (const id of toArray(cfg.roleIds)) roleIdsNeeded.add(Number(id));
+      onlyActiveByRuleId.set(r.id, cfg.onlyActive ?? true);
+    }
+    for (const id of toArray(cfg.level1Ids)) level1IdsNeeded.add(Number(id));
+    for (const id of toArray(cfg.level2Ids)) level2IdsNeeded.add(Number(id));
+  }
+  const staffIdsFromRoleRules = /* @__PURE__ */ new Set();
+  const serviceDomain = args.eventConfig.serviceEvent.serviceDomain;
+  if (roleIdsNeeded.size) {
+    const mappings = await getUsersFromRoleAndLevel1Level2({
+      prisma: args.prisma,
+      roles: Array.from(roleIdsNeeded),
+      level1Ids: Array.from(level1IdsNeeded),
+      level2Ids: Array.from(level2IdsNeeded),
+      serviceDomain
+    });
+    for (const id of mappings) {
+      staffIdsFromRoleRules.add(Number(id));
+    }
+  }
+  const allStaffIds = Array.from(
+    /* @__PURE__ */ new Set([...Array.from(staffIdsFromStaffRules), ...Array.from(staffIdsFromRoleRules)])
+  );
+  const staffById = await getStaffInfoFromStaffIds({
+    prisma: args.prisma,
+    staffIds: allStaffIds,
+    serviceDomain
   });
-  const out = [];
   for (const r of rules) {
+    const type = r.templateType;
     const cfg = r.config ?? {};
-    const valueField = cfg.valueField ?? defaultValueField(args.templateType);
+    const valueField = cfg.valueField ?? defaultValueField(type);
     if (r.sourceType === "HARDCODE") {
-      out.push(...toArray(cfg.recipients).map(String));
+      for (const v of toArray(cfg.recipients)) res[type].push(String(v));
       continue;
     }
     if (r.sourceType === "KEY_VALUE") {
-      const keys = toArray(cfg.keys);
-      for (const k of keys) {
+      for (const k of toArray(cfg.keys)) {
         const v = args.evtData?.[k];
-        if (typeof v === "string") out.push(v);
-        if (Array.isArray(v)) out.push(...v.filter((x) => typeof x === "string"));
+        if (typeof v === "string") res[type].push(v);
+        if (Array.isArray(v)) res[type].push(...v.filter((x) => typeof x === "string"));
       }
       continue;
     }
     if (r.sourceType === "STAFFS") {
-      const staffIds = toArray(cfg.staffIds);
-      const userIds = toArray(cfg.userIds);
-      const onlyActive = cfg.onlyActive ?? true;
-      let resolvedStaffIds = [];
-      if (staffIds.length) {
-        resolvedStaffIds = staffIds;
-      } else if (userIds.length) {
-        const staff = await args.prisma.staff.findMany({
-          where: {
-            userId: { in: userIds },
-            ...onlyActive ? { isActive: 1 } : {}
-          },
-          select: { id: true }
-        });
-        resolvedStaffIds = staff.map((s) => s.id);
+      const userIds = toArray(cfg.userIds).map(Number);
+      for (const sid of userIds) {
+        const s = staffById.get(sid);
+        if (!s) continue;
+        res[type].push(pickFromStaffRow(type, valueField, s));
       }
-      if (!resolvedStaffIds.length) continue;
-      if (onlyActive && staffIds.length) {
-        const staff = await args.prisma.staff.findMany({
-          where: { id: { in: resolvedStaffIds }, isActive: 1 },
-          select: { id: true }
-        });
-        resolvedStaffIds = staff.map((s) => s.id);
-      }
-      out.push(...await pickStaffValues(args.prisma, resolvedStaffIds, valueField));
       continue;
     }
     if (r.sourceType === "ROLES") {
-      const roleIds = toArray(cfg.roleIds);
-      const onlyActive = cfg.onlyActive ?? true;
-      if (!roleIds.length) continue;
-      const mappings = await args.prisma.staff_roles.findMany({
-        where: {
-          role_id: { in: roleIds },
-          ...onlyActive ? { is_active: 1 } : {}
-        },
-        select: { staff_id: true }
-      });
-      let staffIds = mappings.map((m) => m.staff_id).filter(Boolean);
-      if (onlyActive && staffIds.length) {
-        const staff = await args.prisma.staff.findMany({
-          where: { id: { in: staffIds }, isActive: 1 },
-          select: { id: true }
-        });
-        staffIds = staff.map((s) => s.id);
+      for (const sid of staffIdsFromRoleRules) {
+        const s = staffById.get(sid);
+        if (!s) continue;
+        res[type].push(pickFromStaffRow(type, valueField, s));
       }
-      if (!staffIds.length) continue;
-      out.push(...await pickStaffValues(args.prisma, staffIds, valueField));
       continue;
     }
   }
-  const norm = out.map((x) => normalize(args.templateType, String(x || ""))).filter(Boolean);
-  return dedupe(norm);
+  for (const t of Object.values(TemplateType)) {
+    res[t] = dedupe(res[t].map((x) => normalizeByType(t, String(x || ""))).filter(Boolean));
+  }
+  return res;
 }
 
 // src/utils/renderer.ts
@@ -2558,17 +2722,22 @@ var NotificationService = class {
     const cfg = await this.loadEventConfigOrThrow(evt);
     const delivery = await this.createDeliveryParent(cfg, evt);
     const tasks = [];
+    const allRecipients = await this.getRecipients(cfg, evt);
     if (this.shouldSendEmail(cfg)) {
-      tasks.push(this.processEmailChannel({ cfg, evt, deliveryId: delivery.id }));
+      tasks.push(this.processEmailChannel({ cfg, evt, deliveryId: delivery.id, recipients: allRecipients.EMAIL }));
     }
     if (this.shouldSendSms(cfg)) {
-      tasks.push(this.processSmsChannel({ cfg, evt, deliveryId: delivery.id }));
+      tasks.push(this.processSmsChannel({ cfg, evt, deliveryId: delivery.id, recipients: allRecipients.SMS }));
     }
     if (this.shouldSendWhatsapp(cfg)) {
-      tasks.push(this.processWhatsappChannel({ cfg, evt, deliveryId: delivery.id }));
+      tasks.push(
+        this.processWhatsappChannel({ cfg, evt, deliveryId: delivery.id, recipients: allRecipients.WHATSAPP })
+      );
     }
     if (this.shouldSendApp(cfg)) {
-      tasks.push(this.processAppChannel({ cfg, evt, deliveryId: delivery.id }));
+      tasks.push(
+        this.processAppChannel({ cfg, evt, deliveryId: delivery.id, recipients: allRecipients.APP_NOTIFICATION })
+      );
     }
     const settled = await Promise.allSettled(tasks);
     for (const r of settled) {
@@ -2659,13 +2828,13 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.emailTemplateId } });
     if (!tpl) return;
-    const recipients = await this.getRecipients(cfg.id, "EMAIL" /* EMAIL */, evt);
+    const recipients = args.recipients;
     if (!recipients.length) {
       this.logger.info("[NotificationService] Email: no recipients resolved");
       return;
     }
     const msg = renderEmailTemplate({ body: tpl.bodyHtml ?? "", subject: tpl.subject ?? "" }, evt.data ?? {});
-    const provider = new EmailProvider(this.prisma, this.logger, cfg.serviceDomain);
+    const provider = new EmailProvider(this.prisma, this.logger, cfg.serviceEvent.serviceDomain);
     await this.sendPerRecipient({
       deliveryId,
       notificationType: "EMAIL" /* EMAIL */,
@@ -2686,7 +2855,7 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.smsTemplateId } });
     if (!tpl) return;
-    const recipients = await this.getRecipients(cfg.id, "SMS" /* SMS */, evt);
+    const recipients = args.recipients;
     if (!recipients.length) {
       this.logger.info("[NotificationService] SMS: no recipients resolved");
       return;
@@ -2717,7 +2886,7 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationTemplateId } });
     if (!tpl) return;
-    const recipients = await this.getRecipients(cfg.id, "APP_NOTIFICATION" /* APP_NOTIFICATION */, evt);
+    const recipients = args.recipients;
     if (!recipients.length) {
       this.logger.info("[NotificationService] APP: no recipients resolved");
       return;
@@ -2745,7 +2914,7 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.wpTemplateId } });
     if (!tpl) return;
-    const recipients = await this.getRecipients(cfg, "WHATSAPP" /* WHATSAPP */, evt);
+    const recipients = args.recipients;
     if (!recipients.length) {
       this.logger.info("[NotificationService] WhatsApp: no recipients resolved");
       return;
@@ -2798,15 +2967,13 @@ var NotificationService = class {
   // --------------------------------------------------------------------------------------
   // Recipient resolution
   // --------------------------------------------------------------------------------------
-  async getRecipients(eventConfig, templateType, evt) {
-    const recipients = await resolveRecipients({
+  async getRecipients(eventConfig, evt) {
+    const recipients = await resolveAllRecipients({
       prisma: this.prisma,
       eventConfig,
-      templateType,
       evtData: evt.data ?? {}
-      // serviceDomain/level columns are ignored for now (as requested)
     });
-    return Array.from(new Set((recipients ?? []).filter(Boolean)));
+    return recipients;
   }
   // --------------------------------------------------------------------------------------
   // Generic send helpers

package/package.json

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