@blackcode_sa/metaestetics-api 1.12.58 → 1.12.61

package/dist/admin/index.d.mts

@@ -2002,6 +2002,13 @@ declare enum PatientRequirementOverallStatus {
     SUPERSEDED_RESCHEDULE = "supersededReschedule",// This instance was replaced by a new one due to appointment reschedule.
     FAILED_TO_PROCESS = "failedToProcess"
 }
+/**
+ * Represents source procedure information for a requirement instance
+ */
+interface RequirementSourceProcedure {
+    procedureId: string;
+    procedureName: string;
+}
 /**
  * Represents an instance of a backoffice Requirement, tailored to a specific patient and appointment.
  * This document lives in the patient's subcollection: `patients/{patientId}/patientRequirements/{instanceId}`.
@@ -2017,6 +2024,7 @@ interface PatientRequirementInstance {
     requirementImportance: RequirementImportance;
     overallStatus: PatientRequirementOverallStatus;
     instructions: PatientRequirementInstruction[];
+    sourceProcedures?: RequirementSourceProcedure[];
     createdAt: Timestamp;
     updatedAt: Timestamp;
 }
@@ -2548,11 +2556,35 @@ declare class AppointmentAggregationService {
      * @returns {Promise<void>} A promise that resolves when the operation is complete.
      */
     private createPreAppointmentRequirementInstances;
