@blackcode_sa/metaestetics-api 1.14.59 → 1.14.60

package/dist/admin/index.d.mts

@@ -4723,6 +4723,12 @@ declare class NotificationsAdmin {
      * Kreira novu notifikaciju
      */
     createNotification(notification: Omit<Notification, "id">): Promise<string>;
+    /**
+     * Creates a notification and immediately attempts to send it.
+     * If immediate send fails, the notification remains PENDING for cron pickup.
+     * Returns the notification ID regardless of send success.
+     */
+    createAndSendNotificationImmediately(notification: Omit<Notification, "id">): Promise<string>;
     /**
      * Priprema Expo poruku za slanje
      */

package/dist/admin/index.d.ts

@@ -4723,6 +4723,12 @@ declare class NotificationsAdmin {
      * Kreira novu notifikaciju
      */
     createNotification(notification: Omit<Notification, "id">): Promise<string>;
+    /**
+     * Creates a notification and immediately attempts to send it.
+     * If immediate send fails, the notification remains PENDING for cron pickup.
+     * Returns the notification ID regardless of send success.
+     */
+    createAndSendNotificationImmediately(notification: Omit<Notification, "id">): Promise<string>;
     /**
      * Priprema Expo poruku za slanje
      */

package/dist/admin/index.js

@@ -717,6 +717,37 @@ var NotificationsAdmin = class {
     });
     return docRef.id;
   }
+  /**
+   * Creates a notification and immediately attempts to send it.
+   * If immediate send fails, the notification remains PENDING for cron pickup.
+   * Returns the notification ID regardless of send success.
+   */
+  async createAndSendNotificationImmediately(notification) {
+    const notificationId = await this.createNotification(notification);
+    try {
+      const fullNotification = {
+        ...notification,
+        id: notificationId,
+        status: "pending" /* PENDING */
+      };
+      const sent = await this.sendPushNotification(fullNotification);
+      if (sent) {
+        Logger.info(
+          `[NotificationsAdmin] Notification ${notificationId} sent immediately`
+        );
+      } else {
+        Logger.info(
+          `[NotificationsAdmin] Notification ${notificationId} immediate send failed, will be retried by cron`
+        );
+      }
+    } catch (error) {
+      Logger.error(
+        `[NotificationsAdmin] Error sending notification ${notificationId} immediately, will be retried by cron:`,
+        error
+      );
+    }
+    return notificationId;
+  }
   /**
    * Priprema Expo poruku za slanje
    */
@@ -983,7 +1014,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1034,7 +1065,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1070,7 +1101,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1107,7 +1138,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1143,7 +1174,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1186,7 +1217,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1230,7 +1261,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -3735,12 +3766,11 @@ var AppointmentAggregationService = class {
             const patientCancellationData = {
               appointment: after,
               recipientProfile: after.patientInfo,
-              recipientRole: "patient"
-              // cancellationReason: after.cancellationReason, // TODO: Add if cancellationReason is available on 'after' Appointment
+              recipientRole: "patient",
+              cancellationReason: after.cancellationReason
             };
             await this.appointmentMailingService.sendAppointmentCancelledEmail(
               patientCancellationData
-              // TODO: Properly import types
             );
           }
           if ((_c = practitionerProfile == null ? void 0 : practitionerProfile.basicInfo) == null ? void 0 : _c.email) {
@@ -3750,12 +3780,22 @@ var AppointmentAggregationService = class {
             const practitionerCancellationData = {
               appointment: after,
               recipientProfile: after.practitionerInfo,
-              recipientRole: "practitioner"
-              // cancellationReason: after.cancellationReason, // TODO: Add if cancellationReason is available on 'after' Appointment
+              recipientRole: "practitioner",
+              cancellationReason: after.cancellationReason
             };
             await this.appointmentMailingService.sendAppointmentCancelledEmail(
               practitionerCancellationData
-              // TODO: Properly import types
+            );
+          }
+          if ((patientProfile == null ? void 0 : patientProfile.expoTokens) && patientProfile.expoTokens.length > 0) {
+            Logger.info(
+              `[AggService] Sending cancellation push notification to patient ${after.patientId}`
+            );
+            await this.notificationsAdmin.sendAppointmentCancelledPush(
+              after,
+              after.patientId,
+              patientProfile.expoTokens,
+              "patient" /* PATIENT */
             );
           }
         } else if (after.status === "completed" /* COMPLETED */) {

package/dist/admin/index.mjs

@@ -641,6 +641,37 @@ var NotificationsAdmin = class {
     });
     return docRef.id;
   }
