@blackcode_sa/metaestetics-api 1.6.1 → 1.6.3

package/package.json

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

package/src/services/patient/patient.service.ts

@@ -31,6 +31,7 @@ import {
   PatientClinic,
   SearchPatientsParams,
   RequesterInfo,
+  PatientProfileForDoctor,
 } from "../../types/patient";
 import { Auth } from "firebase/auth";
 import { Firestore } from "firebase/firestore";
@@ -99,7 +100,10 @@ import {
   removeClinicUtil,
 } from "./utils/medical-stuff.utils";
 
-import { getPatientsByPractitionerUtil } from "./utils/practitioner.utils";
+import {
+  getPatientsByPractitionerUtil,
+  getPatientsByPractitionerWithDetailsUtil,
+} from "./utils/practitioner.utils";
 import { getPatientsByClinicUtil } from "./utils/clinic.utils";
 
 export class PatientService extends BaseService {
@@ -543,6 +547,32 @@ export class PatientService extends BaseService {
     return getPatientsByPractitionerUtil(this.db, practitionerId, options);
   }
 
+  /**
+   * Gets all patients associated with a specific practitioner with their sensitive information.
+   *
+   * @param {string} practitionerId - ID of the practitioner whose patients to retrieve
+   * @param {Object} options - Optional parameters for pagination
+   * @param {number} options.limit - Maximum number of profiles to return
+   * @param {string} options.startAfter - The ID of the document to start after (for pagination)
+   * @returns {Promise<PatientProfileForDoctor[]>} A promise resolving to an array of patient profiles with sensitive info
+   */
+  async getPatientsByPractitionerWithDetails(
+    practitionerId: string,
+    options?: {
+      limit?: number;
+      startAfter?: string;
+    }
+  ): Promise<PatientProfileForDoctor[]> {
+    console.log(
+      `[PatientService.getPatientsByPractitionerWithDetails] Fetching detailed patient profiles for practitioner: ${practitionerId}`
+    );
+    return getPatientsByPractitionerWithDetailsUtil(
+      this.db,
+      practitionerId,
+      options
+    );
+  }
+
   /**
    * Gets all patients associated with a specific clinic.
    *

package/src/services/patient/utils/practitioner.utils.ts

@@ -10,7 +10,13 @@ import {
   getDoc,
   QueryConstraint,
 } from "firebase/firestore";
-import { PatientProfile, PATIENTS_COLLECTION } from "../../../types/patient";
+import {
+  PatientProfile,
+  PatientSensitiveInfo,
+  PatientProfileForDoctor,
+  PATIENTS_COLLECTION,
+} from "../../../types/patient";
+import { getSensitiveInfoDocRef } from "./docs.utils";
 
 /**
  * Retrieves all patients associated with a specific practitioner with pagination support.
@@ -78,3 +84,75 @@ export const getPatientsByPractitionerUtil = async (
     );
   }
 };
+
+/**
+ * Retrieves all patients associated with a specific practitioner with their sensitive information.
+ *
+ * @param {Firestore} db - Firestore instance
+ * @param {string} practitionerId - ID of the practitioner whose patients to retrieve
+ * @param {Object} options - Optional parameters for pagination
+ * @param {number} options.limit - Maximum number of profiles to return
+ * @param {string} options.startAfter - The ID of the document to start after (for pagination)
+ * @returns {Promise<PatientProfileForDoctor[]>} A promise resolving to an array of patient profiles with sensitive info
+ */
+export const getPatientsByPractitionerWithDetailsUtil = async (
+  db: Firestore,
+  practitionerId: string,
+  options?: { limit?: number; startAfter?: string }
+): Promise<PatientProfileForDoctor[]> => {
+  try {
+    console.log(
+      `[getPatientsByPractitionerWithDetailsUtil] Fetching detailed patient profiles for practitioner ID: ${practitionerId} with options:`,
+      options
+    );
+
+    // First, get all patient profiles for this practitioner
+    const patientProfiles = await getPatientsByPractitionerUtil(
+      db,
+      practitionerId,
+      options
+    );
+
+    // Then, fetch sensitive info for each patient
+    const patientProfilesWithDetails: PatientProfileForDoctor[] =
+      await Promise.all(
+        patientProfiles.map(async (profile) => {
+          try {
+            const sensitiveInfoDoc = await getDoc(
+              getSensitiveInfoDocRef(db, profile.id)
+            );
+            const sensitiveInfo = sensitiveInfoDoc.exists()
+              ? (sensitiveInfoDoc.data() as PatientSensitiveInfo)
+              : undefined;
+
+            return {
+              patientProfile: profile,
+              patientSensitiveInfo: sensitiveInfo,
+            };
+          } catch (error) {
+            console.error(
+              `[getPatientsByPractitionerWithDetailsUtil] Error fetching sensitive info for patient ${profile.id}:`,
+              error
+            );
+            // Return profile without sensitive info in case of error
+            return { patientProfile: profile };
+          }
+        })
+      );
+
+    console.log(
+      `[getPatientsByPractitionerWithDetailsUtil] Found ${patientProfilesWithDetails.length} detailed patient profiles for practitioner ID: ${practitionerId}`
+    );
+    return patientProfilesWithDetails;
+  } catch (error) {
+    console.error(
+      `[getPatientsByPractitionerWithDetailsUtil] Error fetching detailed patient profiles:`,
+      error
+    );
+    throw new Error(
+      `Failed to retrieve detailed patient profiles: ${
+        error instanceof Error ? error.message : String(error)
+      }`
+    );
+  }
+};

package/src/services/practitioner/practitioner.service.ts

@@ -220,12 +220,17 @@ export class PractitionerService extends BaseService {
       for (const cId of clinics) {
         const clinicData = await this.getClinicService().getClinic(cId);
         if (clinicData) {
+          // Ensure we're creating a ClinicInfo object that matches the interface structure
           clinicsInfo.push({
             id: clinicData.id,
             name: clinicData.name,
             location: clinicData.location,
             contactInfo: clinicData.contactInfo,
-            featuredPhoto: clinicData.coverPhoto || "",
+            // Make sure we're using the right property for featuredPhoto
+            featuredPhoto:
+              clinicData.featuredPhotos && clinicData.featuredPhotos.length > 0
+                ? clinicData.featuredPhotos[0]
+                : clinicData.coverPhoto || "",
             description: clinicData.description || null,
           });
         }

package/src/types/patient/index.ts

@@ -237,3 +237,9 @@ export interface PatientProfileComplete {
   patientMedicalInfo?: PatientMedicalInfo;
   patientLocationInfo?: PatientLocationInfo;
 }
+
+// Create a type that combines patientProfile and patientSensitiveInfo, this will be used in the doctor's app only
+export interface PatientProfileForDoctor {
+  patientProfile?: PatientProfile;
+  patientSensitiveInfo?: PatientSensitiveInfo;
+}

package/src/validations/clinic.schema.ts

@@ -13,8 +13,12 @@ import {
   Currency,
   PricingMeasure,
 } from "../backoffice/types/static/pricing.types";
-import { procedureSummaryInfoSchema } from "./practitioner.schema";
 import { clinicReviewInfoSchema } from "./reviews.schema";
+import {
+  procedureSummaryInfoSchema,
+  clinicInfoSchema,
+  doctorInfoSchema,
+} from "./shared.schema";
 
 /**
  * Validaciona šema za kontakt informacije
@@ -92,30 +96,6 @@ export const adminInfoSchema = z.object({
   email: z.string().email(),
 });
 
-/**
- * Validaciona šema za osnovne informacije o klinici (for aggregation)
- */
-export const clinicInfoSchema = z.object({
-  id: z.string(),
-  featuredPhoto: z.string(),
-  name: z.string(),
-  description: z.string().nullable().optional(),
-  location: clinicLocationSchema,
-  contactInfo: clinicContactInfoSchema,
-});
-
-/**
- * Validaciona šema za informacije o doktoru (for aggregation in Clinic)
- */
-export const doctorInfoSchema = z.object({
-  id: z.string(),
-  name: z.string(),
-  description: z.string().nullable().optional(),
-  photo: z.string(),
-  rating: z.number().min(0).max(5),
-  services: z.array(z.string()), // List of procedure IDs practitioner offers
-});
-
 /**
  * @deprecated Replaced by procedureSummaryInfoSchema.
  * Validaciona šema za informacije o usluzi (Old aggregation schema)

package/src/validations/practitioner.schema.ts

@@ -9,12 +9,12 @@ import {
   PractitionerTokenStatus,
 } from "../types/practitioner";
 import { practitionerReviewInfoSchema } from "./reviews.schema";
-import { clinicInfoSchema } from "./clinic.schema";
 import { ProcedureFamily } from "../backoffice/types/static/procedure-family.types";
 import {
   Currency,
   PricingMeasure,
 } from "../backoffice/types/static/pricing.types";
+import { clinicInfoSchema, procedureSummaryInfoSchema } from "./shared.schema";
 
 /**
  * Šema za validaciju osnovnih informacija o zdravstvenom radniku
@@ -93,7 +93,7 @@ export const practitionerClinicWorkingHoursSchema = z.object({
 /**
  * Schema matching ProcedureSummaryInfo interface
  */
-export const procedureSummaryInfoSchema = z.object({
+/* export const procedureSummaryInfoSchema = z.object({
   id: z.string().min(1),
   name: z.string().min(1),
   description: z.string().optional(),
@@ -110,7 +110,7 @@ export const procedureSummaryInfoSchema = z.object({
   clinicName: z.string().min(1),
   practitionerId: z.string().min(1),
   practitionerName: z.string().min(1),
-});
+}); */
 
 /**
  * Šema za validaciju kompletnog profila zdravstvenog radnika

package/src/validations/procedure.schema.ts

@@ -4,7 +4,7 @@ import {
   Currency,
   PricingMeasure,
 } from "../backoffice/types/static/pricing.types";
-import { clinicInfoSchema, doctorInfoSchema } from "./clinic.schema";
+import { clinicInfoSchema, doctorInfoSchema } from "./shared.schema";
 import { procedureReviewInfoSchema } from "./reviews.schema";
 
 /**

package/src/validations/shared.schema.ts

@@ -0,0 +1,78 @@
+import { z } from "zod";
+import { Timestamp } from "firebase/firestore";
+import { ProcedureFamily } from "../backoffice/types/static/procedure-family.types";
+import {
+  Currency,
+  PricingMeasure,
+} from "../backoffice/types/static/pricing.types";
+// Remove import from clinic schema to avoid circular dependency
+// import { clinicLocationSchema, clinicContactInfoSchema } from "./clinic.schema";
+
+/**
+ * Validation schema for clinic contact information
+ */
+export const sharedClinicContactInfoSchema = z.object({
+  email: z.string().email(),
+  phoneNumber: z.string(),
+  alternativePhoneNumber: z.string().nullable().optional(),
+  website: z.string().nullable().optional(),
+});
+
+/**
+ * Validation schema for clinic location
+ */
+export const sharedClinicLocationSchema = z.object({
+  address: z.string(),
+  city: z.string(),
+  country: z.string(),
+  postalCode: z.string(),
+  latitude: z.number().min(-90).max(90),
+  longitude: z.number().min(-180).max(180),
+  geohash: z.string().nullable().optional(),
+});
+
+/**
+ * Schema for procedure summary info - shared between practitioner and clinic schemas
+ */
+export const procedureSummaryInfoSchema = z.object({
+  id: z.string().min(1),
+  name: z.string().min(1),
+  description: z.string().optional(),
+  photo: z.string().optional(),
+  family: z.nativeEnum(ProcedureFamily),
+  categoryName: z.string(),
+  subcategoryName: z.string(),
+  technologyName: z.string(),
+  price: z.number().nonnegative(),
+  pricingMeasure: z.nativeEnum(PricingMeasure),
+  currency: z.nativeEnum(Currency),
+  duration: z.number().int().positive(),
+  clinicId: z.string().min(1),
+  clinicName: z.string().min(1),
+  practitionerId: z.string().min(1),
+  practitionerName: z.string().min(1),
+});
+
+/**
+ * Schema for clinic info - shared between practitioner and clinic schemas
+ */
+export const clinicInfoSchema = z.object({
+  id: z.string(),
+  featuredPhoto: z.string(),
+  name: z.string(),
+  description: z.string().nullable().optional(),
+  location: sharedClinicLocationSchema,
+  contactInfo: sharedClinicContactInfoSchema,
+});
+
+/**
+ * Schema for doctor info - shared between procedure and clinic schemas
+ */
+export const doctorInfoSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  description: z.string().nullable().optional(),
+  photo: z.string(),
+  rating: z.number().min(0).max(5),
+  services: z.array(z.string()), // List of procedure IDs practitioner offers
+});