+    /**
+     * Fetches post-requirements from a procedure document
+     * @param procedureId - The procedure ID to fetch requirements from
+     * @returns Promise resolving to array of post-requirements with source procedure info
+     */
+    private fetchPostRequirementsFromProcedure;
+    /**
+     * Collects all post-requirements from primary and extended procedures
+     * @param appointment - The appointment to collect requirements for
+     * @returns Promise resolving to array of requirements with source procedures
+     */
+    private collectAllPostRequirements;
+    /**
+     * Generates a unique key for a requirement based on ID and timeframe
+     * @param requirement - The requirement to generate a key for
+     * @returns Unique key string
+     */
+    private getRequirementKey;
+    /**
+     * Deduplicates requirements based on requirement ID and timeframe
+     * Merges source procedures when requirements match
+     * @param requirements - Array of requirements with sources
+     * @returns Deduplicated array of requirements
+     */
+    private deduplicateRequirements;
     /**
      * Creates POST_APPOINTMENT PatientRequirementInstance documents for a given appointment.
-     * Uses the `appointment.postProcedureRequirements` array.
-     * For each active POST requirement template, it constructs a new PatientRequirementInstance document
-     * with derived instructions and batch writes them to Firestore under the patient's `patient_requirements` subcollection.
+     * Fetches requirements from primary and extended procedures, deduplicates them,
+     * and creates requirement instances with source procedure tracking.
      *
      * @param {Appointment} appointment - The appointment for which to create post-requirement instances.
      * @returns {Promise<void>} A promise that resolves when the operation is complete.
@@ -3728,4 +3760,4 @@ declare class UserProfileAdminService {
     initializePractitionerRole(userId: string): Promise<User>;
 }
 
-export { type Appointment, AppointmentAggregationService, type AppointmentCancellationEmailData, type AppointmentConfirmationEmailData, type AppointmentEmailDataBase, AppointmentMailingService, type AppointmentReminderNotification, type AppointmentRequestedEmailData, type AppointmentRescheduledProposalEmailData, AppointmentStatus, type AvailableSlot, BaseMailingService, type BaseNotification, type BillingInfo, type BillingTransaction, BillingTransactionType, BookingAdmin, BookingAvailabilityCalculator, type BookingAvailabilityRequest, type BookingAvailabilityResponse, CalendarAdminService, type Clinic, type ClinicAdminNotificationData, ClinicAggregationService, type ClinicInfo, type ClinicLocation, type CreateBillingTransactionData, type DoctorInfo, DocumentManagerAdminService, type ExistingPractitionerInviteEmailData, ExistingPractitionerInviteMailingService, type FilledDocument, FilledFormsAggregationService, type InitializeAppointmentFormsResult, Logger, NOTIFICATIONS_COLLECTION, type NewMailgunClient$2 as NewMailgunClient, type Notification, NotificationStatus, NotificationType, NotificationsAdmin, type OrchestrateAppointmentCreationData, PATIENTS_COLLECTION, PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME, PATIENT_SENSITIVE_INFO_COLLECTION, type PatientProfile as Patient, PatientAggregationService, PatientInstructionStatus, type PatientProfile, type PatientRequirementInstance, type PatientRequirementInstruction, PatientRequirementOverallStatus, PatientRequirementsAdminService, type PatientSensitiveInfo, type PlanDetails, type PostRequirementNotification, type Practitioner, PractitionerAggregationService, type PractitionerInvite, PractitionerInviteAggregationService, type PractitionerInviteEmailData, PractitionerInviteMailingService, PractitionerInviteStatus, type PractitionerToken, PractitionerTokenStatus, type PreRequirementNotification, type Procedure, ProcedureAggregationService, type ProcedureSummaryInfo, type Review, type ReviewAddedEmailData, type ReviewRequestEmailData, ReviewsAggregationService, type StripeTransactionData, SubscriptionStatus, type TimeInterval, UserProfileAdminService, UserRole, freeConsultationInfrastructure };
+export { type Appointment, AppointmentAggregationService, type AppointmentCancellationEmailData, type AppointmentConfirmationEmailData, type AppointmentEmailDataBase, AppointmentMailingService, type AppointmentReminderNotification, type AppointmentRequestedEmailData, type AppointmentRescheduledProposalEmailData, AppointmentStatus, type AvailableSlot, BaseMailingService, type BaseNotification, type BillingInfo, type BillingTransaction, BillingTransactionType, BookingAdmin, BookingAvailabilityCalculator, type BookingAvailabilityRequest, type BookingAvailabilityResponse, CalendarAdminService, type Clinic, type ClinicAdminNotificationData, ClinicAggregationService, type ClinicInfo, type ClinicLocation, type CreateBillingTransactionData, type DoctorInfo, DocumentManagerAdminService, type ExistingPractitionerInviteEmailData, ExistingPractitionerInviteMailingService, type FilledDocument, FilledFormsAggregationService, type InitializeAppointmentFormsResult, Logger, NOTIFICATIONS_COLLECTION, type NewMailgunClient$2 as NewMailgunClient, type Notification, NotificationStatus, NotificationType, NotificationsAdmin, type OrchestrateAppointmentCreationData, PATIENTS_COLLECTION, PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME, PATIENT_SENSITIVE_INFO_COLLECTION, type PatientProfile as Patient, PatientAggregationService, PatientInstructionStatus, type PatientProfile, type PatientRequirementInstance, type PatientRequirementInstruction, PatientRequirementOverallStatus, PatientRequirementsAdminService, type PatientSensitiveInfo, type PlanDetails, type PostRequirementNotification, type Practitioner, PractitionerAggregationService, type PractitionerInvite, PractitionerInviteAggregationService, type PractitionerInviteEmailData, PractitionerInviteMailingService, PractitionerInviteStatus, type PractitionerToken, PractitionerTokenStatus, type PreRequirementNotification, type Procedure, ProcedureAggregationService, type ProcedureSummaryInfo, type RequirementSourceProcedure, type Review, type ReviewAddedEmailData, type ReviewRequestEmailData, ReviewsAggregationService, type StripeTransactionData, SubscriptionStatus, type TimeInterval, UserProfileAdminService, UserRole, freeConsultationInfrastructure };

package/dist/admin/index.d.ts

@@ -2002,6 +2002,13 @@ declare enum PatientRequirementOverallStatus {
     SUPERSEDED_RESCHEDULE = "supersededReschedule",// This instance was replaced by a new one due to appointment reschedule.
     FAILED_TO_PROCESS = "failedToProcess"
 }
+/**
+ * Represents source procedure information for a requirement instance
+ */
+interface RequirementSourceProcedure {
+    procedureId: string;
+    procedureName: string;
+}
 /**
  * Represents an instance of a backoffice Requirement, tailored to a specific patient and appointment.
  * This document lives in the patient's subcollection: `patients/{patientId}/patientRequirements/{instanceId}`.
@@ -2017,6 +2024,7 @@ interface PatientRequirementInstance {
     requirementImportance: RequirementImportance;
     overallStatus: PatientRequirementOverallStatus;
     instructions: PatientRequirementInstruction[];
+    sourceProcedures?: RequirementSourceProcedure[];
     createdAt: Timestamp;
     updatedAt: Timestamp;
 }
@@ -2548,11 +2556,35 @@ declare class AppointmentAggregationService {
      * @returns {Promise<void>} A promise that resolves when the operation is complete.
      */
     private createPreAppointmentRequirementInstances;
