av6-core 1.6.4 → 1.6.6

package/dist/index.js

@@ -1590,7 +1590,6 @@ var buildJoiSchemaForOp = (cfg, op, ctx) => {
 
 // src/utils/dynamicOperation.utils.ts
 var import_av6_utils = require("av6-utils");
-var import_decimal = __toESM(require("decimal.js"));
 var OP_PRECEDENCE = {
   "u-": 3,
   // unary minus
@@ -1796,9 +1795,12 @@ function getDynamicValueOrExpression(obj, accessorOrExpr) {
   }
   return getDynamicValue(obj, s);
 }
+function isDecimalLike(v) {
+  return v !== null && typeof v === "object" && typeof v.toNumber === "function" && typeof v.toString === "function";
+}
 function toNumberDeep(val) {
   if (val === null || val === void 0) return val;
-  if (val instanceof import_decimal.default) return val.toNumber();
+  if (isDecimalLike(val)) return val.toNumber();
   if (val instanceof Date) return val;
   if (Array.isArray(val)) return val.map(toNumberDeep);
   if (typeof val === "object") {
@@ -3526,26 +3528,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) {
@@ -3572,7 +3576,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) {
@@ -3648,12 +3654,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");
@@ -3661,7 +3666,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,
@@ -3740,21 +3745,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,
@@ -3802,7 +3807,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) {

package/dist/index.mjs

@@ -1540,7 +1540,6 @@ var buildJoiSchemaForOp = (cfg, op, ctx) => {
 
 // src/utils/dynamicOperation.utils.ts
 import { applyRound } from "av6-utils";
-import Decimal from "decimal.js";
 var OP_PRECEDENCE = {
   "u-": 3,
   // unary minus
@@ -1746,9 +1745,12 @@ function getDynamicValueOrExpression(obj, accessorOrExpr) {
   }
   return getDynamicValue(obj, s);
 }
+function isDecimalLike(v) {
+  return v !== null && typeof v === "object" && typeof v.toNumber === "function" && typeof v.toString === "function";
+}
 function toNumberDeep(val) {
   if (val === null || val === void 0) return val;
-  if (val instanceof Decimal) return val.toNumber();
+  if (isDecimalLike(val)) return val.toNumber();
   if (val instanceof Date) return val;
   if (Array.isArray(val)) return val.map(toNumberDeep);
   if (typeof val === "object") {
@@ -3476,26 +3478,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) {
@@ -3522,7 +3526,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) {
@@ -3598,12 +3604,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");
@@ -3611,7 +3616,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,
@@ -3690,21 +3695,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,
@@ -3752,7 +3757,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -25,7 +25,6 @@
   "dependencies": {
     "av6-utils": "^1.0.4",
     "axios": "^1.11.0",
-    "decimal.js": "^10.6.0",
     "exceljs": "^4.4.0",
     "handlebars": "^4.7.8",
     "joi": "^17.13.3",