av6-core 1.6.7 → 1.6.9

package/dist/index.d.mts

@@ -623,7 +623,12 @@ type EmitPayload = {
     service: string;
     shortCode: string;
     data?: Record<string, any>;
-    dataWp?: any[];
+    attachments?: Array<{
+        filename: string;
+        path: string;
+        cid: string;
+        content?: Buffer;
+    }>;
 };
 type ILogger = winston.Logger | Console;
 type NotificationEmitterDeps = {

package/dist/index.d.ts

@@ -623,7 +623,12 @@ type EmitPayload = {
     service: string;
     shortCode: string;
     data?: Record<string, any>;
-    dataWp?: any[];
+    attachments?: Array<{
+        filename: string;
+        path: string;
+        cid: string;
+        content?: Buffer;
+    }>;
 };
 type ILogger = winston.Logger | Console;
 type NotificationEmitterDeps = {

package/dist/index.js

@@ -3389,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 = {
@@ -3578,7 +3578,8 @@ var NotificationService = class {
           recipient: { email: recipient },
           subject: msg.subject,
           body: msg.body,
-          priority: cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "low"
+          priority: cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "low",
+          attachments: evt.attachments
         });
         return this.mapProviderResult(res);
       }
@@ -3826,6 +3827,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({
@@ -3850,9 +3855,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({
@@ -3860,8 +3867,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,
@@ -3950,7 +3956,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 ?? ""),

package/dist/index.mjs

@@ -3338,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 = {
@@ -3527,7 +3527,8 @@ var NotificationService = class {
           recipient: { email: recipient },
           subject: msg.subject,
           body: msg.body,
-          priority: cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "low"
+          priority: cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "low",
+          attachments: evt.attachments
         });
         return this.mapProviderResult(res);
       }
@@ -3775,6 +3776,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({
@@ -3799,9 +3804,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({
@@ -3809,8 +3816,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,
@@ -3899,7 +3905,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 ?? ""),

package/package.json

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