av6-core 1.7.0 → 1.7.2

package/dist/index.js

@@ -1983,12 +1983,13 @@ var commonService = (serviceDeps) => {
     },
     async commonExcelImport(searchParams) {
       logger.info("entering::commonExcelImport::service");
-      const absolutePath = searchParams.file?.path;
-      if (!absolutePath) {
-        throw new Error("No file path provided for Excel import");
+      const file = searchParams.file;
+      if (!file?.buffer) {
+        throw new Error("No file buffer provided for Excel import");
       }
       const workbook = new import_exceljs.default.Workbook();
-      await workbook.xlsx.readFile(absolutePath);
+      const buffer = searchParams.file.buffer;
+      await workbook.xlsx.load(buffer);
       const worksheet = workbook.worksheets[0];
       if (!worksheet) {
         throw new Error("No worksheet found in Excel file");
@@ -3064,7 +3065,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           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 }])
+          staffRows.map((s) => [s.id, { email: s.email ?? null, contactNo: s.contactNo ?? null, userId: s.id }])
         );
         break;
       case "LEVEL2": {
@@ -3082,7 +3083,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           }
         });
         staffById = new Map(
-          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: s.id }])
         );
         break;
       }
@@ -3101,7 +3102,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           }
         });
         staffById = new Map(
-          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: s.id }])
         );
         break;
     }
@@ -3433,6 +3434,7 @@ function renderEmailTemplate(tpl, data) {
 }
 
 // src/services/notification.service.ts
