@blackcode_sa/metaestetics-api 1.12.27 → 1.12.29

package/dist/index.mjs

@@ -2905,12 +2905,7 @@ import {
 } from "firebase/firestore";
 
 // src/services/patient/utils/sensitive.utils.ts
-import {
-  getDoc as getDoc6,
-  updateDoc as updateDoc4,
-  setDoc as setDoc4,
-  serverTimestamp as serverTimestamp4
-} from "firebase/firestore";
+import { getDoc as getDoc6, updateDoc as updateDoc4, setDoc as setDoc4, serverTimestamp as serverTimestamp4 } from "firebase/firestore";
 
 // src/validations/patient.schema.ts
 import { z as z7 } from "zod";
@@ -4211,10 +4206,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;
     }
@@ -4262,16 +4254,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 getDoc6(
-      getSensitiveInfoDocRef(db, data.patientId)
-    );
+    const sensitiveDoc = await getDoc6(getSensitiveInfoDocRef(db, data.patientId));
     if (sensitiveDoc.exists()) {
       throw new Error("Sensitive information already exists for this patient");
     }
@@ -4316,11 +4301,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 {
@@ -4339,6 +4320,36 @@ var updateSensitiveInfoUtil = async (db, patientId, data, requesterId, requester
   }
   return updatedDoc.data();
 };
+var claimPatientSensitiveInfoUtil = async (db, patientId, userId) => {
+  const patientDoc = await getDoc6(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 getDoc6(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 updateDoc4(getSensitiveInfoDocRef(db, patientId), {
+    userRef: userId,
+    updatedAt: serverTimestamp4()
+  });
+  const updatedDoc = await getDoc6(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) => {
@@ -5524,12 +5535,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);
@@ -5550,25 +5556,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);
@@ -5578,65 +5576,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();
@@ -5651,23 +5613,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();
@@ -5682,23 +5632,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();
@@ -5739,9 +5677,7 @@ var PatientService = class extends BaseService {
     if (!this.auth.currentUser) {
       throw new Error("No authenticated user");
     }
-    const userDoc = await getDoc13(
-      doc10(this.db, "users", this.auth.currentUser.uid)
-    );
+    const userDoc = await getDoc13(doc10(this.db, "users", this.auth.currentUser.uid));
     if (!userDoc.exists()) {
       throw new Error("User not found");
     }
@@ -5782,9 +5718,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,
@@ -5807,14 +5741,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(
@@ -5837,14 +5766,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(
@@ -5916,10 +5840,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);
   }
   /**
@@ -5950,11 +5871,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.
@@ -5966,9 +5883,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);
   }
   /**
@@ -7680,11 +7595,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);
@@ -8726,7 +8645,8 @@ import {
   writeBatch as writeBatch4,
   arrayUnion as arrayUnion7
 } from "firebase/firestore";
-import { getFunctions as getFunctions2, httpsCallable as httpsCallable2 } from "firebase/functions";
+import { getFunctions as getFunctions2 } from "firebase/functions";
+import { find as findTimezone } from "geo-tz";
 import {
   geohashForLocation as geohashForLocation4
 } from "geofire-common";
@@ -9513,22 +9433,20 @@ var ClinicService = class extends BaseService {
     this.functions = getFunctions2(app, "europe-west6");
   }
   /**
-   * Get timezone from coordinates using the callable function
+   * Get timezone from coordinates using geo-tz library
    * @param lat Latitude
    * @param lng Longitude
    * @returns IANA timezone string
    */
-  async getTimezone(lat, lng) {
+  getTimezone(lat, lng) {
     try {
-      const getTimezoneFromCoordinates = httpsCallable2(
-        this.functions,
-        "getTimezoneFromCoordinates"
-      );
-      const result = await getTimezoneFromCoordinates({ lat, lng });
-      const data = result.data;
-      return data.timezone;
+      const timezones = findTimezone(lat, lng);
+      if (timezones && timezones.length > 0) {
+        return timezones[0];
+      }
+      return null;
     } catch (error) {
-      console.error("Error getting timezone:", error);
+      console.error("[CLINIC_SERVICE] Error getting timezone:", error);
       return null;
     }
   }
@@ -9643,7 +9561,7 @@ var ClinicService = class extends BaseService {
       );
       const location = validatedData.location;
       const hash = geohashForLocation4([location.latitude, location.longitude]);
-      const tz = await this.getTimezone(location.latitude, location.longitude);
+      const tz = this.getTimezone(location.latitude, location.longitude);
       console.log("\u{1F3E5} Clinic timezone:", tz);
       const defaultReviewInfo = {
         totalReviews: 0,
@@ -9766,7 +9684,7 @@ var ClinicService = class extends BaseService {
       }
       if (validatedData.location) {
         const loc = validatedData.location;
-        const tz = await this.getTimezone(loc.latitude, loc.longitude);
+        const tz = this.getTimezone(loc.latitude, loc.longitude);
         updatePayload.location = {
           ...loc,
           geohash: geohashForLocation4([loc.latitude, loc.longitude]),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.12.27",
+  "version": "1.12.29",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -98,6 +98,7 @@
     "axios": "^1.8.3",
     "expo-server-sdk": "^3.13.0",
     "firebase-admin": "^13.0.2",
+    "geo-tz": "^8.1.4",
     "geofire-common": "^6.0.0",
     "luxon": "^3.7.1",
     "zod": "^3.24.1"

package/src/services/clinic/clinic.service.ts

@@ -18,6 +18,7 @@ import {
   arrayRemove,
 } from "firebase/firestore";
 import { getFunctions, httpsCallable } from "firebase/functions";
+import { find as findTimezone } from "geo-tz";
 import { BaseService } from "../base.service";
 import {
   Clinic,
@@ -82,22 +83,20 @@ export class ClinicService extends BaseService {
   }
 
   /**
-   * Get timezone from coordinates using the callable function
+   * Get timezone from coordinates using geo-tz library
    * @param lat Latitude
    * @param lng Longitude
    * @returns IANA timezone string
    */
-  private async getTimezone(lat: number, lng: number): Promise<string | null> {
+  private getTimezone(lat: number, lng: number): string | null {
     try {
-      const getTimezoneFromCoordinates = httpsCallable(
-        this.functions,
-        "getTimezoneFromCoordinates"
-      );
-      const result = await getTimezoneFromCoordinates({ lat, lng });
-      const data = result.data as { timezone: string };
-      return data.timezone;
+      const timezones = findTimezone(lat, lng);
+      if (timezones && timezones.length > 0) {
+        return timezones[0];
+      }
+      return null;
     } catch (error) {
-      console.error("Error getting timezone:", error);
+      console.error("[CLINIC_SERVICE] Error getting timezone:", error);
       return null;
     }
   }
@@ -249,7 +248,7 @@ export class ClinicService extends BaseService {
 
       const location = validatedData.location;
       const hash = geohashForLocation([location.latitude, location.longitude]);
-      const tz = await this.getTimezone(location.latitude, location.longitude);
+      const tz = this.getTimezone(location.latitude, location.longitude);
       console.log("🏥 Clinic timezone:", tz);
       const defaultReviewInfo: ClinicReviewInfo = {
         totalReviews: 0,
@@ -418,7 +417,7 @@ export class ClinicService extends BaseService {
       // Handle location update with geohash
       if (validatedData.location) {
         const loc = validatedData.location;
-        const tz = await this.getTimezone(loc.latitude, loc.longitude);
+        const tz = this.getTimezone(loc.latitude, loc.longitude);
         updatePayload.location = {
           ...loc,
           geohash: geohashForLocation([loc.latitude, loc.longitude]),