@blackcode_sa/metaestetics-api 1.5.29 → 1.5.30

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

@@ -29,9 +29,6 @@ import {
   ClinicBranchSetupData,
   CLINIC_ADMINS_COLLECTION,
   DoctorInfo,
-  // Remove incorrect imports below
-  // ProcedureSummaryInfo,
-  // ClinicInfo
 } from "../../types/clinic";
 // Correct imports
 import { ProcedureSummaryInfo } from "../../types/procedure";
@@ -75,73 +72,8 @@ export class ClinicService extends BaseService {
     this.clinicGroupService = clinicGroupService;
   }
 
-  // --- Helper Functions ---
-
-  /**
-   * Creates an aggregated ClinicInfo object from Clinic data.
-   * @param clinic The clinic object
-   * @returns ClinicInfo object
-   */
-  private _createClinicInfoForAggregation(clinic: Clinic): ClinicInfo {
-    return {
-      id: clinic.id,
-      featuredPhoto:
-        clinic.featuredPhotos && clinic.featuredPhotos.length > 0
-          ? clinic.featuredPhotos[0]
-          : clinic.coverPhoto || "",
-      name: clinic.name,
-      description: clinic.description || "",
-      location: clinic.location,
-      contactInfo: clinic.contactInfo,
-    };
-  }
-
-  /**
-   * Updates the ClinicInfo within the clinicsInfo array for multiple practitioners.
-   * @param practitionerIds IDs of practitioners to update
-   * @param clinicInfo The updated ClinicInfo object
-   */
-  private async _updateClinicInfoInPractitioners(
-    practitionerIds: string[],
-    clinicInfo: ClinicInfo
-  ): Promise<void> {
-    const batch = writeBatch(this.db);
-    const clinicId = clinicInfo.id;
-
-    for (const practitionerId of practitionerIds) {
-      const practitionerRef = doc(
-        this.db,
-        PRACTITIONERS_COLLECTION,
-        practitionerId
-      );
-      // Remove old clinic info based on ID
-      batch.update(practitionerRef, {
-        clinicsInfo: arrayRemove(...[{ id: clinicId }]),
-        updatedAt: serverTimestamp(),
-      });
-      // Add updated clinic info
-      batch.update(practitionerRef, {
-        clinicsInfo: arrayUnion(clinicInfo),
-        updatedAt: serverTimestamp(),
-      });
-    }
-    try {
-      await batch.commit();
-    } catch (error) {
-      console.error(
-        `Error updating clinic info in practitioners for clinic ${clinicId}:`,
-        error
-      );
-      // Decide on error handling
-    }
-  }
-
-  // --- Core Service Methods (Updated) ---
-
   /**
    * Creates a new clinic.
-   * Initializes empty doctorsInfo and proceduresInfo.
-   * Aggregation into Clinic happens via PractitionerService and ProcedureService.
    */
   async createClinic(
     data: CreateClinicData,
@@ -209,21 +141,7 @@ export class ClinicService extends BaseService {
       const clinicRef = doc(this.db, CLINICS_COLLECTION, clinicId);
       batch.set(clinicRef, clinicData);
 
-      const groupRef = doc(
-        this.db,
-        CLINIC_GROUPS_COLLECTION,
-        validatedData.clinicGroupId
-      );
-      const newClinicInfoForGroup = this._createClinicInfoForAggregation({
-        ...clinicData,
-        id: clinicId,
-      } as Clinic);
-      batch.update(groupRef, {
-        clinics: arrayUnion(clinicId),
-        clinicsInfo: arrayUnion(newClinicInfoForGroup),
-        updatedAt: serverTimestamp(),
-      });
-
+      // Update admin relationship - this part is still needed
       const adminRef = doc(this.db, CLINIC_ADMINS_COLLECTION, creatorAdminId);
       batch.update(adminRef, {
         clinicsManaged: arrayUnion(clinicId),
@@ -244,7 +162,7 @@ export class ClinicService extends BaseService {
   }
 
   /**
-   * Updates a clinic and propagates changes (ClinicInfo) to associated practitioners.
+   * Updates a clinic.
    */
   async updateClinic(
     clinicId: string,
@@ -292,37 +210,8 @@ export class ClinicService extends BaseService {
         updatedAt: serverTimestamp(),
       };
 
-      const batch = writeBatch(this.db);
-      batch.update(clinicRef, updateDataForFirestore);
+      await updateDoc(clinicRef, updateDataForFirestore);
 
-      const groupRef = doc(
-        this.db,
-        CLINIC_GROUPS_COLLECTION,
-        currentClinic.clinicGroupId
-      );
-      // Use the validated final state for aggregation
-      const updatedClinicInfoForGroup = this._createClinicInfoForAggregation(
-        finalStateForValidation as Clinic
-      );
-      batch.update(groupRef, {
-        clinicsInfo: arrayRemove(...[{ id: clinicId }]),
-        updatedAt: serverTimestamp(),
-      });
-      batch.update(groupRef, {
-        clinicsInfo: arrayUnion(updatedClinicInfoForGroup),
-        updatedAt: serverTimestamp(),
-      });
-
-      const practitionerIds = currentClinic.doctors || [];
-      if (practitionerIds.length > 0) {
-        // Pass the aggregated info based on the final validated state
-        await this._updateClinicInfoInPractitioners(
-          practitionerIds,
-          updatedClinicInfoForGroup
-        );
-      }
-
-      await batch.commit();
       const updatedClinic = await this.getClinic(clinicId);
       if (!updatedClinic) throw new Error("Failed to retrieve updated clinic");
       return updatedClinic;
@@ -342,7 +231,6 @@ export class ClinicService extends BaseService {
 
   /**
    * Deactivates a clinic.
-   * Note: Does not currently remove ClinicInfo from practitioners (might be desired).
    */
   async deactivateClinic(clinicId: string, adminId: string): Promise<void> {
     // Permission check omitted
@@ -351,14 +239,8 @@ export class ClinicService extends BaseService {
       isActive: false,
       updatedAt: serverTimestamp(),
     });
-    // Consider whether to also update ClinicInfo in practitioners to reflect inactive status
   }
 
-  // --- Other Methods ---
-  // (getClinic, getClinicsByGroup, findClinicsInRadius, addTags, removeTags, getClinicsByAdmin, etc.)
-  // Review these methods to ensure they don't rely on outdated aggregation logic (e.g., filtering ServiceInfo)
-  // and update them to use proceduresInfo if necessary for filtering.
-
   /**
    * Dohvata kliniku po ID-u
    */
@@ -375,7 +257,6 @@ export class ClinicService extends BaseService {
 
   /**
    * Pretražuje klinike u određenom radijusu
-   * REVIEW: SearchUtils.findClinicsInRadius might need updating for filters.
    */
   async findClinicsInRadius(
     center: { latitude: number; longitude: number },
@@ -386,10 +267,6 @@ export class ClinicService extends BaseService {
       // Add other relevant filters based on Clinic/ProcedureSummaryInfo fields
     }
   ): Promise<Clinic[]> {
-    console.warn(
-      "SearchUtils.findClinicsInRadius filter logic might need updating for proceduresInfo."
-    );
-    // Pass filters directly, assuming SearchUtils handles it.
     return SearchUtils.findClinicsInRadius(
       this.db,
       center,

package/src/services/clinic/utils/clinic.utils.ts

@@ -13,6 +13,8 @@ import {
   QueryConstraint,
   addDoc,
   writeBatch,
+  limit,
+  startAfter,
 } from "firebase/firestore";
 import {
   Clinic,
@@ -827,8 +829,6 @@ export async function getAllClinics(
 
     // If pagination is specified and greater than 0, limit the query
     if (pagination && pagination > 0) {
-      const { limit, startAfter } = require("firebase/firestore");
-
       if (lastDoc) {
         clinicsQuery = query(
           clinicsCollection,

package/src/services/practitioner/README.md

@@ -0,0 +1,145 @@
+# Practitioner Service
+
+This service manages practitioner (doctor, therapist, etc.) data within the Firestore database. It handles practitioner profiles, draft profiles, registration tokens, and associations with clinics.
+
+**Note:** Data aggregation into related entities (Clinics, Procedures) is handled by Cloud Functions triggered by Firestore events.
+
+## `PractitionerService` Class
+
+Extends `BaseService`.
+
+### Constructor
+
+```typescript
+constructor(
+  db: Firestore,
+  auth: Auth,
+  app: FirebaseApp,
+  clinicService?: ClinicService // Optional dependency injection
+)
+```
+
+Initializes the service with Firestore, Auth, App instances. Optionally accepts a `ClinicService` instance for operations requiring clinic data (like draft creation or token validation).
+
+### Methods
+
+- **`createPractitioner(data: CreatePractitionerData): Promise<Practitioner>`**
+
+  - Creates a new, fully active practitioner profile.
+  - Validates data using `createPractitionerSchema`.
+  - Generates a unique ID using `this.generateId()`.
+  - Initializes default review info.
+  - Sets default values for `isActive` (true), `isVerified` (false), and `status` (ACTIVE).
+  - Saves the practitioner document.
+  - **Aggregation Note:** Adding practitioner info to associated `Clinics` is handled by Cloud Functions.
+
+- **`createDraftPractitioner(data: CreateDraftPractitionerData, createdBy: string, clinicId: string): Promise<{ practitioner: Practitioner; token: PractitionerToken }>`**
+
+  - Creates a draft practitioner profile (status `DRAFT`) not yet linked to a user (`userRef` is empty). Typically used by clinic admins.
+  - Validates data using `createDraftPractitionerSchema`.
+  - Verifies that the specified `clinicId` exists.
+  - Associates the practitioner with the specified `clinicId` (and potentially others in `data.clinics`).
+  - Sets `isActive` and `isVerified` to `false` by default.
+  - Saves the draft practitioner document.
+  - Automatically creates a registration token (`PractitionerToken`) for this draft profile.
+  - Returns both the created draft practitioner and the registration token.
+
+- **`createPractitionerToken(data: CreatePractitionerTokenData, createdBy: string): Promise<PractitionerToken>`**
+
+  - Creates a registration token for an existing `DRAFT` practitioner.
+  - Validates input data using `createPractitionerTokenSchema`.
+  - Ensures the practitioner exists, is in `DRAFT` status, and belongs to the specified `clinicId`.
+  - Generates a unique, short, uppercase token string.
+  - Sets a default expiration of 7 days if not provided.
+  - Saves the token in the `register_tokens` subcollection of the practitioner document.
+
+- **`getPractitionerActiveTokens(practitionerId: string): Promise<PractitionerToken[]>`**
+
+  - Retrieves all `ACTIVE` and non-expired registration tokens for a specific practitioner.
+
+- **`validateToken(tokenString: string): Promise<PractitionerToken | null>`**
+
+  - Finds an `ACTIVE`, non-expired token matching the `tokenString` across _all_ practitioners' `register_tokens` subcollections. Returns the token object or `null`.
+
+- **`markTokenAsUsed(tokenId: string, practitionerId: string, userId: string): Promise<void>`**
+
+  - Updates a specific token's status to `USED` and records who used it (`userId`) and when.
+
+- **`getPractitioner(practitionerId: string): Promise<Practitioner | null>`**
+
+  - Retrieves a single practitioner document by its ID.
+
+- **`getPractitionerByUserRef(userRef: string): Promise<Practitioner | null>`**
+
+  - Finds and retrieves a practitioner document based on the linked user ID (`userRef`).
+
+- **`getPractitionersByClinic(clinicId: string): Promise<Practitioner[]>`**
+
+  - Retrieves all `ACTIVE` practitioners associated with a specific `clinicId`.
+
+- **`getAllPractitionersByClinic(clinicId: string): Promise<Practitioner[]>`**
+
+  - Retrieves all `ACTIVE` practitioners (regardless of status like DRAFT) associated with a `clinicId`.
+
+- **`getDraftPractitionersByClinic(clinicId: string): Promise<Practitioner[]>`**
+
+  - Retrieves all practitioners with `DRAFT` status associated with a specific `clinicId`.
+
+- **`updatePractitioner(practitionerId: string, data: UpdatePractitionerData): Promise<Practitioner>`**
+
+  - Updates an existing practitioner document with partial data.
+  - Sets the `updatedAt` timestamp.
+  - **Aggregation Note:** Updates to aggregated data in `Clinics` and `Procedures` are handled by Cloud Functions.
+
+- **`addClinic(practitionerId: string, clinicId: string): Promise<void>`**
+
+  - Adds a `clinicId` to the practitioner's `clinics` array.
+  - Prevents duplicates.
+  - **Aggregation Note:** Updating the clinic's `doctors`/`doctorsInfo` is handled by Cloud Functions.
+
+- **`removeClinic(practitionerId: string, clinicId: string): Promise<void>`**
+
+  - Removes a `clinicId` from the practitioner's `clinics` array.
+  - **Aggregation Note:** Updating the clinic's `doctors`/`doctorsInfo` is handled by Cloud Functions.
+
+- **`deactivatePractitioner(practitionerId: string): Promise<void>`**
+
+  - Sets the practitioner's `isActive` flag to `false` using `updatePractitioner`.
+  - **Aggregation Note:** Related updates are handled by Cloud Functions.
+
+- **`activatePractitioner(practitionerId: string): Promise<void>`**
+
+  - Sets the practitioner's `isActive` flag to `true` using `updatePractitioner`.
+  - **Aggregation Note:** Related updates are handled by Cloud Functions.
+
+- **`deletePractitioner(practitionerId: string): Promise<void>`**
+
+  - Permanently deletes a practitioner document.
+  - **Aggregation Note:** Removal of associated data from `Clinics`, `Procedures`, etc., is handled by Cloud Functions.
+
+- **`validateTokenAndClaimProfile(tokenString: string, userId: string): Promise<Practitioner | null>`**
+
+  - Orchestrates the process of a user claiming a draft profile:
+    1.  Validates the `tokenString` using `validateToken`.
+    2.  Retrieves the associated `DRAFT` practitioner.
+    3.  Checks if the user (`userId`) already has a profile.
+    4.  Updates the practitioner's `userRef` to the `userId` and status to `ACTIVE` using `updatePractitioner`.
+    5.  Marks the token as `USED` using `markTokenAsUsed`.
+    6.  Returns the now-claimed practitioner profile.
+
+- **`getAllPractitioners(options?: { pagination?: number; lastDoc?: any; includeDraftPractitioners?: boolean }): Promise<{ practitioners: Practitioner[]; lastDoc: any }>`**
+
+  - Retrieves a list of practitioners, ordered by name.
+  - Supports pagination (`pagination`, `lastDoc`).
+  - Optionally includes `DRAFT` practitioners.
+
+- **`getPractitionersByFilters(filters: { ... }): Promise<{ practitioners: Practitioner[]; lastDoc: any }>`**
+  - Retrieves practitioners based on complex filter criteria:
+    - Name (first/last)
+    - Certifications, Specialties
+    - Procedures (Family, Category, Subcategory, Technology)
+    - Location/Radius - Filters based on associated clinics
+    - Rating (`reviewInfo.averageRating`)
+  - Combines Firestore queries with in-memory filtering for non-indexed fields.
+  - Supports pagination.
+  - Optionally includes `DRAFT` practitioners.