+var import_lodash = __toESM(require("lodash.merge"));
 var NotificationService = class {
   constructor(prisma, logger = console, helpers) {
     this.prisma = prisma;
@@ -3487,7 +3489,17 @@ var NotificationService = class {
         shortCode: evt.shortCode
       },
       include: {
-        serviceEvent: true
+        serviceEvent: true,
+        eventConfigKeys: {
+          where: {
+            isActive: true
+          },
+          select: {
+            id: true,
+            key: true,
+            defaultValue: true
+          }
+        }
       }
     });
     if (!cfg) {
@@ -3500,6 +3512,8 @@ var NotificationService = class {
     return cfg;
   }
   async createDeliveryParent(cfg, evt) {
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = (0, import_lodash.default)({}, defaultValues, evt.data ?? {});
     return this.prisma.eventDelivery.create({
       data: {
         eventId: cfg.serviceEvent.id,
@@ -3508,7 +3522,7 @@ var NotificationService = class {
         eventConfigId: cfg.id,
         service: evt.service,
         priority: cfg.priority,
-        payload: evt.data ?? void 0,
+        payload: mergedData,
         status: "PROCESSING" /* PROCESSING */
       }
     });
@@ -3568,7 +3582,9 @@ var NotificationService = class {
       this.logger.info("[NotificationService] Email: no recipients resolved");
       return;
     }
-    const msg = renderEmailTemplate({ body: tpl.bodyHtml ?? "", subject: tpl.subject ?? "" }, evt.data ?? {});
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = (0, import_lodash.default)({}, defaultValues, evt.data ?? {});
+    const msg = renderEmailTemplate({ body: tpl.bodyHtml ?? "", subject: tpl.subject ?? "" }, mergedData);
     const provider = new EmailProvider(this.prisma, this.logger, cfg.serviceEvent.serviceDomain);
     await this.sendPerRecipient({
       deliveryId,
@@ -3598,7 +3614,9 @@ var NotificationService = class {
       this.logger.info("[NotificationService] SMS: no recipients resolved");
       return;
     }
-    const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = (0, import_lodash.default)({}, defaultValues, evt.data ?? {});
+    const body = renderTemplate(tpl.bodyText ?? "", mergedData);
     const provider = new SmsProvider(this.logger, {
       apiUrl: cfg.serviceEvent.smsApiUrl ?? void 0,
       apiKey: cfg.serviceEvent.smsApiKey ?? void 0,
@@ -3677,9 +3695,11 @@ var NotificationService = class {
       this.logger.info("[NotificationService] APP: no userIds resolved");
       return;
     }
-    const title = renderTemplate(tpl.subject ?? "", evt.data ?? {});
-    const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
-    const route = appUrlTpl ? renderTemplate(appUrlTpl ?? "", evt.data ?? {}) : null;
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = (0, import_lodash.default)({}, defaultValues, evt.data ?? {});
+    const title = renderTemplate(tpl.subject ?? "", mergedData);
+    const body = renderTemplate(tpl.bodyText ?? "", mergedData);
+    const route = appUrlTpl ? renderTemplate(appUrlTpl ?? "", mergedData) : null;
     const tokensMap = await this.getExpoTokensByUserIds(userIds);
     const expoProvider = new ExpoAppNotificationProvider(
       this.logger,
@@ -3771,8 +3791,10 @@ var NotificationService = class {
       this.logger.error("[NotificationService] WEB: no recipients resolved");
       return;
     }
-    const message = renderTemplate(webTpl.bodyText ?? "", evt.data ?? {});
-    const link = webUrlTpl ? renderTemplate(webUrlTpl ?? "", evt.data ?? {}) : null;
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = (0, import_lodash.default)({}, defaultValues, evt.data ?? {});
+    const message = renderTemplate(webTpl.bodyText ?? "", mergedData);
+    const link = webUrlTpl ? renderTemplate(webUrlTpl ?? "", mergedData) : null;
     const provider = new WebNotificationProvider(this.prisma, this.logger);
     const bulk = await provider.sendBulk({
       source: evt.service,
@@ -3829,9 +3851,11 @@ 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 defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = (0, import_lodash.default)({}, defaultValues, evt.data ?? {});
+    const message = renderTemplate(tpl.bodyText ?? "", mergedData);
+    const dataWp = tpl.extra?.bodyValues?.map((x) => getNestedValue(mergedData, x));
+    const fileUrls = tpl.extra?.fileUrls?.map((x) => getNestedValue(mergedData, x));
     const fileName = getNestedValue(tpl.extra?.fileName);
     const apiKey = cfg.serviceEvent.wpApiKey ?? "";
     if (!apiKey.trim()) {
@@ -3883,10 +3907,12 @@ var NotificationService = class {
   // Recipient resolution
   // --------------------------------------------------------------------------------------
   async getRecipients(eventConfig, evt) {
+    const defaultValues = eventConfig.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = (0, import_lodash.default)({}, defaultValues, evt.data ?? {});
     const recipients = await resolveAllRecipients({
       prisma: this.prisma,
       eventConfig,
-      evtData: evt.data ?? {}
+      evtData: mergedData
     });
     return recipients;
   }

package/dist/index.mjs

@@ -1932,12 +1932,13 @@ var commonService = (serviceDeps) => {
     },
     async commonExcelImport(searchParams) {
       logger.info("entering::commonExcelImport::service");
-      const absolutePath = searchParams.file?.path;
-      if (!absolutePath) {
-        throw new Error("No file path provided for Excel import");
+      const file = searchParams.file;
+      if (!file?.buffer) {
+        throw new Error("No file buffer provided for Excel import");
       }
       const workbook = new ExcelJs.Workbook();
-      await workbook.xlsx.readFile(absolutePath);
+      const buffer = searchParams.file.buffer;
+      await workbook.xlsx.load(buffer);
       const worksheet = workbook.worksheets[0];
       if (!worksheet) {
         throw new Error("No worksheet found in Excel file");
@@ -3013,7 +3014,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           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 }])
+          staffRows.map((s) => [s.id, { email: s.email ?? null, contactNo: s.contactNo ?? null, userId: s.id }])
         );
         break;
       case "LEVEL2": {
@@ -3031,7 +3032,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           }
         });
         staffById = new Map(
-          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: s.id }])
         );
         break;
       }
@@ -3050,7 +3051,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           }
         });
         staffById = new Map(
-          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: s.id }])
         );
         break;
     }
@@ -3382,6 +3383,7 @@ function renderEmailTemplate(tpl, data) {
 }
 
 // src/services/notification.service.ts