+  /**
+   * Creates a notification and immediately attempts to send it.
+   * If immediate send fails, the notification remains PENDING for cron pickup.
+   * Returns the notification ID regardless of send success.
+   */
+  async createAndSendNotificationImmediately(notification) {
+    const notificationId = await this.createNotification(notification);
+    try {
+      const fullNotification = {
+        ...notification,
+        id: notificationId,
+        status: "pending" /* PENDING */
+      };
+      const sent = await this.sendPushNotification(fullNotification);
+      if (sent) {
+        Logger.info(
+          `[NotificationsAdmin] Notification ${notificationId} sent immediately`
+        );
+      } else {
+        Logger.info(
+          `[NotificationsAdmin] Notification ${notificationId} immediate send failed, will be retried by cron`
+        );
+      }
+    } catch (error) {
+      Logger.error(
+        `[NotificationsAdmin] Error sending notification ${notificationId} immediately, will be retried by cron:`,
+        error
+      );
+    }
+    return notificationId;
+  }
   /**
    * Priprema Expo poruku za slanje
    */
@@ -907,7 +938,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -958,7 +989,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -994,7 +1025,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1031,7 +1062,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1067,7 +1098,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1110,7 +1141,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -1154,7 +1185,7 @@ var NotificationsAdmin = class {
       appointmentId: appointment.id
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData
       );
       console.log(
@@ -3659,12 +3690,11 @@ var AppointmentAggregationService = class {
             const patientCancellationData = {
               appointment: after,
               recipientProfile: after.patientInfo,
-              recipientRole: "patient"
-              // cancellationReason: after.cancellationReason, // TODO: Add if cancellationReason is available on 'after' Appointment
+              recipientRole: "patient",
+              cancellationReason: after.cancellationReason
             };
             await this.appointmentMailingService.sendAppointmentCancelledEmail(
               patientCancellationData
-              // TODO: Properly import types
             );
           }
           if ((_c = practitionerProfile == null ? void 0 : practitionerProfile.basicInfo) == null ? void 0 : _c.email) {
@@ -3674,12 +3704,22 @@ var AppointmentAggregationService = class {
             const practitionerCancellationData = {
               appointment: after,
               recipientProfile: after.practitionerInfo,
-              recipientRole: "practitioner"
-              // cancellationReason: after.cancellationReason, // TODO: Add if cancellationReason is available on 'after' Appointment
+              recipientRole: "practitioner",
+              cancellationReason: after.cancellationReason
             };
             await this.appointmentMailingService.sendAppointmentCancelledEmail(
               practitionerCancellationData
-              // TODO: Properly import types
+            );
+          }
+          if ((patientProfile == null ? void 0 : patientProfile.expoTokens) && patientProfile.expoTokens.length > 0) {
+            Logger.info(
+              `[AggService] Sending cancellation push notification to patient ${after.patientId}`
+            );
+            await this.notificationsAdmin.sendAppointmentCancelledPush(
+              after,
+              after.patientId,
+              patientProfile.expoTokens,
+              "patient" /* PATIENT */
             );
           }
         } else if (after.status === "completed" /* COMPLETED */) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.14.59",
+  "version": "1.14.60",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/admin/aggregation/appointment/appointment.aggregation.service.ts

@@ -408,10 +408,10 @@ export class AppointmentAggregationService {
               appointment: after,
               recipientProfile: after.patientInfo,
               recipientRole: 'patient' as const,
-              // cancellationReason: after.cancellationReason, // TODO: Add if cancellationReason is available on 'after' Appointment
+              cancellationReason: after.cancellationReason,
             };
             await this.appointmentMailingService.sendAppointmentCancelledEmail(
-              patientCancellationData as any, // TODO: Properly import types
+              patientCancellationData as any,
             );
           }
 
