@blackcode_sa/metaestetics-api 1.6.14 → 1.6.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.6.14",
+  "version": "1.6.16",
   "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

@@ -565,7 +565,7 @@ export class AppointmentAggregationService {
             status: PatientInstructionStatus.PENDING_NOTIFICATION,
             originalNotifyAtValue: notifyAtValue,
             originalTimeframeUnit: template.timeframe.unit,
-            updatedAt: admin.firestore.FieldValue.serverTimestamp() as any,
+            updatedAt: admin.firestore.Timestamp.now() as any, // Use current server timestamp
             notificationId: undefined,
             actionTakenAt: undefined,
           };
@@ -707,7 +707,7 @@ export class AppointmentAggregationService {
             status: PatientInstructionStatus.PENDING_NOTIFICATION,
             originalNotifyAtValue: notifyAtValue,
             originalTimeframeUnit: template.timeframe.unit,
-            updatedAt: admin.firestore.FieldValue.serverTimestamp() as any,
+            updatedAt: admin.firestore.Timestamp.now() as any, // Use current server timestamp
             notificationId: undefined,
             actionTakenAt: undefined,
           } as PatientRequirementInstruction;

package/src/admin/booking/booking.admin.ts

@@ -205,9 +205,9 @@ export class BookingAdmin {
    */
   private adminTimestampToClientTimestamp(
     timestamp: admin.firestore.Timestamp
-  ): any {
+  ): FirebaseClientTimestamp {
     // Use TimestampUtils instead of custom implementation
-    return TimestampUtils.adminToClient(timestamp);
+    return TimestampUtils.adminToClient(timestamp) as FirebaseClientTimestamp;
   }
 
   /**
@@ -217,8 +217,12 @@ export class BookingAdmin {
     return events.map((event) => ({
       ...event,
       eventTime: {
-        start: TimestampUtils.adminToClient(event.eventTime.start),
-        end: TimestampUtils.adminToClient(event.eventTime.end),
+        start: TimestampUtils.adminToClient(
+          event.eventTime.start
+        ) as FirebaseClientTimestamp,
+        end: TimestampUtils.adminToClient(
+          event.eventTime.end
+        ) as FirebaseClientTimestamp,
       },
       // Convert any other timestamps in the event if needed
     }));

package/src/admin/calendar/calendar.admin.service.ts

@@ -10,6 +10,7 @@ import { Logger } from "../logger";
 import { PRACTITIONERS_COLLECTION } from "../../types/practitioner";
 import { PATIENTS_COLLECTION } from "../../types/patient";
 import { CLINICS_COLLECTION } from "../../types/clinic";
+import { TimestampUtils } from "../../utils/TimestampUtils";
 
 /**
  * @class CalendarAdminService
@@ -103,18 +104,14 @@ export class CalendarAdminService {
     const batch = this.db.batch();
     const serverTimestamp = admin.firestore.FieldValue.serverTimestamp();
 
-    // Convert FirebaseClientTimestamp to a plain object for Firestore admin SDK if needed,
-    // or ensure the CalendarEventTime type is directly compatible.
-    // Firestore admin SDK usually handles { seconds: X, nanoseconds: Y } objects correctly.
+    // Convert client timestamps to admin timestamps since we're in server mode
     const firestoreCompatibleEventTime = {
-      start: {
-        seconds: newEventTime.start.seconds,
-        nanoseconds: newEventTime.start.nanoseconds,
-      },
-      end: {
-        seconds: newEventTime.end.seconds,
-        nanoseconds: newEventTime.end.nanoseconds,
-      },
+      start:
+        TimestampUtils.clientToAdmin(newEventTime.start) ||
+        admin.firestore.Timestamp.now(),
+      end:
+        TimestampUtils.clientToAdmin(newEventTime.end) ||
+        admin.firestore.Timestamp.now(),
     };
 
     // TODO: Confirm paths as in updateAppointmentCalendarEventsStatus

package/src/admin/index.ts

@@ -1,4 +1,6 @@
 import { NotificationsAdmin } from "./notifications/notifications.admin";
+import * as admin from "firebase-admin";
+import { TimestampUtils } from "../utils/TimestampUtils";
 
 import { UserRole } from "../types";
 // Import types needed by admin consumers (like Cloud Functions)
@@ -111,3 +113,22 @@ console.log("[Admin Module] Initialized and services exported.");
 // if they have dependencies (like Firestore db) that need to be injected.
 // The initialization pattern might differ depending on how this module is consumed
 // (e.g., within a larger NestJS app vs. standalone Cloud Functions).
+
+// Initialize TimestampUtils for server-side use
+TimestampUtils.enableServerMode();
+
+// Export all admin services that are needed
+export * from "./booking/booking.admin";
+export * from "./booking/booking.calculator";
+export * from "./booking/booking.types";
+export * from "./calendar/calendar.admin.service";
+export * from "./documentation-templates/document-manager.admin";
+export * from "./logger";
+export * from "./mailing/appointment/appointment.mailing.service";
+export * from "./notifications/notifications.admin";
+export * from "./requirements/patient-requirements.admin.service";
+export * from "./aggregation/appointment/appointment.aggregation.service";
+
+// Re-export types that Cloud Functions might need direct access to
+export * from "../types/appointment";
+// Add other types as needed

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

@@ -9,6 +9,7 @@ import { Appointment, PaymentStatus } from "../../types/appointment";
 import { UserRole } from "../../types";
 import { Timestamp as FirebaseClientTimestamp } from "@firebase/firestore";
 import { TimestampUtils } from "../../utils/TimestampUtils";
+import { Logger } from "../logger";
 
 export class NotificationsAdmin {
   private expo: Expo;
@@ -46,19 +47,31 @@ export class NotificationsAdmin {
    * Priprema Expo poruku za slanje
    */
   private prepareExpoMessage(notification: Notification): ExpoPushMessage[] {
-    return notification.notificationTokens
-      .filter((token) => Expo.isExpoPushToken(token))
-      .map((token) => ({
-        to: token,
-        sound: "default",
-        title: notification.title,
-        body: notification.body,
-        data: {
-          notificationId: notification.id,
-          notificationType: notification.notificationType,
-          userId: notification.userId,
-        },
-      }));
+    const validTokens = notification.notificationTokens.filter((token) =>
+      Expo.isExpoPushToken(token)
+    );
+
+    Logger.info(
+      `[NotificationsAdmin] Preparing Expo messages for notification ${notification.id}`,
+      {
+        totalTokens: notification.notificationTokens.length,
+        validTokens: validTokens.length,
+        invalidTokensCount:
+          notification.notificationTokens.length - validTokens.length,
+      }
+    );
+
+    return validTokens.map((token) => ({
+      to: token,
+      sound: "default",
+      title: notification.title,
+      body: notification.body,
+      data: {
+        notificationId: notification.id,
+        notificationType: notification.notificationType,
+        userId: notification.userId,
+      },
+    }));
   }
 
   /**
@@ -93,27 +106,58 @@ export class NotificationsAdmin {
    */
   async sendPushNotification(notification: Notification): Promise<boolean> {
     try {
+      Logger.info(
+        `[NotificationsAdmin] Processing notification ${notification.id} for sending`,
+        {
+          userId: notification.userId,
+          tokenCount: notification.notificationTokens?.length || 0,
+          type: notification.notificationType,
+        }
+      );
+
       const messages = this.prepareExpoMessage(notification);
 
       if (messages.length === 0) {
+        const errorMsg = "No valid notification tokens found";
+        Logger.error(
+          `[NotificationsAdmin] ${errorMsg} for notification ${notification.id}`
+        );
         await this.updateNotificationStatus(
           notification.id!,
           NotificationStatus.FAILED,
-          "No valid notification tokens found"
+          errorMsg
         );
         return false;
       }
 
       const chunks = this.expo.chunkPushNotifications(messages);
+      Logger.info(
+        `[NotificationsAdmin] Sending ${messages.length} messages in ${chunks.length} chunks for notification ${notification.id}`
+      );
+
       const tickets: ExpoPushTicket[][] = [];
 
       // Šaljemo sve chunks
-      for (const chunk of chunks) {
+      for (let i = 0; i < chunks.length; i++) {
+        const chunk = chunks[i];
         try {
+          Logger.info(
+            `[NotificationsAdmin] Sending chunk ${i + 1}/${
+              chunks.length
+            } with ${chunk.length} messages`
+          );
           const ticketChunk = await this.expo.sendPushNotificationsAsync(chunk);
+          Logger.info(
+            `[NotificationsAdmin] Received ${
+              ticketChunk.length
+            } tickets for chunk ${i + 1}`
+          );
           tickets.push(ticketChunk);
         } catch (error) {
-          console.error(`Chunk sending error:`, error);
+          Logger.error(
+            `[NotificationsAdmin] Chunk ${i + 1} sending error:`,
+            error
+          );
           throw error;
         }
       }
@@ -121,25 +165,62 @@ export class NotificationsAdmin {
       // Proveravamo rezultate
       let hasErrors = false;
       const errors: string[] = [];
+      const ticketsFlat = tickets.flat();
 
-      tickets.flat().forEach((ticket, index) => {
+      // Log detailed ticket information
+      const ticketResults = {
+        total: ticketsFlat.length,
+        success: 0,
+        error: 0,
+        errorDetails: {} as Record<string, number>,
+      };
+
+      ticketsFlat.forEach((ticket, index) => {
         if (ticket.status === "error") {
           hasErrors = true;
-          errors.push(
-            `Token ${notification.notificationTokens[index]}: ${ticket.message}`
-          );
+          ticketResults.error++;
+
+          // Count each error type
+          const errorMessage = ticket.message || "Unknown error";
+          ticketResults.errorDetails[errorMessage] =
+            (ticketResults.errorDetails[errorMessage] || 0) + 1;
+
+          const tokenInfo =
+            index < notification.notificationTokens.length
+              ? `Token ${notification.notificationTokens[index]}`
+              : `Token at index ${index}`;
+
+          errors.push(`${tokenInfo}: ${errorMessage}`);
+        } else {
+          ticketResults.success++;
         }
       });
 
+      Logger.info(
+        `[NotificationsAdmin] Ticket results for notification ${notification.id}`,
+        ticketResults
+      );
+
       if (hasErrors) {
+        const errorSummary = errors.join("; ");
+        Logger.warn(
+          `[NotificationsAdmin] Partial success or errors in notification ${notification.id}`,
+          { errorCount: errors.length, errorSummary }
+        );
+
         await this.updateNotificationStatus(
           notification.id!,
-          NotificationStatus.PARTIAL_SUCCESS,
-          errors.join("; ")
+          ticketResults.success > 0
+            ? NotificationStatus.PARTIAL_SUCCESS
+            : NotificationStatus.FAILED,
+          errorSummary
         );
-        return false;
+        return ticketResults.success > 0;
       }
 
+      Logger.info(
+        `[NotificationsAdmin] Successfully sent notification ${notification.id} to all recipients`
+      );
       await this.updateNotificationStatus(
         notification.id!,
         NotificationStatus.SENT
@@ -148,7 +229,10 @@ export class NotificationsAdmin {
     } catch (error) {
       const errorMessage =
         error instanceof Error ? error.message : "Unknown error";
-      console.error("Greška pri slanju notifikacije:", error);
+      Logger.error(
+        `[NotificationsAdmin] Critical error sending notification ${notification.id}:`,
+        error
+      );
       await this.updateNotificationStatus(
         notification.id!,
         NotificationStatus.FAILED,
@@ -164,6 +248,10 @@ export class NotificationsAdmin {
   async processPendingNotifications(batchSize: number = 100): Promise<void> {
     const now = admin.firestore.Timestamp.now();
 
+    Logger.info(
+      `[NotificationsAdmin] Starting to process pending notifications with batch size ${batchSize}`
+    );
+
     const pendingNotifications = await this.db
       .collection("notifications")
       .where("status", "==", NotificationStatus.PENDING)
@@ -171,12 +259,27 @@ export class NotificationsAdmin {
       .limit(batchSize)
       .get();
 
+    Logger.info(
+      `[NotificationsAdmin] Found ${pendingNotifications.size} pending notifications to process`
+    );
+
+    if (pendingNotifications.empty) {
+      Logger.info(
+        "[NotificationsAdmin] No pending notifications found to process"
+      );
+      return;
+    }
+
     const results = await Promise.allSettled(
       pendingNotifications.docs.map(async (doc) => {
         const notification = {
           id: doc.id,
           ...doc.data(),
         } as Notification;
+
+        Logger.info(
+          `[NotificationsAdmin] Processing notification ${notification.id} of type ${notification.notificationType}`
+        );
         return this.sendPushNotification(notification);
       })
     );
@@ -189,8 +292,8 @@ export class NotificationsAdmin {
       (r) => r.status === "rejected" || (r.status === "fulfilled" && !r.value)
     ).length;
 
-    console.log(
-      `Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
+    Logger.info(
+      `[NotificationsAdmin] Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
     );
   }
 
@@ -204,6 +307,11 @@ export class NotificationsAdmin {
     const cutoffDate = new Date();
     cutoffDate.setDate(cutoffDate.getDate() - daysOld);
 
+    Logger.info(
+      `[NotificationsAdmin] Starting cleanup of notifications older than ${daysOld} days`
+    );
+
+    let totalDeleted = 0;
     while (true) {
       const oldNotifications = await this.db
         .collection("notifications")
@@ -216,6 +324,9 @@ export class NotificationsAdmin {
         .get();
 
       if (oldNotifications.empty) {
+        Logger.info(
+          `[NotificationsAdmin] No more old notifications to delete. Total deleted: ${totalDeleted}`
+        );
         break;
       }
 
@@ -225,8 +336,9 @@ export class NotificationsAdmin {
       });
 
       await batch.commit();
-      console.log(
-        `Deleted batch of ${oldNotifications.size} old notifications`
+      totalDeleted += oldNotifications.size;
+      Logger.info(
+        `[NotificationsAdmin] Deleted batch of ${oldNotifications.size} old notifications. Running total: ${totalDeleted}`
       );
     }
   }
@@ -277,10 +389,7 @@ export class NotificationsAdmin {
         .toLocaleDateString()} is confirmed.`;
     }
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationData: Omit<
       Notification,
@@ -289,7 +398,7 @@ export class NotificationsAdmin {
       userId: recipientUserId,
       userRole: recipientRole,
       notificationType: NotificationType.APPOINTMENT_STATUS_CHANGE,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: recipientExpoTokens,
       title,
       body,
@@ -353,10 +462,7 @@ export class NotificationsAdmin {
       }
     }
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationData: Omit<
       Notification,
@@ -365,7 +471,7 @@ export class NotificationsAdmin {
       userId: recipientUserId,
       userRole: recipientRole,
       notificationType: NotificationType.APPOINTMENT_CANCELLED,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: recipientExpoTokens,
       title,
       body,
@@ -404,10 +510,7 @@ export class NotificationsAdmin {
     const title = "Appointment Reschedule Proposed";
     const body = `Action Required: A new time has been proposed for your appointment for ${appointment.procedureInfo.name}. Please review in the app.`;
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationData: Omit<
       Notification,
@@ -416,7 +519,7 @@ export class NotificationsAdmin {
       userId: patientUserId,
       userRole: UserRole.PATIENT,
       notificationType: NotificationType.APPOINTMENT_RESCHEDULED_PROPOSAL,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: patientExpoTokens,
       title,
       body,
@@ -458,10 +561,7 @@ export class NotificationsAdmin {
       .toDate()
       .toLocaleDateString()} is now ${appointment.paymentStatus}.`;
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationType =
       appointment.paymentStatus === PaymentStatus.PAID
@@ -475,7 +575,7 @@ export class NotificationsAdmin {
       userId: patientUserId,
       userRole: UserRole.PATIENT,
       notificationType: notificationType,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: patientExpoTokens,
       title,
       body,
@@ -514,10 +614,7 @@ export class NotificationsAdmin {
     const title = "Leave a Review";
     const body = `How was your recent appointment for ${appointment.procedureInfo.name}? We'd love to hear your feedback!`;
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationData: Omit<
       Notification,
@@ -526,7 +623,7 @@ export class NotificationsAdmin {
       userId: patientUserId,
       userRole: UserRole.PATIENT,
       notificationType: NotificationType.REVIEW_REQUEST,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: patientExpoTokens,
       title,
       body,
@@ -576,10 +673,7 @@ export class NotificationsAdmin {
       .toDate()
       .toLocaleDateString()}.`;
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const tempNotificationType = NotificationType.GENERAL_MESSAGE;
 
@@ -590,7 +684,7 @@ export class NotificationsAdmin {
       userId: recipientUserId,
       userRole: UserRole.PRACTITIONER,
       notificationType: tempNotificationType,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: recipientExpoTokens,
       title,
       body,

package/src/admin/requirements/patient-requirements.admin.service.ts

@@ -176,7 +176,7 @@ export class PatientRequirementsAdminService {
           userId: patientId,
           userRole: UserRole.PATIENT,
           notificationType: NotificationType.REQUIREMENT_INSTRUCTION_DUE,
-          notificationTime: currentInstruction.dueTime, // This is a Firestore Timestamp
+          notificationTime: currentInstruction.dueTime as any, // dueTime should be an admin.firestore.Timestamp already
           notificationTokens: patientExpoTokens,
           title: `Reminder: ${instance.requirementName}`,
           body: currentInstruction.instructionText,