+import merge from "lodash.merge";
 var NotificationService = class {
   constructor(prisma, logger = console, helpers) {
     this.prisma = prisma;
@@ -3436,7 +3438,17 @@ var NotificationService = class {
         shortCode: evt.shortCode
       },
       include: {
-        serviceEvent: true
+        serviceEvent: true,
+        eventConfigKeys: {
+          where: {
+            isActive: true
+          },
+          select: {
+            id: true,
+            key: true,
+            defaultValue: true
+          }
+        }
       }
     });
     if (!cfg) {
@@ -3449,6 +3461,8 @@ var NotificationService = class {
     return cfg;
   }
   async createDeliveryParent(cfg, evt) {
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = merge({}, defaultValues, evt.data ?? {});
     return this.prisma.eventDelivery.create({
       data: {
         eventId: cfg.serviceEvent.id,
@@ -3457,7 +3471,7 @@ var NotificationService = class {
         eventConfigId: cfg.id,
         service: evt.service,
         priority: cfg.priority,
-        payload: evt.data ?? void 0,
+        payload: mergedData,
         status: "PROCESSING" /* PROCESSING */
       }
     });
@@ -3517,7 +3531,9 @@ var NotificationService = class {
       this.logger.info("[NotificationService] Email: no recipients resolved");
       return;
     }
-    const msg = renderEmailTemplate({ body: tpl.bodyHtml ?? "", subject: tpl.subject ?? "" }, evt.data ?? {});
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = merge({}, defaultValues, evt.data ?? {});
+    const msg = renderEmailTemplate({ body: tpl.bodyHtml ?? "", subject: tpl.subject ?? "" }, mergedData);
     const provider = new EmailProvider(this.prisma, this.logger, cfg.serviceEvent.serviceDomain);
     await this.sendPerRecipient({
       deliveryId,
@@ -3547,7 +3563,9 @@ var NotificationService = class {
       this.logger.info("[NotificationService] SMS: no recipients resolved");
       return;
     }
-    const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = merge({}, defaultValues, evt.data ?? {});
+    const body = renderTemplate(tpl.bodyText ?? "", mergedData);
     const provider = new SmsProvider(this.logger, {
       apiUrl: cfg.serviceEvent.smsApiUrl ?? void 0,
       apiKey: cfg.serviceEvent.smsApiKey ?? void 0,
@@ -3626,9 +3644,11 @@ var NotificationService = class {
       this.logger.info("[NotificationService] APP: no userIds resolved");
       return;
     }
-    const title = renderTemplate(tpl.subject ?? "", evt.data ?? {});
-    const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
-    const route = appUrlTpl ? renderTemplate(appUrlTpl ?? "", evt.data ?? {}) : null;
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = merge({}, defaultValues, evt.data ?? {});
+    const title = renderTemplate(tpl.subject ?? "", mergedData);
+    const body = renderTemplate(tpl.bodyText ?? "", mergedData);
+    const route = appUrlTpl ? renderTemplate(appUrlTpl ?? "", mergedData) : null;
     const tokensMap = await this.getExpoTokensByUserIds(userIds);
     const expoProvider = new ExpoAppNotificationProvider(
       this.logger,
@@ -3720,8 +3740,10 @@ var NotificationService = class {
       this.logger.error("[NotificationService] WEB: no recipients resolved");
       return;
     }
-    const message = renderTemplate(webTpl.bodyText ?? "", evt.data ?? {});
-    const link = webUrlTpl ? renderTemplate(webUrlTpl ?? "", evt.data ?? {}) : null;
+    const defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = merge({}, defaultValues, evt.data ?? {});
+    const message = renderTemplate(webTpl.bodyText ?? "", mergedData);
+    const link = webUrlTpl ? renderTemplate(webUrlTpl ?? "", mergedData) : null;
     const provider = new WebNotificationProvider(this.prisma, this.logger);
     const bulk = await provider.sendBulk({
       source: evt.service,
@@ -3778,9 +3800,11 @@ 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 defaultValues = cfg.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = merge({}, defaultValues, evt.data ?? {});
+    const message = renderTemplate(tpl.bodyText ?? "", mergedData);
+    const dataWp = tpl.extra?.bodyValues?.map((x) => getNestedValue(mergedData, x));
+    const fileUrls = tpl.extra?.fileUrls?.map((x) => getNestedValue(mergedData, x));
     const fileName = getNestedValue(tpl.extra?.fileName);
     const apiKey = cfg.serviceEvent.wpApiKey ?? "";
     if (!apiKey.trim()) {
@@ -3832,10 +3856,12 @@ var NotificationService = class {
   // Recipient resolution
   // --------------------------------------------------------------------------------------
   async getRecipients(eventConfig, evt) {
+    const defaultValues = eventConfig.eventConfigKeys?.map((x) => ({ [x.key]: x.defaultValue })) ?? {};
+    const mergedData = merge({}, defaultValues, evt.data ?? {});
     const recipients = await resolveAllRecipients({
       prisma: this.prisma,
       eventConfig,
-      evtData: evt.data ?? {}
+      evtData: mergedData
     });
     return recipients;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -14,6 +14,7 @@
   },
   "devDependencies": {
     "@prisma/client": "^6.19.0",
+    "@types/lodash.merge": "^4.6.9",
     "@types/nodemailer": "^7.0.3",
     "tsup": "^8.5.0",
     "typescript": "^5.9.2"
@@ -28,6 +29,7 @@
     "exceljs": "^4.4.0",
     "handlebars": "^4.7.8",
     "joi": "^17.13.3",
+    "lodash.merge": "^4.6.2",
     "node-cron": "^4.2.1",
     "nodemailer": "^7.0.10",
     "prettier": "^3.6.2",