@@ -424,15 +424,25 @@ export class AppointmentAggregationService {
               appointment: after,
               recipientProfile: after.practitionerInfo,
               recipientRole: 'practitioner' as const,
-              // cancellationReason: after.cancellationReason, // TODO: Add if cancellationReason is available on 'after' Appointment
+              cancellationReason: after.cancellationReason,
             };
             await this.appointmentMailingService.sendAppointmentCancelledEmail(
-              practitionerCancellationData as any, // TODO: Properly import types
+              practitionerCancellationData as any,
             );
           }
 
-          // TODO: Send cancellation push notifications (patient, practitioner) via notificationsAdmin
-          // TODO: Update/cancel calendar event via calendarAdminService.updateAppointmentCalendarEventStatus(after, CalendarEventStatus.CANCELED)
+          // Send cancellation push notification to Patient
+          if (patientProfile?.expoTokens && patientProfile.expoTokens.length > 0) {
+            Logger.info(
+              `[AggService] Sending cancellation push notification to patient ${after.patientId}`,
+            );
+            await this.notificationsAdmin.sendAppointmentCancelledPush(
+              after,
+              after.patientId,
+              patientProfile.expoTokens,
+              UserRole.PATIENT,
+            );
+          }
         }
         // --- Any -> COMPLETED ---
         else if (after.status === AppointmentStatus.COMPLETED) {

package/src/admin/notifications/notifications.admin.ts

@@ -43,6 +43,47 @@ export class NotificationsAdmin {
     return docRef.id;
   }
 
+  /**
+   * Creates a notification and immediately attempts to send it.
+   * If immediate send fails, the notification remains PENDING for cron pickup.
+   * Returns the notification ID regardless of send success.
+   */
+  async createAndSendNotificationImmediately(
+    notification: Omit<Notification, "id">
+  ): Promise<string> {
+    // Create the notification first
+    const notificationId = await this.createNotification(notification);
+
+    // Immediately try to send it
+    try {
+      const fullNotification: Notification = {
+        ...notification,
+        id: notificationId,
+        status: NotificationStatus.PENDING,
+      } as Notification;
+
+      const sent = await this.sendPushNotification(fullNotification);
+
+      if (sent) {
+        Logger.info(
+          `[NotificationsAdmin] Notification ${notificationId} sent immediately`
+        );
+      } else {
+        Logger.info(
+          `[NotificationsAdmin] Notification ${notificationId} immediate send failed, will be retried by cron`
+        );
+      }
+    } catch (error) {
+      // Don't throw - notification is created, cron will pick it up
+      Logger.error(
+        `[NotificationsAdmin] Error sending notification ${notificationId} immediately, will be retried by cron:`,
+        error
+      );
+    }
+
+    return notificationId;
+  }
+
   /**
    * Priprema Expo poruku za slanje
    */
@@ -406,7 +447,7 @@ export class NotificationsAdmin {
     };
 
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -479,7 +520,7 @@ export class NotificationsAdmin {
     };
 
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -527,7 +568,7 @@ export class NotificationsAdmin {
     };
 
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -583,7 +624,7 @@ export class NotificationsAdmin {
     };
 
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -631,7 +672,7 @@ export class NotificationsAdmin {
     };
 
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -692,7 +733,7 @@ export class NotificationsAdmin {
     };
 
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -749,7 +790,7 @@ export class NotificationsAdmin {
     };
 
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(