+    /**
+     * Fetches post-requirements from a procedure document
+     * @param procedureId - The procedure ID to fetch requirements from
+     * @returns Promise resolving to array of post-requirements with source procedure info
+     */
+    private fetchPostRequirementsFromProcedure;
+    /**
+     * Collects all post-requirements from primary and extended procedures
+     * @param appointment - The appointment to collect requirements for
+     * @returns Promise resolving to array of requirements with source procedures
+     */
+    private collectAllPostRequirements;
+    /**
+     * Generates a unique key for a requirement based on ID and timeframe
+     * @param requirement - The requirement to generate a key for
+     * @returns Unique key string
+     */
+    private getRequirementKey;
+    /**
+     * Deduplicates requirements based on requirement ID and timeframe
+     * Merges source procedures when requirements match
+     * @param requirements - Array of requirements with sources
+     * @returns Deduplicated array of requirements
+     */
+    private deduplicateRequirements;
     /**
      * Creates POST_APPOINTMENT PatientRequirementInstance documents for a given appointment.
-     * Uses the `appointment.postProcedureRequirements` array.
-     * For each active POST requirement template, it constructs a new PatientRequirementInstance document
-     * with derived instructions and batch writes them to Firestore under the patient's `patient_requirements` subcollection.
+     * Fetches requirements from primary and extended procedures, deduplicates them,
+     * and creates requirement instances with source procedure tracking.
      *
      * @param {Appointment} appointment - The appointment for which to create post-requirement instances.
      * @returns {Promise<void>} A promise that resolves when the operation is complete.
@@ -3728,4 +3760,4 @@ declare class UserProfileAdminService {
     initializePractitionerRole(userId: string): Promise<User>;
 }
 
-export { type Appointment, AppointmentAggregationService, type AppointmentCancellationEmailData, type AppointmentConfirmationEmailData, type AppointmentEmailDataBase, AppointmentMailingService, type AppointmentReminderNotification, type AppointmentRequestedEmailData, type AppointmentRescheduledProposalEmailData, AppointmentStatus, type AvailableSlot, BaseMailingService, type BaseNotification, type BillingInfo, type BillingTransaction, BillingTransactionType, BookingAdmin, BookingAvailabilityCalculator, type BookingAvailabilityRequest, type BookingAvailabilityResponse, CalendarAdminService, type Clinic, type ClinicAdminNotificationData, ClinicAggregationService, type ClinicInfo, type ClinicLocation, type CreateBillingTransactionData, type DoctorInfo, DocumentManagerAdminService, type ExistingPractitionerInviteEmailData, ExistingPractitionerInviteMailingService, type FilledDocument, FilledFormsAggregationService, type InitializeAppointmentFormsResult, Logger, NOTIFICATIONS_COLLECTION, type NewMailgunClient$2 as NewMailgunClient, type Notification, NotificationStatus, NotificationType, NotificationsAdmin, type OrchestrateAppointmentCreationData, PATIENTS_COLLECTION, PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME, PATIENT_SENSITIVE_INFO_COLLECTION, type PatientProfile as Patient, PatientAggregationService, PatientInstructionStatus, type PatientProfile, type PatientRequirementInstance, type PatientRequirementInstruction, PatientRequirementOverallStatus, PatientRequirementsAdminService, type PatientSensitiveInfo, type PlanDetails, type PostRequirementNotification, type Practitioner, PractitionerAggregationService, type PractitionerInvite, PractitionerInviteAggregationService, type PractitionerInviteEmailData, PractitionerInviteMailingService, PractitionerInviteStatus, type PractitionerToken, PractitionerTokenStatus, type PreRequirementNotification, type Procedure, ProcedureAggregationService, type ProcedureSummaryInfo, type Review, type ReviewAddedEmailData, type ReviewRequestEmailData, ReviewsAggregationService, type StripeTransactionData, SubscriptionStatus, type TimeInterval, UserProfileAdminService, UserRole, freeConsultationInfrastructure };
+export { type Appointment, AppointmentAggregationService, type AppointmentCancellationEmailData, type AppointmentConfirmationEmailData, type AppointmentEmailDataBase, AppointmentMailingService, type AppointmentReminderNotification, type AppointmentRequestedEmailData, type AppointmentRescheduledProposalEmailData, AppointmentStatus, type AvailableSlot, BaseMailingService, type BaseNotification, type BillingInfo, type BillingTransaction, BillingTransactionType, BookingAdmin, BookingAvailabilityCalculator, type BookingAvailabilityRequest, type BookingAvailabilityResponse, CalendarAdminService, type Clinic, type ClinicAdminNotificationData, ClinicAggregationService, type ClinicInfo, type ClinicLocation, type CreateBillingTransactionData, type DoctorInfo, DocumentManagerAdminService, type ExistingPractitionerInviteEmailData, ExistingPractitionerInviteMailingService, type FilledDocument, FilledFormsAggregationService, type InitializeAppointmentFormsResult, Logger, NOTIFICATIONS_COLLECTION, type NewMailgunClient$2 as NewMailgunClient, type Notification, NotificationStatus, NotificationType, NotificationsAdmin, type OrchestrateAppointmentCreationData, PATIENTS_COLLECTION, PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME, PATIENT_SENSITIVE_INFO_COLLECTION, type PatientProfile as Patient, PatientAggregationService, PatientInstructionStatus, type PatientProfile, type PatientRequirementInstance, type PatientRequirementInstruction, PatientRequirementOverallStatus, PatientRequirementsAdminService, type PatientSensitiveInfo, type PlanDetails, type PostRequirementNotification, type Practitioner, PractitionerAggregationService, type PractitionerInvite, PractitionerInviteAggregationService, type PractitionerInviteEmailData, PractitionerInviteMailingService, PractitionerInviteStatus, type PractitionerToken, PractitionerTokenStatus, type PreRequirementNotification, type Procedure, ProcedureAggregationService, type ProcedureSummaryInfo, type RequirementSourceProcedure, type Review, type ReviewAddedEmailData, type ReviewRequestEmailData, ReviewsAggregationService, type StripeTransactionData, SubscriptionStatus, type TimeInterval, UserProfileAdminService, UserRole, freeConsultationInfrastructure };

package/dist/admin/index.js

@@ -569,6 +569,9 @@ var PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME = "patientRequirements";
 // src/admin/aggregation/appointment/appointment.aggregation.service.ts
 var admin6 = __toESM(require("firebase-admin"));
 
+// src/types/procedure/index.ts
+var PROCEDURES_COLLECTION = "procedures";
+
 // src/admin/requirements/patient-requirements.admin.service.ts
 var admin3 = __toESM(require("firebase-admin"));
 
@@ -580,9 +583,6 @@ var DOCUMENTATION_TEMPLATES_COLLECTION = "documentation-templates";
 var USER_FORMS_SUBCOLLECTION = "user-forms";
 var DOCTOR_FORMS_SUBCOLLECTION = "doctor-forms";
 
-// src/types/procedure/index.ts
-var PROCEDURES_COLLECTION = "procedures";
-
 // src/types/reviews/index.ts
 var REVIEWS_COLLECTION = "reviews";
 
@@ -3193,17 +3193,122 @@ var AppointmentAggregationService = class {
       throw error;
     }
   }
+  /**
+   * Fetches post-requirements from a procedure document
+   * @param procedureId - The procedure ID to fetch requirements from
+   * @returns Promise resolving to array of post-requirements with source procedure info
+   */
+  async fetchPostRequirementsFromProcedure(procedureId) {
+    try {
+      const procedureDoc = await this.db.collection(PROCEDURES_COLLECTION).doc(procedureId).get();
+      if (!procedureDoc.exists) {
+        Logger.warn(`[AggService] Procedure ${procedureId} not found when fetching requirements`);
+        return [];
+      }
+      const procedure = procedureDoc.data();
+      const postRequirements = procedure.postRequirements || [];
+      if (postRequirements.length === 0) {
+        return [];
+      }
+      return postRequirements.map((req) => ({
+        requirement: req,
+        sourceProcedures: [
+          {
+            procedureId: procedure.id,
+            procedureName: procedure.name
+          }
+        ]
+      }));
+    } catch (error) {
+      Logger.error(
+        `[AggService] Error fetching post-requirements from procedure ${procedureId}:`,
+        error
+      );
+      return [];
+    }
+  }
+  /**
+   * Collects all post-requirements from primary and extended procedures
+   * @param appointment - The appointment to collect requirements for
+   * @returns Promise resolving to array of requirements with source procedures
+   */
+  async collectAllPostRequirements(appointment) {
+    var _a;
+    const allRequirements = [];
+    if (appointment.procedureId) {
+      const primaryRequirements = await this.fetchPostRequirementsFromProcedure(
+        appointment.procedureId
+      );
+      allRequirements.push(...primaryRequirements);
+    }
+    const extendedProcedures = ((_a = appointment.metadata) == null ? void 0 : _a.extendedProcedures) || [];
+    if (extendedProcedures.length > 0) {
+      Logger.info(
+        `[AggService] Fetching post-requirements from ${extendedProcedures.length} extended procedures`
+      );
+      const extendedRequirementsPromises = extendedProcedures.map(
+        (extProc) => this.fetchPostRequirementsFromProcedure(extProc.procedureId)
+      );
+      const extendedRequirementsArrays = await Promise.all(extendedRequirementsPromises);
+      extendedRequirementsArrays.forEach((reqs) => {
+        allRequirements.push(...reqs);
+      });
+    }
+    return allRequirements;
+  }
+  /**
+   * Generates a unique key for a requirement based on ID and timeframe
+   * @param requirement - The requirement to generate a key for
+   * @returns Unique key string
+   */
+  getRequirementKey(requirement) {
+    var _a, _b, _c;
+    const timeframeSig = JSON.stringify({
+      duration: ((_a = requirement.timeframe) == null ? void 0 : _a.duration) || 0,
+      unit: ((_b = requirement.timeframe) == null ? void 0 : _b.unit) || "",
+      notifyAt: (((_c = requirement.timeframe) == null ? void 0 : _c.notifyAt) || []).slice().sort((a, b) => a - b)
+    });
+    return `${requirement.id}:${timeframeSig}`;
+  }
+  /**
+   * Deduplicates requirements based on requirement ID and timeframe
+   * Merges source procedures when requirements match
+   * @param requirements - Array of requirements with sources
+   * @returns Deduplicated array of requirements
+   */
+  deduplicateRequirements(requirements) {
+    const requirementMap = /* @__PURE__ */ new Map();
+    for (const reqWithSource of requirements) {
+      const key = this.getRequirementKey(reqWithSource.requirement);
+      if (requirementMap.has(key)) {
+        const existing = requirementMap.get(key);
+        const existingProcedureIds = new Set(
+          existing.sourceProcedures.map((sp) => sp.procedureId)
+        );
+        reqWithSource.sourceProcedures.forEach((sp) => {
+          if (!existingProcedureIds.has(sp.procedureId)) {
+            existing.sourceProcedures.push(sp);
+          }
+        });
+      } else {
+        requirementMap.set(key, {
+          requirement: reqWithSource.requirement,
+          sourceProcedures: [...reqWithSource.sourceProcedures]
+        });
+      }
+    }
+    return Array.from(requirementMap.values());
+  }
   /**
    * Creates POST_APPOINTMENT PatientRequirementInstance documents for a given appointment.
-   * Uses the `appointment.postProcedureRequirements` array.
-   * For each active POST requirement template, it constructs a new PatientRequirementInstance document
-   * with derived instructions and batch writes them to Firestore under the patient's `patient_requirements` subcollection.
+   * Fetches requirements from primary and extended procedures, deduplicates them,
+   * and creates requirement instances with source procedure tracking.
    *
    * @param {Appointment} appointment - The appointment for which to create post-requirement instances.
    * @returns {Promise<void>} A promise that resolves when the operation is complete.
    */
   async createPostAppointmentRequirementInstances(appointment) {
-    var _a;
+    var _a, _b;
     Logger.info(
       `[AggService] Creating POST-appointment requirement instances for appt: ${appointment.id}, patient: ${appointment.patientId}`
     );
@@ -3213,32 +3318,42 @@ var AppointmentAggregationService = class {
       );
       return;
     }
