@blackcode_sa/metaestetics-api 1.7.23 → 1.7.25

package/package.json

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

package/src/admin/aggregation/clinic/clinic.aggregation.service.ts

@@ -1,8 +1,11 @@
 import * as admin from "firebase-admin";
 import { ClinicInfo } from "../../../types/profile"; // Corrected path
-import { PRACTITIONERS_COLLECTION } from "../../../types/practitioner"; // Corrected path
+import {
+  PRACTITIONERS_COLLECTION,
+  Practitioner,
+} from "../../../types/practitioner"; // Corrected path
 import { PROCEDURES_COLLECTION } from "../../../types/procedure"; // Added procedure collection
-import { CLINIC_GROUPS_COLLECTION } from "../../../types/clinic"; // Added clinic group collection
+import { CLINIC_GROUPS_COLLECTION, ClinicGroup } from "../../../types/clinic"; // Added clinic group collection
 import { ClinicLocation } from "../../../types/clinic"; // Added ClinicLocation type
 import { CALENDAR_COLLECTION } from "../../../types/calendar"; // Added calendar collection
 import { PATIENTS_COLLECTION } from "../../../types/patient"; // Added patient collection
@@ -103,16 +106,27 @@ export class ClinicAggregationService {
         .collection(PRACTITIONERS_COLLECTION)
         .doc(practitionerId);
 
-      // Remove old clinic info based on ID matcher
-      batch.update(practitionerRef, {
-        clinicsInfo: admin.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
-      // Add updated clinic info
-      batch.update(practitionerRef, {
-        clinicsInfo: admin.firestore.FieldValue.arrayUnion(clinicInfo),
-        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
+      // Remove old clinic info based on ID matcher and add updated info
+      // First, get the current practitioner data to filter clinicsInfo manually
+      const practitionerDoc = await practitionerRef.get();
+      if (practitionerDoc.exists) {
+        const practitionerData = practitionerDoc.data() as Practitioner;
+        const currentClinicsInfo = practitionerData?.clinicsInfo || [];
+
+        // Filter out the clinic info with matching ID
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic: any) => clinic.id !== clinicId
+        );
+
+        // Add the updated clinic info to the filtered array
+        const updatedClinicsInfo = [...filteredClinicsInfo, clinicInfo];
+
+        // Update with the complete new array
+        batch.update(practitionerRef, {
+          clinicsInfo: updatedClinicsInfo,
+          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+        });
+      }
     }
 
     try {
@@ -194,7 +208,6 @@ export class ClinicAggregationService {
       return;
     }
 
-    const batch = this.db.batch();
     const clinicId = clinicInfo.id;
     const groupRef = this.db
       .collection(CLINIC_GROUPS_COLLECTION)
@@ -204,25 +217,38 @@ export class ClinicAggregationService {
       `[ClinicAggregationService] Starting update of ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
     );
 
-    // Remove old clinic info based on ID matcher
-    batch.update(groupRef, {
-      clinicsInfo: admin.firestore.FieldValue.arrayRemove({ id: clinicId }),
-      updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-    });
-    // Add updated clinic info
-    batch.update(groupRef, {
-      clinicsInfo: admin.firestore.FieldValue.arrayUnion(clinicInfo),
-      updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-    });
-
     try {
-      await batch.commit();
-      console.log(
-        `[ClinicAggregationService] Successfully updated ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
-      );
+      // Get current clinic group data to filter clinicsInfo manually
+      const clinicGroupDoc = await groupRef.get();
+      if (clinicGroupDoc.exists) {
+        const clinicGroupData = clinicGroupDoc.data() as ClinicGroup;
+        const currentClinicsInfo = clinicGroupData?.clinicsInfo || [];
+
+        // Filter out the clinic info with matching ID
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic: any) => clinic.id !== clinicId
+        );
+
+        // Add the updated clinic info to the filtered array
+        const updatedClinicsInfo = [...filteredClinicsInfo, clinicInfo];
+
+        // Update with the complete new array
+        await groupRef.update({
+          clinicsInfo: updatedClinicsInfo,
+          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+        });
+
+        console.log(
+          `[ClinicAggregationService] Successfully updated ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
+        );
+      } else {
+        console.warn(
+          `[ClinicAggregationService] Clinic Group ${clinicGroupId} not found. Cannot update clinic info.`
+        );
+      }
     } catch (error) {
       console.error(
-        `[ClinicAggregationService] Error committing update for ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}:`,
+        `[ClinicAggregationService] Error updating ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}:`,
         error
       );
       throw error;
@@ -427,13 +453,28 @@ export class ClinicAggregationService {
         .collection(PRACTITIONERS_COLLECTION)
         .doc(practitionerId);
 
-      // Remove clinic ID from clinicIds array
-      batch.update(practitionerRef, {
-        clinicIds: admin.firestore.FieldValue.arrayRemove(clinicId),
-        // Remove all clinic info objects where id matches the clinic ID
-        clinicsInfo: admin.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
+      // Get current practitioner data to filter manually
+      const practitionerDoc = await practitionerRef.get();
+      if (practitionerDoc.exists) {
+        const practitionerData = practitionerDoc.data() as Practitioner;
+        const currentClinicIds = practitionerData?.clinics || [];
+        const currentClinicsInfo = practitionerData?.clinicsInfo || [];
+
+        // Filter out the clinic ID and clinic info with matching ID
+        const filteredClinicIds = currentClinicIds.filter(
+          (id: string) => id !== clinicId
+        );
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic: any) => clinic.id !== clinicId
+        );
+
+        // Update with the filtered arrays
+        batch.update(practitionerRef, {
+          clinics: filteredClinicIds,
+          clinicsInfo: filteredClinicsInfo,
+          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+        });
+      }
     }
 
     try {
@@ -518,16 +559,36 @@ export class ClinicAggregationService {
     );
 
     try {
-      await groupRef.update({
-        clinicIds: admin.firestore.FieldValue.arrayRemove(clinicId),
-        // Remove all clinic info objects where id matches the clinic ID
-        clinicsInfo: admin.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
+      // Get current clinic group data to filter manually
+      const clinicGroupDoc = await groupRef.get();
+      if (clinicGroupDoc.exists) {
+        const clinicGroupData = clinicGroupDoc.data() as ClinicGroup;
+        const currentClinicIds = clinicGroupData?.clinics || [];
+        const currentClinicsInfo = clinicGroupData?.clinicsInfo || [];
+
+        // Filter out the clinic ID and clinic info with matching ID
+        const filteredClinicIds = currentClinicIds.filter(
+          (id: string) => id !== clinicId
+        );
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic: any) => clinic.id !== clinicId
+        );
 
-      console.log(
-        `[ClinicAggregationService] Successfully removed Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
-      );
+        // Update with the filtered arrays
+        await groupRef.update({
+          clinics: filteredClinicIds,
+          clinicsInfo: filteredClinicsInfo,
+          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+        });
+
+        console.log(
+          `[ClinicAggregationService] Successfully removed Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
+        );
+      } else {
+        console.warn(
+          `[ClinicAggregationService] Clinic Group ${clinicGroupId} not found. Cannot remove clinic.`
+        );
+      }
     } catch (error) {
       console.error(
         `[ClinicAggregationService] Error removing Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}:`,

package/src/index.ts

@@ -25,6 +25,7 @@ export { ProcedureService } from "./services/procedure/procedure.service";
 export { ClinicService } from "./services/clinic/clinic.service";
 export { ClinicAdminService } from "./services/clinic/clinic-admin.service";
 export { ClinicGroupService } from "./services/clinic/clinic-group.service";
+export { PractitionerInviteService } from "./services/clinic/practitioner-invite.service";
 export {
   DocumentationTemplateService,
   FilledDocumentService,
@@ -197,17 +198,24 @@ export type {
   CreateDefaultClinicGroupData,
   ClinicGroupSetupData,
   ClinicBranchSetupData,
+  PractitionerInvite,
+  CreatePractitionerInviteData,
+  UpdatePractitionerInviteData,
+  PractitionerInviteFilters,
+  ProposedWorkingHours,
 } from "./types/clinic";
 export {
   CLINICS_COLLECTION,
   CLINIC_GROUPS_COLLECTION,
   CLINIC_ADMINS_COLLECTION,
+  PRACTITIONER_INVITES_COLLECTION,
   PracticeType,
   Language,
   ClinicTag,
   ClinicPhotoTag,
   AdminTokenStatus,
   SubscriptionModel,
+  PractitionerInviteStatus,
 } from "./types/clinic";
 
 // Profile info types

package/src/services/clinic/README.md

@@ -85,3 +85,120 @@ Initializes the service with Firestore, Auth, App instances, and required depend
 - **`photos.utils.ts`**: Firebase Storage interactions (`uploadPhoto`, `uploadMultiplePhotos`, `deletePhoto`).
 - **`admin.utils.ts`**: Helpers for clinic admin interactions (used by `ClinicAdminService`).
 - **`search.utils.ts`**: Geo-radius search logic (`findClinicsInRadius`).
+
+# Clinic Services
+
+This directory contains services related to clinic operations.
+
+## Services
+
+### ClinicService
+
+Handles clinic CRUD operations, searching, and management.
+
+### ClinicGroupService
+
+Manages clinic groups and their operations.
+
+### ClinicAdminService
+
+Handles clinic administrator operations.
+
+### PractitionerInviteService
+
+Manages the practitioner invitation system for clinics.
+
+## PractitionerInviteService
+
+The `PractitionerInviteService` handles the complete flow of inviting practitioners to join clinics.
+
+### Flow
+
+1. Clinic searches for active practitioners by name or email (using existing practitioner search services)
+2. Clinic creates an invite request with proposed working hours
+3. Practitioner receives the invite and can accept or reject it
+4. Admins can cancel pending invites if needed
+5. Connection between practitioner and clinic is handled by aggregation side-effects
+
+### Methods
+
+#### Core Invite Methods
+
+- `createInviteAdmin(practitionerId, clinicId, proposedWorkingHours, invitedBy, message?)` - Create a new invite
+- `acceptInviteDoctor(inviteId)` - Doctor accepts an invite
+- `rejectInviteDoctor(inviteId, rejectionReason?)` - Doctor rejects an invite
+- `cancelInviteAdmin(inviteId, cancelReason?)` - Admin cancels a pending invite
+
+#### Retrieval Methods
+
+- `getAllInvitesDoctor(practitionerId, statusFilter?)` - Get all invites for a practitioner
+- `getAllInvitesClinic(clinicId, statusFilter?)` - Get all invites for a clinic
+- `getInviteById(inviteId)` - Get a specific invite
+- `getInvitesWithFilters(filters)` - Advanced filtering
+
+#### Admin Methods
+
+- `deleteInvite(inviteId)` - Delete an invite (admin only)
+
+### Status Filtering
+
+All retrieval methods support filtering by invite status:
+
+- `PENDING` - Invite has been sent but not responded to
+- `ACCEPTED` - Practitioner has accepted the invite
+- `REJECTED` - Practitioner has rejected the invite
+- `CANCELLED` - Admin has cancelled the invite
+
+### Usage Example
+
+```typescript
+// Create service instance
+const practitionerInviteService = new PractitionerInviteService(db, auth, app);
+
+// Create an invite
+const invite = await practitionerInviteService.createInviteAdmin(
+  "practitioner123",
+  "clinic456",
+  proposedHours,
+  "admin789",
+  "We'd love to have you join our team!"
+);
+
+// Get clinic's invites
+const clinicInvites = await practitionerInviteService.getAllInvitesClinic(
+  "clinic456",
+  [PractitionerInviteStatus.PENDING]
+);
+
+// Doctor accepts invite
+const acceptedInvite = await practitionerInviteService.acceptInviteDoctor(
+  invite.id
+);
+
+// Admin cancels pending invite
+const cancelledInvite = await practitionerInviteService.cancelInviteAdmin(
+  invite.id,
+  "Position no longer available"
+);
+```
+
+### Data Structure
+
+The service uses existing aggregation types from the profile module:
+
+- `PractitionerProfileInfo` - Complete practitioner information including certification
+- `ClinicInfo` - Complete clinic information including location and contact details
+
+### Error Handling
+
+All methods include proper error handling and logging. Common errors:
+
+- Practitioner/Clinic not found
+- Duplicate pending invites
+- Invalid status transitions (only pending invites can be accepted/rejected/cancelled)
+- Permission issues
+
+### Firestore Collections
+
+- Collection: `practitioner-invites`
+- Documents contain complete invite information with embedded practitioner and clinic details