av6-core 1.0.7 → 1.0.8

package/dist/index.d.mts

@@ -357,14 +357,12 @@ type EmitPayload = {
     recipient: Recipient;
     data: Record<string, any>;
 };
-interface ILogger {
-    info: (...args: any[]) => void;
-    error: (...args: any[]) => void;
-}
+type ILogger = winston.Logger | Console;
 type NotificationEmitterDeps = {
     prisma: PrismaClient;
     logger?: ILogger;
     envMode?: "Production" | "Development";
+    helpers: Helpers;
 };
 
 /**

package/dist/index.d.ts

@@ -357,14 +357,12 @@ type EmitPayload = {
     recipient: Recipient;
     data: Record<string, any>;
 };
-interface ILogger {
-    info: (...args: any[]) => void;
-    error: (...args: any[]) => void;
-}
+type ILogger = winston.Logger | Console;
 type NotificationEmitterDeps = {
     prisma: PrismaClient;
     logger?: ILogger;
     envMode?: "Production" | "Development";
+    helpers: Helpers;
 };
 
 /**

package/dist/index.js

@@ -1661,6 +1661,13 @@ var EmailProvider = class {
       const emailConfig = await this.prisma.emailConfig.findFirst({
         where: { isActive: "yes" }
       });
+      if (!emailConfig || !emailConfig.smtpServer || !emailConfig.smtpUsername || !emailConfig.smtpPassword || !emailConfig.smtpPort) {
+        return {
+          ok: false,
+          provider: "EMAIL" /* EMAIL */,
+          error: "Missing or incomplete email configuration"
+        };
+      }
       const transporter = import_nodemailer.default.createTransport({
         pool: true,
         // Reuse the connection
@@ -1774,10 +1781,11 @@ function renderEmailTemplate(tpl, data) {
 
 // src/services/notification.service.ts
 var NotificationService = class {
-  constructor(prisma, logger = console, envMode = "Development") {
+  constructor(prisma, logger = console, envMode = "Development", helpers) {
     this.prisma = prisma;
     this.logger = logger;
     this.envMode = envMode;
+    this.helpers = helpers;
   }
   /**
    * Main entry: handle one business event.
@@ -1796,15 +1804,18 @@ var NotificationService = class {
       this.logger.info(
         `[NotificationService] No config for event=${evt.eventName} serviceEventId=${evt.serviceEventId}`
       );
-      return;
+      throw new this.helpers.ErrorHandler(
+        400,
+        this.helpers.generateErrorMessage("NOT_FOUND", evt.eventName)
+      );
     }
-    const emailTpl = cfg.allowEmail ? {
+    const emailTpl = cfg.allowEmail && cfg.serviceEvent.allowEmail ? {
       subject: "PO {{poNumber}} created",
       body: "<p>Hello {{vendor}}, PO {{poNumber}} created</p>"
     } : null;
-    const smsTpl = cfg.allowSms ? { body: "PO {{poNumber}} created for {{vendor}}" } : null;
-    const waTpl = cfg.allowWhatsapp ? { body: "*PO {{poNumber}}* created for {{vendor}}" } : null;
-    const appTpl = cfg.allowAppNotification ? {
+    const smsTpl = cfg.allowSms && cfg.serviceEvent.allowSms ? { body: "PO {{poNumber}} created for {{vendor}}" } : null;
+    const waTpl = cfg.allowWhatsapp && cfg.serviceEvent.allowWhatsapp ? { body: "*PO {{poNumber}}* created for {{vendor}}" } : null;
+    const appTpl = cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification ? {
       subject: "PO created",
       body: "PO {{poNumber}} created for {{vendor}}"
     } : null;
@@ -1876,6 +1887,7 @@ var NotificationService = class {
    * Helper: send through a provider and then write audit row.
    */
   async sendAndAudit(args) {
+    const recipient = args.providerType === "EMAIL" /* EMAIL */ ? args.evt.recipient.email : args.providerType === "SMS" /* SMS */ ? args.evt.recipient.phone : args.providerType === "WHATSAPP" /* WHATSAPP */ ? args.evt.recipient.whatsapp : args.evt.recipient.appUserId;
     try {
       const result = await args.provider.send({
         subject: args.subject,
@@ -1889,7 +1901,9 @@ var NotificationService = class {
           eventConfigId: args.eventConfigId,
           notificationType: args.providerType,
           isSent: result.ok,
-          sentAt: result.ok ? /* @__PURE__ */ new Date() : null
+          sentAt: result.ok ? /* @__PURE__ */ new Date() : null,
+          recipient,
+          messageContent: args.body
         }
       });
     } catch (err) {
@@ -1901,7 +1915,9 @@ var NotificationService = class {
           eventConfigId: args.eventConfigId,
           notificationType: args.providerType,
           isSent: false,
-          sentAt: null
+          sentAt: null,
+          recipient,
+          messageContent: args.body
         }
       });
     }
@@ -1918,7 +1934,8 @@ var NotificationEmitter = class {
     this.service = new NotificationService(
       deps.prisma,
       deps.logger ?? console,
-      deps.envMode
+      deps.envMode,
+      deps.helpers
     );
     this.emitter.on("notify", async (payload) => {
       try {

package/dist/index.mjs

@@ -1615,6 +1615,13 @@ var EmailProvider = class {
       const emailConfig = await this.prisma.emailConfig.findFirst({
         where: { isActive: "yes" }
       });
+      if (!emailConfig || !emailConfig.smtpServer || !emailConfig.smtpUsername || !emailConfig.smtpPassword || !emailConfig.smtpPort) {
+        return {
+          ok: false,
+          provider: "EMAIL" /* EMAIL */,
+          error: "Missing or incomplete email configuration"
+        };
+      }
       const transporter = nodemailer.createTransport({
         pool: true,
         // Reuse the connection
@@ -1728,10 +1735,11 @@ function renderEmailTemplate(tpl, data) {
 
 // src/services/notification.service.ts
 var NotificationService = class {
-  constructor(prisma, logger = console, envMode = "Development") {
+  constructor(prisma, logger = console, envMode = "Development", helpers) {
     this.prisma = prisma;
     this.logger = logger;
     this.envMode = envMode;
+    this.helpers = helpers;
   }
   /**
    * Main entry: handle one business event.
@@ -1750,15 +1758,18 @@ var NotificationService = class {
       this.logger.info(
         `[NotificationService] No config for event=${evt.eventName} serviceEventId=${evt.serviceEventId}`
       );
-      return;
+      throw new this.helpers.ErrorHandler(
+        400,
+        this.helpers.generateErrorMessage("NOT_FOUND", evt.eventName)
+      );
     }
-    const emailTpl = cfg.allowEmail ? {
+    const emailTpl = cfg.allowEmail && cfg.serviceEvent.allowEmail ? {
       subject: "PO {{poNumber}} created",
       body: "<p>Hello {{vendor}}, PO {{poNumber}} created</p>"
     } : null;
-    const smsTpl = cfg.allowSms ? { body: "PO {{poNumber}} created for {{vendor}}" } : null;
-    const waTpl = cfg.allowWhatsapp ? { body: "*PO {{poNumber}}* created for {{vendor}}" } : null;
-    const appTpl = cfg.allowAppNotification ? {
+    const smsTpl = cfg.allowSms && cfg.serviceEvent.allowSms ? { body: "PO {{poNumber}} created for {{vendor}}" } : null;
+    const waTpl = cfg.allowWhatsapp && cfg.serviceEvent.allowWhatsapp ? { body: "*PO {{poNumber}}* created for {{vendor}}" } : null;
+    const appTpl = cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification ? {
       subject: "PO created",
       body: "PO {{poNumber}} created for {{vendor}}"
     } : null;
@@ -1830,6 +1841,7 @@ var NotificationService = class {
    * Helper: send through a provider and then write audit row.
    */
   async sendAndAudit(args) {
+    const recipient = args.providerType === "EMAIL" /* EMAIL */ ? args.evt.recipient.email : args.providerType === "SMS" /* SMS */ ? args.evt.recipient.phone : args.providerType === "WHATSAPP" /* WHATSAPP */ ? args.evt.recipient.whatsapp : args.evt.recipient.appUserId;
     try {
       const result = await args.provider.send({
         subject: args.subject,
@@ -1843,7 +1855,9 @@ var NotificationService = class {
           eventConfigId: args.eventConfigId,
           notificationType: args.providerType,
           isSent: result.ok,
-          sentAt: result.ok ? /* @__PURE__ */ new Date() : null
+          sentAt: result.ok ? /* @__PURE__ */ new Date() : null,
+          recipient,
+          messageContent: args.body
         }
       });
     } catch (err) {
@@ -1855,7 +1869,9 @@ var NotificationService = class {
           eventConfigId: args.eventConfigId,
           notificationType: args.providerType,
           isSent: false,
-          sentAt: null
+          sentAt: null,
+          recipient,
+          messageContent: args.body
         }
       });
     }
@@ -1872,7 +1888,8 @@ var NotificationEmitter = class {
     this.service = new NotificationService(
       deps.prisma,
       deps.logger ?? console,
-      deps.envMode
+      deps.envMode,
+      deps.helpers
     );
     this.emitter.on("notify", async (payload) => {
       try {

package/package.json

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