@blackcode_sa/metaestetics-api 1.7.34 → 1.7.36

package/dist/admin/index.d.mts

@@ -2282,6 +2282,12 @@ declare class PractitionerInviteAggregationService {
      * @returns {Promise<void>}
      */
     private updatePractitionerWorkingHours;
+    /**
+     * Fetches a clinic admin by ID
+     * @param adminId The clinic admin ID
+     * @returns The clinic admin or null if not found
+     */
+    private fetchClinicAdminById;
     /**
      * Fetches a practitioner by ID.
      * @param practitionerId The practitioner ID.

package/dist/admin/index.d.ts

@@ -2282,6 +2282,12 @@ declare class PractitionerInviteAggregationService {
      * @returns {Promise<void>}
      */
     private updatePractitionerWorkingHours;
+    /**
+     * Fetches a clinic admin by ID
+     * @param adminId The clinic admin ID
+     * @returns The clinic admin or null if not found
+     */
+    private fetchClinicAdminById;
     /**
      * Fetches a practitioner by ID.
      * @param practitionerId The practitioner ID.

package/dist/admin/index.js

@@ -926,6 +926,7 @@ var PractitionerInviteStatus = /* @__PURE__ */ ((PractitionerInviteStatus2) => {
 
 // src/types/clinic/index.ts
 var CLINIC_GROUPS_COLLECTION = "clinic_groups";
+var CLINIC_ADMINS_COLLECTION = "clinic_admins";
 var CLINICS_COLLECTION = "clinics";
 
 // src/types/patient/index.ts
@@ -2236,6 +2237,23 @@ var PractitionerInviteAggregationService = class {
     }
   }
   // --- Data Fetching Helpers ---
+  /**
+   * Fetches a clinic admin by ID
+   * @param adminId The clinic admin ID
+   * @returns The clinic admin or null if not found
+   */
+  async fetchClinicAdminById(adminId) {
+    try {
+      const doc = await this.db.collection(CLINIC_ADMINS_COLLECTION).doc(adminId).get();
+      return doc.exists ? doc.data() : null;
+    } catch (error) {
+      Logger.error(
+        `[PractitionerInviteAggService] Error fetching clinic admin ${adminId}:`,
+        error
+      );
+      return null;
+    }
+  }
   /**
    * Fetches a practitioner by ID.
    * @param practitionerId The practitioner ID.
@@ -2279,40 +2297,88 @@ var PractitionerInviteAggregationService = class {
    * @param emailConfig Email configuration
    */
   async sendAcceptanceNotificationEmail(invite, practitioner, clinic, emailConfig) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     if (!this.mailingService) return;
-    const notificationData = {
-      invite,
-      practitioner: {
-        firstName: practitioner.basicInfo.firstName || "",
-        lastName: practitioner.basicInfo.lastName || "",
-        specialties: ((_b = (_a = practitioner.certification) == null ? void 0 : _a.specialties) == null ? void 0 : _b.map(
-          (s) => s.name || s
-        )) || [],
-        profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null,
-        experienceYears: void 0
-        // This would need to be calculated or stored in practitioner data
-      },
-      clinic: {
-        name: clinic.name,
-        adminName: void 0,
-        // This would need to be fetched from clinic admin data
-        adminEmail: clinic.contactInfo.email
-      },
-      context: {
-        invitationDate: invite.createdAt.toDate().toLocaleDateString(),
-        responseDate: ((_c = invite.acceptedAt) == null ? void 0 : _c.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString()
-      },
-      urls: {
-        clinicDashboardUrl: emailConfig.clinicDashboardUrl,
-        practitionerProfileUrl: emailConfig.practitionerProfileUrl
-      },
-      options: {
-        fromAddress: emailConfig.fromAddress,
-        mailgunDomain: emailConfig.domain
+    try {
+      const admin17 = await this.fetchClinicAdminById(invite.invitedBy);
+      if (!admin17) {
+        Logger.warn(
+          `[PractitionerInviteAggService] Admin ${invite.invitedBy} not found, using clinic contact email as fallback`
+        );
+        const notificationData2 = {
+          invite,
+          practitioner: {
+            firstName: practitioner.basicInfo.firstName || "",
+            lastName: practitioner.basicInfo.lastName || "",
+            specialties: ((_b = (_a = practitioner.certification) == null ? void 0 : _a.specialties) == null ? void 0 : _b.map(
+              (s) => s.name || s
+            )) || [],
+            profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null,
+            experienceYears: void 0
+          },
+          clinic: {
+            name: clinic.name,
+            adminName: "Admin",
+            adminEmail: clinic.contactInfo.email
+          },
+          context: {
+            invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+            responseDate: ((_c = invite.acceptedAt) == null ? void 0 : _c.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString()
+          },
+          urls: {
+            clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+            practitionerProfileUrl: emailConfig.practitionerProfileUrl
+          },
+          options: {
+            fromAddress: emailConfig.fromAddress,
+            mailgunDomain: emailConfig.domain
+          }
+        };
+        await this.mailingService.sendAcceptedNotificationEmail(
+          notificationData2
+        );
+        return;
       }
-    };
-    await this.mailingService.sendAcceptedNotificationEmail(notificationData);
+      const adminName = `${admin17.contactInfo.firstName} ${admin17.contactInfo.lastName}`;
+      const notificationData = {
+        invite,
+        practitioner: {
+          firstName: practitioner.basicInfo.firstName || "",
+          lastName: practitioner.basicInfo.lastName || "",
+          specialties: ((_e = (_d = practitioner.certification) == null ? void 0 : _d.specialties) == null ? void 0 : _e.map(
+            (s) => s.name || s
+          )) || [],
+          profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null,
+          experienceYears: void 0
+          // This would need to be calculated or stored in practitioner data
+        },
+        clinic: {
+          name: clinic.name,
+          adminName,
+          adminEmail: admin17.contactInfo.email
+          // Use the specific admin's email
+        },
+        context: {
+          invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+          responseDate: ((_f = invite.acceptedAt) == null ? void 0 : _f.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString()
+        },
+        urls: {
+          clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+          practitionerProfileUrl: emailConfig.practitionerProfileUrl
+        },
+        options: {
+          fromAddress: emailConfig.fromAddress,
+          mailgunDomain: emailConfig.domain
+        }
+      };
+      await this.mailingService.sendAcceptedNotificationEmail(notificationData);
+    } catch (error) {
+      Logger.error(
+        `[PractitionerInviteAggService] Error sending acceptance notification email:`,
+        error
+      );
+      throw error;
+    }
   }
   /**
    * Sends rejection notification email to clinic admin
@@ -2322,39 +2388,87 @@ var PractitionerInviteAggregationService = class {
    * @param emailConfig Email configuration
    */
   async sendRejectionNotificationEmail(invite, practitioner, clinic, emailConfig) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     if (!this.mailingService) return;
-    const notificationData = {
-      invite,
-      practitioner: {
-        firstName: practitioner.basicInfo.firstName || "",
-        lastName: practitioner.basicInfo.lastName || "",
-        specialties: ((_b = (_a = practitioner.certification) == null ? void 0 : _a.specialties) == null ? void 0 : _b.map(
-          (s) => s.name || s
-        )) || [],
-        profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null
-      },
-      clinic: {
-        name: clinic.name,
-        adminName: void 0,
-        // This would need to be fetched from clinic admin data
-        adminEmail: clinic.contactInfo.email
-      },
-      context: {
-        invitationDate: invite.createdAt.toDate().toLocaleDateString(),
-        responseDate: ((_c = invite.rejectedAt) == null ? void 0 : _c.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString(),
-        rejectionReason: invite.rejectionReason || void 0
-      },
-      urls: {
-        clinicDashboardUrl: emailConfig.clinicDashboardUrl,
-        findPractitionersUrl: emailConfig.findPractitionersUrl
-      },
-      options: {
-        fromAddress: emailConfig.fromAddress,
-        mailgunDomain: emailConfig.domain
+    try {
+      const admin17 = await this.fetchClinicAdminById(invite.invitedBy);
+      if (!admin17) {
+        Logger.warn(
+          `[PractitionerInviteAggService] Admin ${invite.invitedBy} not found, using clinic contact email as fallback`
+        );
+        const notificationData2 = {
+          invite,
+          practitioner: {
+            firstName: practitioner.basicInfo.firstName || "",
+            lastName: practitioner.basicInfo.lastName || "",
+            specialties: ((_b = (_a = practitioner.certification) == null ? void 0 : _a.specialties) == null ? void 0 : _b.map(
+              (s) => s.name || s
+            )) || [],
+            profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null
+          },
+          clinic: {
+            name: clinic.name,
+            adminName: "Admin",
+            adminEmail: clinic.contactInfo.email
+          },
+          context: {
+            invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+            responseDate: ((_c = invite.rejectedAt) == null ? void 0 : _c.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString(),
+            rejectionReason: invite.rejectionReason || void 0
+          },
+          urls: {
+            clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+            findPractitionersUrl: emailConfig.findPractitionersUrl
+          },
+          options: {
+            fromAddress: emailConfig.fromAddress,
+            mailgunDomain: emailConfig.domain
+          }
+        };
+        await this.mailingService.sendRejectedNotificationEmail(
+          notificationData2
+        );
+        return;
       }
-    };
-    await this.mailingService.sendRejectedNotificationEmail(notificationData);
+      const adminName = `${admin17.contactInfo.firstName} ${admin17.contactInfo.lastName}`;
+      const notificationData = {
+        invite,
+        practitioner: {
+          firstName: practitioner.basicInfo.firstName || "",
+          lastName: practitioner.basicInfo.lastName || "",
+          specialties: ((_e = (_d = practitioner.certification) == null ? void 0 : _d.specialties) == null ? void 0 : _e.map(
+            (s) => s.name || s
+          )) || [],
+          profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null
+        },
+        clinic: {
+          name: clinic.name,
+          adminName,
+          adminEmail: admin17.contactInfo.email
+          // Use the specific admin's email
+        },
+        context: {
+          invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+          responseDate: ((_f = invite.rejectedAt) == null ? void 0 : _f.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString(),
+          rejectionReason: invite.rejectionReason || void 0
+        },
+        urls: {
+          clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+          findPractitionersUrl: emailConfig.findPractitionersUrl
+        },
+        options: {
+          fromAddress: emailConfig.fromAddress,
+          mailgunDomain: emailConfig.domain
+        }
+      };
+      await this.mailingService.sendRejectedNotificationEmail(notificationData);
+    } catch (error) {
+      Logger.error(
+        `[PractitionerInviteAggService] Error sending rejection notification email:`,
+        error
+      );
+      throw error;
+    }
   }
 };
 

package/dist/admin/index.mjs

@@ -865,6 +865,7 @@ var PractitionerInviteStatus = /* @__PURE__ */ ((PractitionerInviteStatus2) => {
 
 // src/types/clinic/index.ts
 var CLINIC_GROUPS_COLLECTION = "clinic_groups";
+var CLINIC_ADMINS_COLLECTION = "clinic_admins";
 var CLINICS_COLLECTION = "clinics";
 
 // src/types/patient/index.ts
@@ -2175,6 +2176,23 @@ var PractitionerInviteAggregationService = class {
     }
   }
   // --- Data Fetching Helpers ---
+  /**
+   * Fetches a clinic admin by ID
+   * @param adminId The clinic admin ID
+   * @returns The clinic admin or null if not found
+   */
+  async fetchClinicAdminById(adminId) {
+    try {
+      const doc = await this.db.collection(CLINIC_ADMINS_COLLECTION).doc(adminId).get();
+      return doc.exists ? doc.data() : null;
+    } catch (error) {
+      Logger.error(
+        `[PractitionerInviteAggService] Error fetching clinic admin ${adminId}:`,
+        error
+      );
+      return null;
+    }
+  }
   /**
    * Fetches a practitioner by ID.
    * @param practitionerId The practitioner ID.
@@ -2218,40 +2236,88 @@ var PractitionerInviteAggregationService = class {
    * @param emailConfig Email configuration
    */
   async sendAcceptanceNotificationEmail(invite, practitioner, clinic, emailConfig) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     if (!this.mailingService) return;
-    const notificationData = {
-      invite,
-      practitioner: {
-        firstName: practitioner.basicInfo.firstName || "",
-        lastName: practitioner.basicInfo.lastName || "",
-        specialties: ((_b = (_a = practitioner.certification) == null ? void 0 : _a.specialties) == null ? void 0 : _b.map(
-          (s) => s.name || s
-        )) || [],
-        profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null,
-        experienceYears: void 0
-        // This would need to be calculated or stored in practitioner data
-      },
-      clinic: {
-        name: clinic.name,
-        adminName: void 0,
-        // This would need to be fetched from clinic admin data
-        adminEmail: clinic.contactInfo.email
-      },
-      context: {
-        invitationDate: invite.createdAt.toDate().toLocaleDateString(),
-        responseDate: ((_c = invite.acceptedAt) == null ? void 0 : _c.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString()
-      },
-      urls: {
-        clinicDashboardUrl: emailConfig.clinicDashboardUrl,
-        practitionerProfileUrl: emailConfig.practitionerProfileUrl
-      },
-      options: {
-        fromAddress: emailConfig.fromAddress,
-        mailgunDomain: emailConfig.domain
+    try {
+      const admin17 = await this.fetchClinicAdminById(invite.invitedBy);
+      if (!admin17) {
+        Logger.warn(
+          `[PractitionerInviteAggService] Admin ${invite.invitedBy} not found, using clinic contact email as fallback`
+        );
+        const notificationData2 = {
+          invite,
+          practitioner: {
+            firstName: practitioner.basicInfo.firstName || "",
+            lastName: practitioner.basicInfo.lastName || "",
+            specialties: ((_b = (_a = practitioner.certification) == null ? void 0 : _a.specialties) == null ? void 0 : _b.map(
+              (s) => s.name || s
+            )) || [],
+            profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null,
+            experienceYears: void 0
+          },
+          clinic: {
+            name: clinic.name,
+            adminName: "Admin",
+            adminEmail: clinic.contactInfo.email
+          },
+          context: {
+            invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+            responseDate: ((_c = invite.acceptedAt) == null ? void 0 : _c.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString()
+          },
+          urls: {
+            clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+            practitionerProfileUrl: emailConfig.practitionerProfileUrl
+          },
+          options: {
+            fromAddress: emailConfig.fromAddress,
+            mailgunDomain: emailConfig.domain
+          }
+        };
+        await this.mailingService.sendAcceptedNotificationEmail(
+          notificationData2
+        );
+        return;
       }
-    };
-    await this.mailingService.sendAcceptedNotificationEmail(notificationData);
+      const adminName = `${admin17.contactInfo.firstName} ${admin17.contactInfo.lastName}`;
+      const notificationData = {
+        invite,
+        practitioner: {
+          firstName: practitioner.basicInfo.firstName || "",
+          lastName: practitioner.basicInfo.lastName || "",
+          specialties: ((_e = (_d = practitioner.certification) == null ? void 0 : _d.specialties) == null ? void 0 : _e.map(
+            (s) => s.name || s
+          )) || [],
+          profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null,
+          experienceYears: void 0
+          // This would need to be calculated or stored in practitioner data
+        },
+        clinic: {
+          name: clinic.name,
+          adminName,
+          adminEmail: admin17.contactInfo.email
+          // Use the specific admin's email
+        },
+        context: {
+          invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+          responseDate: ((_f = invite.acceptedAt) == null ? void 0 : _f.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString()
+        },
+        urls: {
+          clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+          practitionerProfileUrl: emailConfig.practitionerProfileUrl
+        },
+        options: {
+          fromAddress: emailConfig.fromAddress,
+          mailgunDomain: emailConfig.domain
+        }
+      };
+      await this.mailingService.sendAcceptedNotificationEmail(notificationData);
+    } catch (error) {
+      Logger.error(
+        `[PractitionerInviteAggService] Error sending acceptance notification email:`,
+        error
+      );
+      throw error;
+    }
   }
   /**
    * Sends rejection notification email to clinic admin
@@ -2261,39 +2327,87 @@ var PractitionerInviteAggregationService = class {
    * @param emailConfig Email configuration
    */
   async sendRejectionNotificationEmail(invite, practitioner, clinic, emailConfig) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     if (!this.mailingService) return;
-    const notificationData = {
-      invite,
-      practitioner: {
-        firstName: practitioner.basicInfo.firstName || "",
-        lastName: practitioner.basicInfo.lastName || "",
-        specialties: ((_b = (_a = practitioner.certification) == null ? void 0 : _a.specialties) == null ? void 0 : _b.map(
-          (s) => s.name || s
-        )) || [],
-        profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null
-      },
-      clinic: {
-        name: clinic.name,
-        adminName: void 0,
-        // This would need to be fetched from clinic admin data
-        adminEmail: clinic.contactInfo.email
-      },
-      context: {
-        invitationDate: invite.createdAt.toDate().toLocaleDateString(),
-        responseDate: ((_c = invite.rejectedAt) == null ? void 0 : _c.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString(),
-        rejectionReason: invite.rejectionReason || void 0
-      },
-      urls: {
-        clinicDashboardUrl: emailConfig.clinicDashboardUrl,
-        findPractitionersUrl: emailConfig.findPractitionersUrl
-      },
-      options: {
-        fromAddress: emailConfig.fromAddress,
-        mailgunDomain: emailConfig.domain
+    try {
+      const admin17 = await this.fetchClinicAdminById(invite.invitedBy);
+      if (!admin17) {
+        Logger.warn(
+          `[PractitionerInviteAggService] Admin ${invite.invitedBy} not found, using clinic contact email as fallback`
+        );
+        const notificationData2 = {
+          invite,
+          practitioner: {
+            firstName: practitioner.basicInfo.firstName || "",
+            lastName: practitioner.basicInfo.lastName || "",
+            specialties: ((_b = (_a = practitioner.certification) == null ? void 0 : _a.specialties) == null ? void 0 : _b.map(
+              (s) => s.name || s
+            )) || [],
+            profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null
+          },
+          clinic: {
+            name: clinic.name,
+            adminName: "Admin",
+            adminEmail: clinic.contactInfo.email
+          },
+          context: {
+            invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+            responseDate: ((_c = invite.rejectedAt) == null ? void 0 : _c.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString(),
+            rejectionReason: invite.rejectionReason || void 0
+          },
+          urls: {
+            clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+            findPractitionersUrl: emailConfig.findPractitionersUrl
+          },
+          options: {
+            fromAddress: emailConfig.fromAddress,
+            mailgunDomain: emailConfig.domain
+          }
+        };
+        await this.mailingService.sendRejectedNotificationEmail(
+          notificationData2
+        );
+        return;
       }
-    };
-    await this.mailingService.sendRejectedNotificationEmail(notificationData);
+      const adminName = `${admin17.contactInfo.firstName} ${admin17.contactInfo.lastName}`;
+      const notificationData = {
+        invite,
+        practitioner: {
+          firstName: practitioner.basicInfo.firstName || "",
+          lastName: practitioner.basicInfo.lastName || "",
+          specialties: ((_e = (_d = practitioner.certification) == null ? void 0 : _d.specialties) == null ? void 0 : _e.map(
+            (s) => s.name || s
+          )) || [],
+          profileImageUrl: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : null
+        },
+        clinic: {
+          name: clinic.name,
+          adminName,
+          adminEmail: admin17.contactInfo.email
+          // Use the specific admin's email
+        },
+        context: {
+          invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+          responseDate: ((_f = invite.rejectedAt) == null ? void 0 : _f.toDate().toLocaleDateString()) || (/* @__PURE__ */ new Date()).toLocaleDateString(),
+          rejectionReason: invite.rejectionReason || void 0
+        },
+        urls: {
+          clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+          findPractitionersUrl: emailConfig.findPractitionersUrl
+        },
+        options: {
+          fromAddress: emailConfig.fromAddress,
+          mailgunDomain: emailConfig.domain
+        }
+      };
+      await this.mailingService.sendRejectedNotificationEmail(notificationData);
+    } catch (error) {
+      Logger.error(
+        `[PractitionerInviteAggService] Error sending rejection notification email:`,
+        error
+      );
+      throw error;
+    }
   }
 };
 

package/package.json

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

package/src/admin/aggregation/practitioner-invite/practitioner-invite.aggregation.service.ts

@@ -10,7 +10,12 @@ import {
   PRACTITIONERS_COLLECTION,
   PractitionerClinicWorkingHours,
 } from "../../../types/practitioner";
-import { CLINICS_COLLECTION, Clinic } from "../../../types/clinic";
+import {
+  CLINICS_COLLECTION,
+  Clinic,
+  ClinicAdmin,
+  CLINIC_ADMINS_COLLECTION,
+} from "../../../types/clinic";
 import { ClinicInfo } from "../../../types/profile";
 import { Logger } from "../../logger";
 import { ExistingPractitionerInviteMailingService } from "../../mailing/practitionerInvite/existing-practitioner-invite.mailing";
@@ -645,6 +650,29 @@ export class PractitionerInviteAggregationService {
 
   // --- Data Fetching Helpers ---
 
+  /**
+   * Fetches a clinic admin by ID
+   * @param adminId The clinic admin ID
+   * @returns The clinic admin or null if not found
+   */
+  private async fetchClinicAdminById(
+    adminId: string
+  ): Promise<ClinicAdmin | null> {
+    try {
+      const doc = await this.db
+        .collection(CLINIC_ADMINS_COLLECTION)
+        .doc(adminId)
+        .get();
+      return doc.exists ? (doc.data() as ClinicAdmin) : null;
+    } catch (error) {
+      Logger.error(
+        `[PractitionerInviteAggService] Error fetching clinic admin ${adminId}:`,
+        error
+      );
+      return null;
+    }
+  }
+
   /**
    * Fetches a practitioner by ID.
    * @param practitionerId The practitioner ID.
@@ -711,43 +739,104 @@ export class PractitionerInviteAggregationService {
   ): Promise<void> {
     if (!this.mailingService) return;
 
-    const notificationData = {
-      invite,
-      practitioner: {
-        firstName: practitioner.basicInfo.firstName || "",
-        lastName: practitioner.basicInfo.lastName || "",
-        specialties:
-          practitioner.certification?.specialties?.map(
-            (s: any) => s.name || s
-          ) || [],
-        profileImageUrl:
-          typeof practitioner.basicInfo.profileImageUrl === "string"
-            ? practitioner.basicInfo.profileImageUrl
-            : null,
-        experienceYears: undefined, // This would need to be calculated or stored in practitioner data
-      },
-      clinic: {
-        name: clinic.name,
-        adminName: undefined, // This would need to be fetched from clinic admin data
-        adminEmail: clinic.contactInfo.email,
-      },
-      context: {
-        invitationDate: invite.createdAt.toDate().toLocaleDateString(),
-        responseDate:
-          invite.acceptedAt?.toDate().toLocaleDateString() ||
-          new Date().toLocaleDateString(),
-      },
-      urls: {
-        clinicDashboardUrl: emailConfig.clinicDashboardUrl,
-        practitionerProfileUrl: emailConfig.practitionerProfileUrl,
-      },
-      options: {
-        fromAddress: emailConfig.fromAddress,
-        mailgunDomain: emailConfig.domain,
-      },
-    };
-
-    await this.mailingService.sendAcceptedNotificationEmail(notificationData);
+    try {
+      // Fetch the admin who created the invite
+      const admin = await this.fetchClinicAdminById(invite.invitedBy);
+      if (!admin) {
+        Logger.warn(
+          `[PractitionerInviteAggService] Admin ${invite.invitedBy} not found, using clinic contact email as fallback`
+        );
+
+        // Fallback to clinic contact email
+        const notificationData = {
+          invite,
+          practitioner: {
+            firstName: practitioner.basicInfo.firstName || "",
+            lastName: practitioner.basicInfo.lastName || "",
+            specialties:
+              practitioner.certification?.specialties?.map(
+                (s: any) => s.name || s
+              ) || [],
+            profileImageUrl:
+              typeof practitioner.basicInfo.profileImageUrl === "string"
+                ? practitioner.basicInfo.profileImageUrl
+                : null,
+            experienceYears: undefined,
+          },
+          clinic: {
+            name: clinic.name,
+            adminName: "Admin",
+            adminEmail: clinic.contactInfo.email,
+          },
+          context: {
+            invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+            responseDate:
+              invite.acceptedAt?.toDate().toLocaleDateString() ||
+              new Date().toLocaleDateString(),
+          },
+          urls: {
+            clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+            practitionerProfileUrl: emailConfig.practitionerProfileUrl,
+          },
+          options: {
+            fromAddress: emailConfig.fromAddress,
+            mailgunDomain: emailConfig.domain,
+          },
+        };
+
+        await this.mailingService.sendAcceptedNotificationEmail(
+          notificationData
+        );
+        return;
+      }
+
+      // Use specific admin details
+      const adminName = `${admin.contactInfo.firstName} ${admin.contactInfo.lastName}`;
+
+      const notificationData = {
+        invite,
+        practitioner: {
+          firstName: practitioner.basicInfo.firstName || "",
+          lastName: practitioner.basicInfo.lastName || "",
+          specialties:
+            practitioner.certification?.specialties?.map(
+              (s: any) => s.name || s
+            ) || [],
+          profileImageUrl:
+            typeof practitioner.basicInfo.profileImageUrl === "string"
+              ? practitioner.basicInfo.profileImageUrl
+              : null,
+          experienceYears: undefined, // This would need to be calculated or stored in practitioner data
+        },
+        clinic: {
+          name: clinic.name,
+          adminName: adminName,
+          adminEmail: admin.contactInfo.email, // Use the specific admin's email
+        },
+        context: {
+          invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+          responseDate:
+            invite.acceptedAt?.toDate().toLocaleDateString() ||
+            new Date().toLocaleDateString(),
+        },
+        urls: {
+          clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+          practitionerProfileUrl: emailConfig.practitionerProfileUrl,
+        },
+        options: {
+          fromAddress: emailConfig.fromAddress,
+          mailgunDomain: emailConfig.domain,
+        },
+      };
+
+      await this.mailingService.sendAcceptedNotificationEmail(notificationData);
+    } catch (error) {
+      Logger.error(
+        `[PractitionerInviteAggService] Error sending acceptance notification email:`,
+        error
+      );
+      throw error;
+    }
   }
 
   /**
@@ -770,42 +859,103 @@ export class PractitionerInviteAggregationService {
   ): Promise<void> {
     if (!this.mailingService) return;
 
-    const notificationData = {
-      invite,
-      practitioner: {
-        firstName: practitioner.basicInfo.firstName || "",
-        lastName: practitioner.basicInfo.lastName || "",
-        specialties:
-          practitioner.certification?.specialties?.map(
-            (s: any) => s.name || s
-          ) || [],
-        profileImageUrl:
-          typeof practitioner.basicInfo.profileImageUrl === "string"
-            ? practitioner.basicInfo.profileImageUrl
-            : null,
-      },
-      clinic: {
-        name: clinic.name,
-        adminName: undefined, // This would need to be fetched from clinic admin data
-        adminEmail: clinic.contactInfo.email,
-      },
-      context: {
-        invitationDate: invite.createdAt.toDate().toLocaleDateString(),
-        responseDate:
-          invite.rejectedAt?.toDate().toLocaleDateString() ||
-          new Date().toLocaleDateString(),
-        rejectionReason: invite.rejectionReason || undefined,
-      },
-      urls: {
-        clinicDashboardUrl: emailConfig.clinicDashboardUrl,
-        findPractitionersUrl: emailConfig.findPractitionersUrl,
-      },
-      options: {
-        fromAddress: emailConfig.fromAddress,
-        mailgunDomain: emailConfig.domain,
-      },
-    };
-
-    await this.mailingService.sendRejectedNotificationEmail(notificationData);
+    try {
+      // Fetch the admin who created the invite
+      const admin = await this.fetchClinicAdminById(invite.invitedBy);
+      if (!admin) {
+        Logger.warn(
+          `[PractitionerInviteAggService] Admin ${invite.invitedBy} not found, using clinic contact email as fallback`
+        );
+
+        // Fallback to clinic contact email
+        const notificationData = {
+          invite,
+          practitioner: {
+            firstName: practitioner.basicInfo.firstName || "",
+            lastName: practitioner.basicInfo.lastName || "",
+            specialties:
+              practitioner.certification?.specialties?.map(
+                (s: any) => s.name || s
+              ) || [],
+            profileImageUrl:
+              typeof practitioner.basicInfo.profileImageUrl === "string"
+                ? practitioner.basicInfo.profileImageUrl
+                : null,
+          },
+          clinic: {
+            name: clinic.name,
+            adminName: "Admin",
+            adminEmail: clinic.contactInfo.email,
+          },
+          context: {
+            invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+            responseDate:
+              invite.rejectedAt?.toDate().toLocaleDateString() ||
+              new Date().toLocaleDateString(),
+            rejectionReason: invite.rejectionReason || undefined,
+          },
+          urls: {
+            clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+            findPractitionersUrl: emailConfig.findPractitionersUrl,
+          },
+          options: {
+            fromAddress: emailConfig.fromAddress,
+            mailgunDomain: emailConfig.domain,
+          },
+        };
+
+        await this.mailingService.sendRejectedNotificationEmail(
+          notificationData
+        );
+        return;
+      }
+
+      // Use specific admin details
+      const adminName = `${admin.contactInfo.firstName} ${admin.contactInfo.lastName}`;
+
+      const notificationData = {
+        invite,
+        practitioner: {
+          firstName: practitioner.basicInfo.firstName || "",
+          lastName: practitioner.basicInfo.lastName || "",
+          specialties:
+            practitioner.certification?.specialties?.map(
+              (s: any) => s.name || s
+            ) || [],
+          profileImageUrl:
+            typeof practitioner.basicInfo.profileImageUrl === "string"
+              ? practitioner.basicInfo.profileImageUrl
+              : null,
+        },
+        clinic: {
+          name: clinic.name,
+          adminName: adminName,
+          adminEmail: admin.contactInfo.email, // Use the specific admin's email
+        },
+        context: {
+          invitationDate: invite.createdAt.toDate().toLocaleDateString(),
+          responseDate:
+            invite.rejectedAt?.toDate().toLocaleDateString() ||
+            new Date().toLocaleDateString(),
+          rejectionReason: invite.rejectionReason || undefined,
+        },
+        urls: {
+          clinicDashboardUrl: emailConfig.clinicDashboardUrl,
+          findPractitionersUrl: emailConfig.findPractitionersUrl,
+        },
+        options: {
+          fromAddress: emailConfig.fromAddress,
+          mailgunDomain: emailConfig.domain,
+        },
+      };
+
+      await this.mailingService.sendRejectedNotificationEmail(notificationData);
+    } catch (error) {
+      Logger.error(
+        `[PractitionerInviteAggService] Error sending rejection notification email:`,
+        error
+      );
+      throw error;
+    }
   }
 }