-    if (!appointment.postProcedureRequirements || appointment.postProcedureRequirements.length === 0) {
+    try {
+      const allRequirements = await this.collectAllPostRequirements(appointment);
+      if (allRequirements.length === 0) {
+        Logger.info(
+          `[AggService] No post-requirements found from any procedures for appointment ${appointment.id}. Nothing to create.`
+        );
+        return;
+      }
+      const deduplicatedRequirements = this.deduplicateRequirements(allRequirements);
       Logger.info(
-        `[AggService] No postProcedureRequirements found on appointment ${appointment.id}. Nothing to create.`
+        `[AggService] Found ${allRequirements.length} total post-requirements, ${deduplicatedRequirements.length} after deduplication`
       );
-      return;
-    }
-    try {
-      const batch = this.db.batch();
-      let instancesCreatedCount = 0;
-      let createdInstances = [];
       Logger.info(
-        `[AggService] Found ${appointment.postProcedureRequirements.length} post-requirements to process: ${JSON.stringify(
-          appointment.postProcedureRequirements.map((r) => {
-            var _a2, _b;
+        `[AggService] Processing deduplicated post-requirements: ${JSON.stringify(
+          deduplicatedRequirements.map((r) => {
+            var _a2, _b2;
             return {
-              id: r.id,
-              name: r.name,
-              type: r.type,
-              isActive: r.isActive,
-              hasTimeframe: !!r.timeframe,
-              notifyAtLength: ((_b = (_a2 = r.timeframe) == null ? void 0 : _a2.notifyAt) == null ? void 0 : _b.length) || 0
+              id: r.requirement.id,
+              name: r.requirement.name,
+              type: r.requirement.type,
+              isActive: r.requirement.isActive,
+              hasTimeframe: !!r.requirement.timeframe,
+              notifyAtLength: ((_b2 = (_a2 = r.requirement.timeframe) == null ? void 0 : _a2.notifyAt) == null ? void 0 : _b2.length) || 0,
+              sourceProcedures: r.sourceProcedures.map((sp) => ({
+                procedureId: sp.procedureId,
+                procedureName: sp.procedureName
+              }))
             };
           })
         )}`
       );
-      for (const template of appointment.postProcedureRequirements) {
+      const batch = this.db.batch();
+      let instancesCreatedCount = 0;
+      let createdInstances = [];
+      for (const reqWithSource of deduplicatedRequirements) {
+        const template = reqWithSource.requirement;
         if (!template) {
           Logger.warn(
             `[AggService] Found null/undefined template in postProcedureRequirements array`
@@ -3301,6 +3416,8 @@ var AppointmentAggregationService = class {
           requirementImportance: template.importance,
           overallStatus: "active" /* ACTIVE */,
           instructions,
+          sourceProcedures: reqWithSource.sourceProcedures,
+          // Track which procedures this requirement comes from
           createdAt: admin6.firestore.FieldValue.serverTimestamp(),
           updatedAt: admin6.firestore.FieldValue.serverTimestamp()
         };
@@ -3310,7 +3427,11 @@ var AppointmentAggregationService = class {
             patientId: newInstanceData.patientId,
             appointmentId: newInstanceData.appointmentId,
             requirementName: newInstanceData.requirementName,
-            instructionsCount: newInstanceData.instructions.length
+            instructionsCount: newInstanceData.instructions.length,
+            sourceProcedures: ((_b = newInstanceData.sourceProcedures) == null ? void 0 : _b.map((sp) => ({
+              procedureId: sp.procedureId,
+              procedureName: sp.procedureName
+            }))) || []
           })}`
         );
         batch.set(newInstanceRef, newInstanceData);
@@ -6979,6 +7100,12 @@ var BookingAvailabilityCalculator = class {
     console.log(
       `Generating slots with ${intervalMinutes}min intervals for ${durationMinutes}min procedure in timezone ${tz}`
     );
+    const nowInClinicTz = import_luxon2.DateTime.now().setZone(tz);
+    const MINIMUM_BOOKING_WINDOW_MINUTES = 15;
+    const earliestBookableTime = nowInClinicTz.plus({ minutes: MINIMUM_BOOKING_WINDOW_MINUTES });
+    console.log(
+      `Current time in ${tz}: ${nowInClinicTz.toISO()}, earliest bookable: ${earliestBookableTime.toISO()}`
+    );
     const durationMs = durationMinutes * 60 * 1e3;
     const intervalMs = intervalMinutes * 60 * 1e3;
     for (const interval of intervals) {
@@ -6994,7 +7121,8 @@ var BookingAvailabilityCalculator = class {
       }
       while (slotStart.toMillis() + durationMs <= intervalEnd.getTime()) {
         const slotEnd = slotStart.plus({ minutes: durationMinutes });
-        if (this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
+        const isInFuture = slotStart >= earliestBookableTime;
+        if (isInFuture && this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
           slots.push({
             start: import_firestore2.Timestamp.fromMillis(slotStart.toMillis())
           });
@@ -7002,7 +7130,7 @@ var BookingAvailabilityCalculator = class {
         slotStart = slotStart.plus({ minutes: intervalMinutes });
       }
     }
-    console.log(`Generated ${slots.length} available slots`);
+    console.log(`Generated ${slots.length} available slots (filtered for future times with ${MINIMUM_BOOKING_WINDOW_MINUTES}min minimum window)`);
     return slots;
   }
   /**

package/dist/admin/index.mjs

@@ -507,6 +507,9 @@ var PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME = "patientRequirements";
 // src/admin/aggregation/appointment/appointment.aggregation.service.ts
 import * as admin6 from "firebase-admin";
 
+// src/types/procedure/index.ts
+var PROCEDURES_COLLECTION = "procedures";
+
 // src/admin/requirements/patient-requirements.admin.service.ts
 import * as admin3 from "firebase-admin";
 
@@ -518,9 +521,6 @@ var DOCUMENTATION_TEMPLATES_COLLECTION = "documentation-templates";
 var USER_FORMS_SUBCOLLECTION = "user-forms";
 var DOCTOR_FORMS_SUBCOLLECTION = "doctor-forms";
 
-// src/types/procedure/index.ts
-var PROCEDURES_COLLECTION = "procedures";
-
 // src/types/reviews/index.ts
 var REVIEWS_COLLECTION = "reviews";
 
@@ -3131,17 +3131,122 @@ var AppointmentAggregationService = class {
       throw error;
     }
   }
+  /**
+   * Fetches post-requirements from a procedure document
+   * @param procedureId - The procedure ID to fetch requirements from
+   * @returns Promise resolving to array of post-requirements with source procedure info
+   */
+  async fetchPostRequirementsFromProcedure(procedureId) {
+    try {
+      const procedureDoc = await this.db.collection(PROCEDURES_COLLECTION).doc(procedureId).get();
+      if (!procedureDoc.exists) {
+        Logger.warn(`[AggService] Procedure ${procedureId} not found when fetching requirements`);
+        return [];
+      }
+      const procedure = procedureDoc.data();
+      const postRequirements = procedure.postRequirements || [];
+      if (postRequirements.length === 0) {
+        return [];
+      }
+      return postRequirements.map((req) => ({
+        requirement: req,
+        sourceProcedures: [
+          {
+            procedureId: procedure.id,
+            procedureName: procedure.name
+          }
+        ]
+      }));
+    } catch (error) {
+      Logger.error(
+        `[AggService] Error fetching post-requirements from procedure ${procedureId}:`,
+        error
+      );
+      return [];
+    }
+  }
+  /**
+   * Collects all post-requirements from primary and extended procedures
+   * @param appointment - The appointment to collect requirements for
+   * @returns Promise resolving to array of requirements with source procedures
+   */
+  async collectAllPostRequirements(appointment) {
+    var _a;
+    const allRequirements = [];
+    if (appointment.procedureId) {
+      const primaryRequirements = await this.fetchPostRequirementsFromProcedure(
+        appointment.procedureId
+      );
+      allRequirements.push(...primaryRequirements);
+    }
+    const extendedProcedures = ((_a = appointment.metadata) == null ? void 0 : _a.extendedProcedures) || [];
+    if (extendedProcedures.length > 0) {
+      Logger.info(
+        `[AggService] Fetching post-requirements from ${extendedProcedures.length} extended procedures`
+      );
+      const extendedRequirementsPromises = extendedProcedures.map(
+        (extProc) => this.fetchPostRequirementsFromProcedure(extProc.procedureId)
+      );
+      const extendedRequirementsArrays = await Promise.all(extendedRequirementsPromises);
+      extendedRequirementsArrays.forEach((reqs) => {
+        allRequirements.push(...reqs);
+      });
+    }
+    return allRequirements;
+  }
+  /**
+   * Generates a unique key for a requirement based on ID and timeframe
+   * @param requirement - The requirement to generate a key for
+   * @returns Unique key string
+   */
+  getRequirementKey(requirement) {
+    var _a, _b, _c;
+    const timeframeSig = JSON.stringify({
+      duration: ((_a = requirement.timeframe) == null ? void 0 : _a.duration) || 0,
+      unit: ((_b = requirement.timeframe) == null ? void 0 : _b.unit) || "",
+      notifyAt: (((_c = requirement.timeframe) == null ? void 0 : _c.notifyAt) || []).slice().sort((a, b) => a - b)
+    });
+    return `${requirement.id}:${timeframeSig}`;
+  }
+  /**
+   * Deduplicates requirements based on requirement ID and timeframe
+   * Merges source procedures when requirements match
+   * @param requirements - Array of requirements with sources
+   * @returns Deduplicated array of requirements
+   */
+  deduplicateRequirements(requirements) {
+    const requirementMap = /* @__PURE__ */ new Map();
+    for (const reqWithSource of requirements) {
+      const key = this.getRequirementKey(reqWithSource.requirement);
+      if (requirementMap.has(key)) {
+        const existing = requirementMap.get(key);
+        const existingProcedureIds = new Set(
+          existing.sourceProcedures.map((sp) => sp.procedureId)
+        );
+        reqWithSource.sourceProcedures.forEach((sp) => {
+          if (!existingProcedureIds.has(sp.procedureId)) {
+            existing.sourceProcedures.push(sp);
+          }
+        });
+      } else {
+        requirementMap.set(key, {
+          requirement: reqWithSource.requirement,
+          sourceProcedures: [...reqWithSource.sourceProcedures]
+        });
+      }
+    }
+    return Array.from(requirementMap.values());
+  }
   /**
    * Creates POST_APPOINTMENT PatientRequirementInstance documents for a given appointment.
-   * Uses the `appointment.postProcedureRequirements` array.
-   * For each active POST requirement template, it constructs a new PatientRequirementInstance document
-   * with derived instructions and batch writes them to Firestore under the patient's `patient_requirements` subcollection.
+   * Fetches requirements from primary and extended procedures, deduplicates them,
+   * and creates requirement instances with source procedure tracking.
    *
    * @param {Appointment} appointment - The appointment for which to create post-requirement instances.
    * @returns {Promise<void>} A promise that resolves when the operation is complete.
    */
   async createPostAppointmentRequirementInstances(appointment) {
-    var _a;
+    var _a, _b;
     Logger.info(
       `[AggService] Creating POST-appointment requirement instances for appt: ${appointment.id}, patient: ${appointment.patientId}`
     );
@@ -3151,32 +3256,42 @@ var AppointmentAggregationService = class {
       );
       return;
     }
-    if (!appointment.postProcedureRequirements || appointment.postProcedureRequirements.length === 0) {
+    try {
+      const allRequirements = await this.collectAllPostRequirements(appointment);
+      if (allRequirements.length === 0) {
+        Logger.info(
+          `[AggService] No post-requirements found from any procedures for appointment ${appointment.id}. Nothing to create.`
+        );
+        return;
+      }
+      const deduplicatedRequirements = this.deduplicateRequirements(allRequirements);
       Logger.info(
-        `[AggService] No postProcedureRequirements found on appointment ${appointment.id}. Nothing to create.`
+        `[AggService] Found ${allRequirements.length} total post-requirements, ${deduplicatedRequirements.length} after deduplication`
       );
-      return;
-    }
-    try {
-      const batch = this.db.batch();
-      let instancesCreatedCount = 0;
-      let createdInstances = [];
       Logger.info(
-        `[AggService] Found ${appointment.postProcedureRequirements.length} post-requirements to process: ${JSON.stringify(
-          appointment.postProcedureRequirements.map((r) => {
-            var _a2, _b;
+        `[AggService] Processing deduplicated post-requirements: ${JSON.stringify(
+          deduplicatedRequirements.map((r) => {
+            var _a2, _b2;
             return {
-              id: r.id,
-              name: r.name,
-              type: r.type,
-              isActive: r.isActive,
-              hasTimeframe: !!r.timeframe,
-              notifyAtLength: ((_b = (_a2 = r.timeframe) == null ? void 0 : _a2.notifyAt) == null ? void 0 : _b.length) || 0
+              id: r.requirement.id,
+              name: r.requirement.name,
+              type: r.requirement.type,
+              isActive: r.requirement.isActive,
+              hasTimeframe: !!r.requirement.timeframe,
+              notifyAtLength: ((_b2 = (_a2 = r.requirement.timeframe) == null ? void 0 : _a2.notifyAt) == null ? void 0 : _b2.length) || 0,
+              sourceProcedures: r.sourceProcedures.map((sp) => ({
+                procedureId: sp.procedureId,
+                procedureName: sp.procedureName
+              }))
             };
           })
         )}`
       );
-      for (const template of appointment.postProcedureRequirements) {
+      const batch = this.db.batch();
+      let instancesCreatedCount = 0;
+      let createdInstances = [];
+      for (const reqWithSource of deduplicatedRequirements) {
+        const template = reqWithSource.requirement;
         if (!template) {
           Logger.warn(
             `[AggService] Found null/undefined template in postProcedureRequirements array`
@@ -3239,6 +3354,8 @@ var AppointmentAggregationService = class {
           requirementImportance: template.importance,
           overallStatus: "active" /* ACTIVE */,
           instructions,
+          sourceProcedures: reqWithSource.sourceProcedures,
+          // Track which procedures this requirement comes from
           createdAt: admin6.firestore.FieldValue.serverTimestamp(),
           updatedAt: admin6.firestore.FieldValue.serverTimestamp()
         };
@@ -3248,7 +3365,11 @@ var AppointmentAggregationService = class {
             patientId: newInstanceData.patientId,
             appointmentId: newInstanceData.appointmentId,
             requirementName: newInstanceData.requirementName,
-            instructionsCount: newInstanceData.instructions.length
+            instructionsCount: newInstanceData.instructions.length,
+            sourceProcedures: ((_b = newInstanceData.sourceProcedures) == null ? void 0 : _b.map((sp) => ({
+              procedureId: sp.procedureId,
+              procedureName: sp.procedureName
+            }))) || []
           })}`
         );
         batch.set(newInstanceRef, newInstanceData);
@@ -6917,6 +7038,12 @@ var BookingAvailabilityCalculator = class {
     console.log(
       `Generating slots with ${intervalMinutes}min intervals for ${durationMinutes}min procedure in timezone ${tz}`
     );
+    const nowInClinicTz = DateTime2.now().setZone(tz);
+    const MINIMUM_BOOKING_WINDOW_MINUTES = 15;
+    const earliestBookableTime = nowInClinicTz.plus({ minutes: MINIMUM_BOOKING_WINDOW_MINUTES });
+    console.log(
+      `Current time in ${tz}: ${nowInClinicTz.toISO()}, earliest bookable: ${earliestBookableTime.toISO()}`
+    );
     const durationMs = durationMinutes * 60 * 1e3;
     const intervalMs = intervalMinutes * 60 * 1e3;
     for (const interval of intervals) {
@@ -6932,7 +7059,8 @@ var BookingAvailabilityCalculator = class {
       }
       while (slotStart.toMillis() + durationMs <= intervalEnd.getTime()) {
         const slotEnd = slotStart.plus({ minutes: durationMinutes });
-        if (this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
+        const isInFuture = slotStart >= earliestBookableTime;
+        if (isInFuture && this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
           slots.push({
             start: Timestamp.fromMillis(slotStart.toMillis())
           });
@@ -6940,7 +7068,7 @@ var BookingAvailabilityCalculator = class {
         slotStart = slotStart.plus({ minutes: intervalMinutes });
       }
     }
-    console.log(`Generated ${slots.length} available slots`);
+    console.log(`Generated ${slots.length} available slots (filtered for future times with ${MINIMUM_BOOKING_WINDOW_MINUTES}min minimum window)`);
     return slots;
   }
   /**