@blackcode_sa/metaestetics-api 1.12.26 → 1.12.28

package/dist/admin/index.d.mts

@@ -3196,6 +3196,7 @@ declare class BookingAvailabilityCalculator {
      * @param intervals - Final available intervals
      * @param intervalMinutes - Scheduling interval in minutes
      * @param durationMinutes - Procedure duration in minutes
+     * @param tz - IANA timezone of the clinic
      * @returns Array of available booking slots
      */
     private static generateAvailableSlots;
@@ -3205,6 +3206,7 @@ declare class BookingAvailabilityCalculator {
      * @param slotStart - Start time of the slot
      * @param slotEnd - End time of the slot
      * @param intervals - Available intervals
+     * @param tz - IANA timezone of the clinic
      * @returns True if the slot is fully contained within an available interval
      */
     private static isSlotFullyAvailable;

package/dist/admin/index.d.ts

@@ -3196,6 +3196,7 @@ declare class BookingAvailabilityCalculator {
      * @param intervals - Final available intervals
      * @param intervalMinutes - Scheduling interval in minutes
      * @param durationMinutes - Procedure duration in minutes
+     * @param tz - IANA timezone of the clinic
      * @returns Array of available booking slots
      */
     private static generateAvailableSlots;
@@ -3205,6 +3206,7 @@ declare class BookingAvailabilityCalculator {
      * @param slotStart - Start time of the slot
      * @param slotEnd - End time of the slot
      * @param intervals - Available intervals
+     * @param tz - IANA timezone of the clinic
      * @returns True if the slot is fully contained within an available interval
      */
     private static isSlotFullyAvailable;

package/dist/admin/index.js

@@ -6603,7 +6603,8 @@ var BookingAvailabilityCalculator = class {
     const availableSlots = this.generateAvailableSlots(
       availableIntervals,
       schedulingIntervalMinutes,
-      procedureDurationMinutes
+      procedureDurationMinutes,
+      tz
     );
     return { availableSlots };
   }
@@ -6855,19 +6856,20 @@ var BookingAvailabilityCalculator = class {
    * @param intervals - Final available intervals
    * @param intervalMinutes - Scheduling interval in minutes
    * @param durationMinutes - Procedure duration in minutes
+   * @param tz - IANA timezone of the clinic
    * @returns Array of available booking slots
    */
-  static generateAvailableSlots(intervals, intervalMinutes, durationMinutes) {
+  static generateAvailableSlots(intervals, intervalMinutes, durationMinutes, tz) {
     const slots = [];
     console.log(
-      `Generating slots with ${intervalMinutes}min intervals for ${durationMinutes}min procedure`
+      `Generating slots with ${intervalMinutes}min intervals for ${durationMinutes}min procedure in timezone ${tz}`
     );
     const durationMs = durationMinutes * 60 * 1e3;
     const intervalMs = intervalMinutes * 60 * 1e3;
     for (const interval of intervals) {
       const intervalStart = interval.start.toDate();
       const intervalEnd = interval.end.toDate();
-      let slotStart = import_luxon.DateTime.fromJSDate(intervalStart);
+      let slotStart = import_luxon.DateTime.fromMillis(intervalStart.getTime(), { zone: tz });
       const minutesIntoDay = slotStart.hour * 60 + slotStart.minute;
       const minutesRemainder = minutesIntoDay % intervalMinutes;
       if (minutesRemainder > 0) {
@@ -6877,7 +6879,7 @@ var BookingAvailabilityCalculator = class {
       }
       while (slotStart.toMillis() + durationMs <= intervalEnd.getTime()) {
         const slotEnd = slotStart.plus({ minutes: durationMinutes });
-        if (this.isSlotFullyAvailable(slotStart, slotEnd, intervals)) {
+        if (this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
           slots.push({
             start: import_firestore2.Timestamp.fromMillis(slotStart.toMillis())
           });
@@ -6894,12 +6896,13 @@ var BookingAvailabilityCalculator = class {
    * @param slotStart - Start time of the slot
    * @param slotEnd - End time of the slot
    * @param intervals - Available intervals
+   * @param tz - IANA timezone of the clinic
    * @returns True if the slot is fully contained within an available interval
    */
-  static isSlotFullyAvailable(slotStart, slotEnd, intervals) {
+  static isSlotFullyAvailable(slotStart, slotEnd, intervals, tz) {
     return intervals.some((interval) => {
-      const intervalStart = import_luxon.DateTime.fromMillis(interval.start.toMillis());
-      const intervalEnd = import_luxon.DateTime.fromMillis(interval.end.toMillis());
+      const intervalStart = import_luxon.DateTime.fromMillis(interval.start.toMillis(), { zone: tz });
+      const intervalEnd = import_luxon.DateTime.fromMillis(interval.end.toMillis(), { zone: tz });
       return slotStart >= intervalStart && slotEnd <= intervalEnd;
     });
   }
@@ -7344,16 +7347,23 @@ var BookingAdmin = class {
         startTime: start.toDate().toISOString(),
         endTime: end.toDate().toISOString()
       });
-      const eventsRef = this.db.collection(`clinics/${clinicId}/calendar`).where("eventTime.start", ">=", start).where("eventTime.start", "<=", end);
+      const MAX_EVENT_DURATION_MS = 24 * 60 * 60 * 1e3;
+      const queryStart = admin15.firestore.Timestamp.fromMillis(
+        start.toMillis() - MAX_EVENT_DURATION_MS
+      );
+      const eventsRef = this.db.collection(`clinics/${clinicId}/calendar`).where("eventTime.start", ">=", queryStart).where("eventTime.start", "<", end).orderBy("eventTime.start");
       const snapshot = await eventsRef.get();
       const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id
-      }));
+      })).filter((event) => {
+        return event.eventTime.end.toMillis() > start.toMillis();
+      });
       Logger.debug("[BookingAdmin] Retrieved clinic calendar events", {
         clinicId,
         eventsCount: events.length,
-        eventsTypes: this.summarizeEventTypes(events)
+        eventsTypes: this.summarizeEventTypes(events),
+        queryStartTime: queryStart.toDate().toISOString()
       });
       return events;
     } catch (error) {
@@ -7383,16 +7393,23 @@ var BookingAdmin = class {
         startTime: start.toDate().toISOString(),
         endTime: end.toDate().toISOString()
       });
-      const eventsRef = this.db.collection(`practitioners/${practitionerId}/calendar`).where("eventTime.start", ">=", start).where("eventTime.start", "<=", end);
+      const MAX_EVENT_DURATION_MS = 24 * 60 * 60 * 1e3;
+      const queryStart = admin15.firestore.Timestamp.fromMillis(
+        start.toMillis() - MAX_EVENT_DURATION_MS
+      );
+      const eventsRef = this.db.collection(`practitioners/${practitionerId}/calendar`).where("eventTime.start", ">=", queryStart).where("eventTime.start", "<", end).orderBy("eventTime.start");
       const snapshot = await eventsRef.get();
       const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id
-      }));
+      })).filter((event) => {
+        return event.eventTime.end.toMillis() > start.toMillis();
+      });
       Logger.debug("[BookingAdmin] Retrieved practitioner calendar events", {
         practitionerId,
         eventsCount: events.length,
-        eventsTypes: this.summarizeEventTypes(events)
+        eventsTypes: this.summarizeEventTypes(events),
+        queryStartTime: queryStart.toDate().toISOString()
       });
       return events;
     } catch (error) {

package/dist/admin/index.mjs

@@ -6541,7 +6541,8 @@ var BookingAvailabilityCalculator = class {
     const availableSlots = this.generateAvailableSlots(
       availableIntervals,
       schedulingIntervalMinutes,
-      procedureDurationMinutes
+      procedureDurationMinutes,
+      tz
     );
     return { availableSlots };
   }
@@ -6793,19 +6794,20 @@ var BookingAvailabilityCalculator = class {
    * @param intervals - Final available intervals
    * @param intervalMinutes - Scheduling interval in minutes
    * @param durationMinutes - Procedure duration in minutes
+   * @param tz - IANA timezone of the clinic
    * @returns Array of available booking slots
    */
-  static generateAvailableSlots(intervals, intervalMinutes, durationMinutes) {
+  static generateAvailableSlots(intervals, intervalMinutes, durationMinutes, tz) {
     const slots = [];
     console.log(
-      `Generating slots with ${intervalMinutes}min intervals for ${durationMinutes}min procedure`
+      `Generating slots with ${intervalMinutes}min intervals for ${durationMinutes}min procedure in timezone ${tz}`
     );
     const durationMs = durationMinutes * 60 * 1e3;
     const intervalMs = intervalMinutes * 60 * 1e3;
     for (const interval of intervals) {
       const intervalStart = interval.start.toDate();
       const intervalEnd = interval.end.toDate();
-      let slotStart = DateTime.fromJSDate(intervalStart);
+      let slotStart = DateTime.fromMillis(intervalStart.getTime(), { zone: tz });
       const minutesIntoDay = slotStart.hour * 60 + slotStart.minute;
       const minutesRemainder = minutesIntoDay % intervalMinutes;
       if (minutesRemainder > 0) {
@@ -6815,7 +6817,7 @@ var BookingAvailabilityCalculator = class {
       }
       while (slotStart.toMillis() + durationMs <= intervalEnd.getTime()) {
         const slotEnd = slotStart.plus({ minutes: durationMinutes });
-        if (this.isSlotFullyAvailable(slotStart, slotEnd, intervals)) {
+        if (this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
           slots.push({
             start: Timestamp.fromMillis(slotStart.toMillis())
           });
@@ -6832,12 +6834,13 @@ var BookingAvailabilityCalculator = class {
    * @param slotStart - Start time of the slot
    * @param slotEnd - End time of the slot
    * @param intervals - Available intervals
+   * @param tz - IANA timezone of the clinic
    * @returns True if the slot is fully contained within an available interval
    */
-  static isSlotFullyAvailable(slotStart, slotEnd, intervals) {
+  static isSlotFullyAvailable(slotStart, slotEnd, intervals, tz) {
     return intervals.some((interval) => {
-      const intervalStart = DateTime.fromMillis(interval.start.toMillis());
-      const intervalEnd = DateTime.fromMillis(interval.end.toMillis());
+      const intervalStart = DateTime.fromMillis(interval.start.toMillis(), { zone: tz });
+      const intervalEnd = DateTime.fromMillis(interval.end.toMillis(), { zone: tz });
       return slotStart >= intervalStart && slotEnd <= intervalEnd;
     });
   }
@@ -7282,16 +7285,23 @@ var BookingAdmin = class {
         startTime: start.toDate().toISOString(),
         endTime: end.toDate().toISOString()
       });
-      const eventsRef = this.db.collection(`clinics/${clinicId}/calendar`).where("eventTime.start", ">=", start).where("eventTime.start", "<=", end);
+      const MAX_EVENT_DURATION_MS = 24 * 60 * 60 * 1e3;
+      const queryStart = admin15.firestore.Timestamp.fromMillis(
+        start.toMillis() - MAX_EVENT_DURATION_MS
+      );
+      const eventsRef = this.db.collection(`clinics/${clinicId}/calendar`).where("eventTime.start", ">=", queryStart).where("eventTime.start", "<", end).orderBy("eventTime.start");
       const snapshot = await eventsRef.get();
       const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id
-      }));
+      })).filter((event) => {
+        return event.eventTime.end.toMillis() > start.toMillis();
+      });
       Logger.debug("[BookingAdmin] Retrieved clinic calendar events", {
         clinicId,
         eventsCount: events.length,
-        eventsTypes: this.summarizeEventTypes(events)
+        eventsTypes: this.summarizeEventTypes(events),
+        queryStartTime: queryStart.toDate().toISOString()
       });
       return events;
     } catch (error) {
@@ -7321,16 +7331,23 @@ var BookingAdmin = class {
         startTime: start.toDate().toISOString(),
         endTime: end.toDate().toISOString()
       });
-      const eventsRef = this.db.collection(`practitioners/${practitionerId}/calendar`).where("eventTime.start", ">=", start).where("eventTime.start", "<=", end);
+      const MAX_EVENT_DURATION_MS = 24 * 60 * 60 * 1e3;
+      const queryStart = admin15.firestore.Timestamp.fromMillis(
+        start.toMillis() - MAX_EVENT_DURATION_MS
+      );
+      const eventsRef = this.db.collection(`practitioners/${practitionerId}/calendar`).where("eventTime.start", ">=", queryStart).where("eventTime.start", "<", end).orderBy("eventTime.start");
       const snapshot = await eventsRef.get();
       const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id
-      }));
+      })).filter((event) => {
+        return event.eventTime.end.toMillis() > start.toMillis();
+      });
       Logger.debug("[BookingAdmin] Retrieved practitioner calendar events", {
         practitionerId,
         eventsCount: events.length,
-        eventsTypes: this.summarizeEventTypes(events)
+        eventsTypes: this.summarizeEventTypes(events),
+        queryStartTime: queryStart.toDate().toISOString()
       });
       return events;
     } catch (error) {

package/dist/index.d.mts

@@ -4883,6 +4883,7 @@ declare class PatientService extends BaseService {
     getSensitiveInfo(patientId: string, requesterUserId: string): Promise<PatientSensitiveInfo | null>;
     getSensitiveInfoByUserRef(userRef: string, requesterUserId: string): Promise<PatientSensitiveInfo | null>;
     updateSensitiveInfo(patientId: string, data: UpdatePatientSensitiveInfoData, requesterUserId: string): Promise<PatientSensitiveInfo>;
+    claimPatientSensitiveInfo(patientId: string, userId: string): Promise<PatientSensitiveInfo>;
     createMedicalInfo(patientId: string, data: CreatePatientMedicalInfoData): Promise<void>;
     getMedicalInfo(patientId: string): Promise<PatientMedicalInfo>;
     getMedicalInfoByUserRef(userRef: string): Promise<PatientMedicalInfo>;
@@ -4940,8 +4941,8 @@ declare class PatientService extends BaseService {
      * @returns URL string of the uploaded or existing photo
      */
     private handleProfilePhotoUpload;
-    updatePatientProfile(patientId: string, data: Partial<Omit<PatientProfile, "id" | "createdAt" | "updatedAt">>): Promise<PatientProfile>;
-    updatePatientProfileByUserRef(userRef: string, data: Partial<Omit<PatientProfile, "id" | "createdAt" | "updatedAt">>): Promise<PatientProfile>;
+    updatePatientProfile(patientId: string, data: Partial<Omit<PatientProfile, 'id' | 'createdAt' | 'updatedAt'>>): Promise<PatientProfile>;
+    updatePatientProfileByUserRef(userRef: string, data: Partial<Omit<PatientProfile, 'id' | 'createdAt' | 'updatedAt'>>): Promise<PatientProfile>;
     /**
      * Searches for patient profiles based on clinic/practitioner association.
      * Requires information about the requester for security checks.

package/dist/index.d.ts

@@ -4883,6 +4883,7 @@ declare class PatientService extends BaseService {
     getSensitiveInfo(patientId: string, requesterUserId: string): Promise<PatientSensitiveInfo | null>;
     getSensitiveInfoByUserRef(userRef: string, requesterUserId: string): Promise<PatientSensitiveInfo | null>;
     updateSensitiveInfo(patientId: string, data: UpdatePatientSensitiveInfoData, requesterUserId: string): Promise<PatientSensitiveInfo>;
+    claimPatientSensitiveInfo(patientId: string, userId: string): Promise<PatientSensitiveInfo>;
     createMedicalInfo(patientId: string, data: CreatePatientMedicalInfoData): Promise<void>;
     getMedicalInfo(patientId: string): Promise<PatientMedicalInfo>;
     getMedicalInfoByUserRef(userRef: string): Promise<PatientMedicalInfo>;
@@ -4940,8 +4941,8 @@ declare class PatientService extends BaseService {
      * @returns URL string of the uploaded or existing photo
      */
     private handleProfilePhotoUpload;
-    updatePatientProfile(patientId: string, data: Partial<Omit<PatientProfile, "id" | "createdAt" | "updatedAt">>): Promise<PatientProfile>;
-    updatePatientProfileByUserRef(userRef: string, data: Partial<Omit<PatientProfile, "id" | "createdAt" | "updatedAt">>): Promise<PatientProfile>;
+    updatePatientProfile(patientId: string, data: Partial<Omit<PatientProfile, 'id' | 'createdAt' | 'updatedAt'>>): Promise<PatientProfile>;
+    updatePatientProfileByUserRef(userRef: string, data: Partial<Omit<PatientProfile, 'id' | 'createdAt' | 'updatedAt'>>): Promise<PatientProfile>;
     /**
      * Searches for patient profiles based on clinic/practitioner association.
      * Requires information about the requester for security checks.

package/dist/index.js

@@ -4232,10 +4232,7 @@ var checkSensitiveAccessUtil = async (db, patientId, requesterId, requesterRoles
     return;
   }
   if (requesterRoles.includes("practitioner" /* PRACTITIONER */)) {
-    const practitionerProfile = await getPractitionerProfileByUserRef(
-      db,
-      requesterId
-    );
+    const practitionerProfile = await getPractitionerProfileByUserRef(db, requesterId);
     if (practitionerProfile && ((_a = patientData.doctorIds) == null ? void 0 : _a.includes(practitionerProfile.id))) {
       return;
     }
@@ -4283,16 +4280,9 @@ var handlePhotoUrlUpload = async (photoUrl, patientId, mediaService) => {
 };
 var createSensitiveInfoUtil = async (db, data, requesterId, requesterRoles, mediaService) => {
   try {
-    await checkSensitiveAccessUtil(
-      db,
-      data.patientId,
-      requesterId,
-      requesterRoles
-    );
+    await checkSensitiveAccessUtil(db, data.patientId, requesterId, requesterRoles);
     const validatedData = createPatientSensitiveInfoSchema.parse(data);
-    const sensitiveDoc = await (0, import_firestore11.getDoc)(
-      getSensitiveInfoDocRef(db, data.patientId)
-    );
+    const sensitiveDoc = await (0, import_firestore11.getDoc)(getSensitiveInfoDocRef(db, data.patientId));
     if (sensitiveDoc.exists()) {
       throw new Error("Sensitive information already exists for this patient");
     }
@@ -4337,11 +4327,7 @@ var updateSensitiveInfoUtil = async (db, patientId, data, requesterId, requester
   let processedPhotoUrl = void 0;
   if (data.photoUrl !== void 0) {
     if (mediaService) {
-      processedPhotoUrl = await handlePhotoUrlUpload(
-        data.photoUrl,
-        patientId,
-        mediaService
-      );
+      processedPhotoUrl = await handlePhotoUrlUpload(data.photoUrl, patientId, mediaService);
     } else if (typeof data.photoUrl === "string" || data.photoUrl === null) {
       processedPhotoUrl = data.photoUrl;
     } else {
@@ -4360,6 +4346,36 @@ var updateSensitiveInfoUtil = async (db, patientId, data, requesterId, requester
   }
   return updatedDoc.data();
 };
+var claimPatientSensitiveInfoUtil = async (db, patientId, userId) => {
+  const patientDoc = await (0, import_firestore11.getDoc)(getPatientDocRef(db, patientId));
+  if (!patientDoc.exists()) {
+    throw new Error("Patient profile not found");
+  }
+  const patientData = patientDoc.data();
+  if (!patientData.isManual) {
+    throw new Error("Only manually created patient profiles can be claimed");
+  }
+  if (patientData.userRef) {
+    throw new Error("Patient profile has already been claimed");
+  }
+  const sensitiveDoc = await (0, import_firestore11.getDoc)(getSensitiveInfoDocRef(db, patientId));
+  if (!sensitiveDoc.exists()) {
+    throw new Error("Patient sensitive information not found");
+  }
+  const sensitiveData = sensitiveDoc.data();
+  if (sensitiveData.userRef) {
+    throw new Error("Patient sensitive information has already been claimed");
+  }
+  await (0, import_firestore11.updateDoc)(getSensitiveInfoDocRef(db, patientId), {
+    userRef: userId,
+    updatedAt: (0, import_firestore11.serverTimestamp)()
+  });
+  const updatedDoc = await (0, import_firestore11.getDoc)(getSensitiveInfoDocRef(db, patientId));
+  if (!updatedDoc.exists()) {
+    throw new Error("Failed to retrieve updated sensitive information");
+  }
+  return updatedDoc.data();
+};
 
 // src/services/patient/utils/docs.utils.ts
 var getPatientDocRef = (db, patientId) => {
@@ -5500,12 +5516,7 @@ var PatientService = class extends BaseService {
     const currentUser = await this.getCurrentUser();
     if (currentUser.uid !== requesterUserId) {
     }
-    return getSensitiveInfoUtil(
-      this.db,
-      patientId,
-      requesterUserId,
-      currentUser.roles
-    );
+    return getSensitiveInfoUtil(this.db, patientId, requesterUserId, currentUser.roles);
   }
   async getSensitiveInfoByUserRef(userRef, requesterUserId) {
     const profile = await this.getPatientProfileByUserRef(userRef);
@@ -5526,25 +5537,17 @@ var PatientService = class extends BaseService {
       this.mediaService
     );
   }
+  async claimPatientSensitiveInfo(patientId, userId) {
+    return claimPatientSensitiveInfoUtil(this.db, patientId, userId);
+  }
   // Metode za rad sa medicinskim informacijama
   async createMedicalInfo(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await createMedicalInfoUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await createMedicalInfoUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   async getMedicalInfo(patientId) {
     const currentUser = await this.getCurrentUser();
-    return getMedicalInfoUtil(
-      this.db,
-      patientId,
-      currentUser.uid,
-      currentUser.roles
-    );
+    return getMedicalInfoUtil(this.db, patientId, currentUser.uid, currentUser.roles);
   }
   async getMedicalInfoByUserRef(userRef) {
     const profile = await this.getPatientProfileByUserRef(userRef);
@@ -5554,65 +5557,29 @@ var PatientService = class extends BaseService {
   // Metode za rad sa vitalnim statistikama
   async updateVitalStats(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await updateVitalStatsUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await updateVitalStatsUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   // Metode za rad sa alergijama
   async addAllergy(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await addAllergyUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await addAllergyUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   async updateAllergy(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await updateAllergyUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await updateAllergyUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   async removeAllergy(patientId, allergyIndex) {
     const currentUser = await this.getCurrentUser();
-    await removeAllergyUtil(
-      this.db,
-      patientId,
-      allergyIndex,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await removeAllergyUtil(this.db, patientId, allergyIndex, currentUser.uid, currentUser.roles);
   }
   // Metode za rad sa blocking conditions
   async addBlockingCondition(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await addBlockingConditionUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await addBlockingConditionUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   async updateBlockingCondition(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await updateBlockingConditionUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await updateBlockingConditionUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   async removeBlockingCondition(patientId, conditionIndex) {
     const currentUser = await this.getCurrentUser();
@@ -5627,23 +5594,11 @@ var PatientService = class extends BaseService {
   // Metode za rad sa kontraindikacijama
   async addContraindication(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await addContraindicationUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await addContraindicationUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   async updateContraindication(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await updateContraindicationUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await updateContraindicationUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   async removeContraindication(patientId, contraindicationIndex) {
     const currentUser = await this.getCurrentUser();
@@ -5658,23 +5613,11 @@ var PatientService = class extends BaseService {
   // Metode za rad sa medikacijama
   async addMedication(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await addMedicationUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await addMedicationUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   async updateMedication(patientId, data) {
     const currentUser = await this.getCurrentUser();
-    await updateMedicationUtil(
-      this.db,
-      patientId,
-      data,
-      currentUser.uid,
-      currentUser.roles
-    );
+    await updateMedicationUtil(this.db, patientId, data, currentUser.uid, currentUser.roles);
   }
   async removeMedication(patientId, medicationIndex) {
     const currentUser = await this.getCurrentUser();
@@ -5715,9 +5658,7 @@ var PatientService = class extends BaseService {
     if (!this.auth.currentUser) {
       throw new Error("No authenticated user");
     }
-    const userDoc = await (0, import_firestore18.getDoc)(
-      (0, import_firestore18.doc)(this.db, "users", this.auth.currentUser.uid)
-    );
+    const userDoc = await (0, import_firestore18.getDoc)((0, import_firestore18.doc)(this.db, "users", this.auth.currentUser.uid));
     if (!userDoc.exists()) {
       throw new Error("User not found");
     }
@@ -5758,9 +5699,7 @@ var PatientService = class extends BaseService {
    * @returns URL of the uploaded photo
    */
   async uploadProfilePhoto(patientId, file) {
-    console.log(
-      `[PatientService] Uploading profile photo for patient ${patientId}`
-    );
+    console.log(`[PatientService] Uploading profile photo for patient ${patientId}`);
     const mediaMetadata = await this.mediaService.uploadMedia(
       file,
       patientId,
@@ -5783,14 +5722,9 @@ var PatientService = class extends BaseService {
    * @returns URL of the new uploaded photo
    */
   async updateProfilePhoto(patientId, file) {
-    console.log(
-      `[PatientService] Updating profile photo for patient ${patientId}`
-    );
+    console.log(`[PatientService] Updating profile photo for patient ${patientId}`);
     const currentUser = await this.getCurrentUser();
-    const currentSensitiveInfo = await this.getSensitiveInfo(
-      patientId,
-      currentUser.uid
-    );
+    const currentSensitiveInfo = await this.getSensitiveInfo(patientId, currentUser.uid);
     if ((currentSensitiveInfo == null ? void 0 : currentSensitiveInfo.photoUrl) && typeof currentSensitiveInfo.photoUrl === "string") {
       try {
         const existingMediaMetadata = await this.mediaService.getMediaMetadataByUrl(
@@ -5813,14 +5747,9 @@ var PatientService = class extends BaseService {
    * @param patientId - ID of the patient
    */
   async deleteProfilePhoto(patientId) {
-    console.log(
-      `[PatientService] Deleting profile photo for patient ${patientId}`
-    );
+    console.log(`[PatientService] Deleting profile photo for patient ${patientId}`);
     const currentUser = await this.getCurrentUser();
-    const currentSensitiveInfo = await this.getSensitiveInfo(
-      patientId,
-      currentUser.uid
-    );
+    const currentSensitiveInfo = await this.getSensitiveInfo(patientId, currentUser.uid);
     if ((currentSensitiveInfo == null ? void 0 : currentSensitiveInfo.photoUrl) && typeof currentSensitiveInfo.photoUrl === "string") {
       try {
         const existingMediaMetadata = await this.mediaService.getMediaMetadataByUrl(
@@ -5892,10 +5821,7 @@ var PatientService = class extends BaseService {
    * @returns {Promise<PatientProfile[]>} A promise resolving to an array of all patient profiles.
    */
   async getAllPatients(options) {
-    console.log(
-      `[PatientService.getAllPatients] Fetching patients with options:`,
-      options
-    );
+    console.log(`[PatientService.getAllPatients] Fetching patients with options:`, options);
     return getAllPatientsUtil(this.db, options);
   }
   /**
@@ -5926,11 +5852,7 @@ var PatientService = class extends BaseService {
     console.log(
       `[PatientService.getPatientsByPractitionerWithDetails] Fetching detailed patient profiles for practitioner: ${practitionerId}`
     );
-    return getPatientsByPractitionerWithDetailsUtil(
-      this.db,
-      practitionerId,
-      options
-    );
+    return getPatientsByPractitionerWithDetailsUtil(this.db, practitionerId, options);
   }
   /**
    * Gets all patients associated with a specific clinic.
@@ -5942,9 +5864,7 @@ var PatientService = class extends BaseService {
    * @returns {Promise<PatientProfile[]>} A promise resolving to an array of patient profiles
    */
   async getPatientsByClinic(clinicId, options) {
-    console.log(
-      `[PatientService.getPatientsByClinic] Fetching patients for clinic: ${clinicId}`
-    );
+    console.log(`[PatientService.getPatientsByClinic] Fetching patients for clinic: ${clinicId}`);
     return getPatientsByClinicUtil(this.db, clinicId, options);
   }
   /**
@@ -7639,11 +7559,15 @@ var UserService = class extends BaseService {
             if ((await this.getUserById(userId)).patientProfile || patientProfile2.userRef) {
               throw new Error("User already has a patient profile.");
             }
-            const sensitiveInfo = await patientService.getSensitiveInfo(patientProfile2.id, userId);
+            const sensitiveInfo = await patientService.claimPatientSensitiveInfo(
+              patientProfile2.id,
+              userId
+            );
             const fullDisplayName = sensitiveInfo ? `${sensitiveInfo.firstName} ${sensitiveInfo.lastName}` : patientProfile2.displayName;
             await patientService.updatePatientProfile(patientProfile2.id, {
               userRef: userId,
               isManual: false,
+              isVerified: true,
               displayName: fullDisplayName
             });
             await patientService.markPatientTokenAsUsed(token.id, token.patientId, userId);