npm - @blackcode_sa/metaestetics-api - Versions diffs - 1.12.58 → 1.12.61 - Mend

@blackcode_sa/metaestetics-api 1.12.58 → 1.12.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (267) hide show

package/dist/admin/index.d.mts +36 -4
package/dist/admin/index.d.ts +36 -4
package/dist/admin/index.js +156 -28
package/dist/admin/index.mjs +156 -28
package/dist/index.d.mts +9 -1
package/dist/index.d.ts +9 -1
package/package.json +119 -119
package/src/__mocks__/firstore.ts +10 -10
package/src/admin/aggregation/README.md +79 -79
package/src/admin/aggregation/appointment/README.md +128 -128
package/src/admin/aggregation/appointment/appointment.aggregation.service.ts +1844 -1689
package/src/admin/aggregation/appointment/index.ts +1 -1
package/src/admin/aggregation/clinic/README.md +52 -52
package/src/admin/aggregation/clinic/clinic.aggregation.service.ts +703 -703
package/src/admin/aggregation/clinic/index.ts +1 -1
package/src/admin/aggregation/forms/README.md +13 -13
package/src/admin/aggregation/forms/filled-forms.aggregation.service.ts +322 -322
package/src/admin/aggregation/forms/index.ts +1 -1
package/src/admin/aggregation/index.ts +8 -8
package/src/admin/aggregation/patient/README.md +27 -27
package/src/admin/aggregation/patient/index.ts +1 -1
package/src/admin/aggregation/patient/patient.aggregation.service.ts +141 -141
package/src/admin/aggregation/practitioner/README.md +42 -42
package/src/admin/aggregation/practitioner/index.ts +1 -1
package/src/admin/aggregation/practitioner/practitioner.aggregation.service.ts +433 -433
package/src/admin/aggregation/practitioner-invite/index.ts +1 -1
package/src/admin/aggregation/practitioner-invite/practitioner-invite.aggregation.service.ts +961 -961
package/src/admin/aggregation/procedure/README.md +43 -43
package/src/admin/aggregation/procedure/index.ts +1 -1
package/src/admin/aggregation/procedure/procedure.aggregation.service.ts +702 -702
package/src/admin/aggregation/reviews/index.ts +1 -1
package/src/admin/aggregation/reviews/reviews.aggregation.service.ts +641 -641
package/src/admin/booking/README.md +125 -125
package/src/admin/booking/booking.admin.ts +1037 -1037
package/src/admin/booking/booking.calculator.ts +712 -699
package/src/admin/booking/booking.types.ts +59 -59
package/src/admin/booking/index.ts +3 -3
package/src/admin/booking/timezones-problem.md +185 -185
package/src/admin/calendar/README.md +7 -7
package/src/admin/calendar/calendar.admin.service.ts +345 -345
package/src/admin/calendar/index.ts +1 -1
package/src/admin/documentation-templates/document-manager.admin.ts +260 -260
package/src/admin/documentation-templates/index.ts +1 -1
package/src/admin/free-consultation/free-consultation-utils.admin.ts +148 -148
package/src/admin/free-consultation/index.ts +1 -1
package/src/admin/index.ts +75 -75
package/src/admin/logger/index.ts +78 -78
package/src/admin/mailing/README.md +95 -95
package/src/admin/mailing/appointment/appointment.mailing.service.ts +732 -732
package/src/admin/mailing/appointment/index.ts +1 -1
package/src/admin/mailing/appointment/templates/patient/appointment-confirmed.html +40 -40
package/src/admin/mailing/base.mailing.service.ts +208 -208
package/src/admin/mailing/index.ts +3 -3
package/src/admin/mailing/practitionerInvite/existing-practitioner-invite.mailing.ts +611 -611
package/src/admin/mailing/practitionerInvite/index.ts +2 -2
package/src/admin/mailing/practitionerInvite/practitionerInvite.mailing.ts +395 -395
package/src/admin/mailing/practitionerInvite/templates/existing-practitioner-invitation.template.ts +155 -155
package/src/admin/mailing/practitionerInvite/templates/invitation.template.ts +101 -101
package/src/admin/mailing/practitionerInvite/templates/invite-accepted-notification.template.ts +228 -228
package/src/admin/mailing/practitionerInvite/templates/invite-rejected-notification.template.ts +242 -242
package/src/admin/notifications/index.ts +1 -1
package/src/admin/notifications/notifications.admin.ts +710 -710
package/src/admin/requirements/README.md +128 -128
package/src/admin/requirements/index.ts +1 -1
package/src/admin/requirements/patient-requirements.admin.service.ts +475 -475
package/src/admin/users/index.ts +1 -1
package/src/admin/users/user-profile.admin.ts +405 -405
package/src/backoffice/constants/certification.constants.ts +13 -13
package/src/backoffice/constants/index.ts +1 -1
package/src/backoffice/errors/backoffice.errors.ts +181 -181
package/src/backoffice/errors/index.ts +1 -1
package/src/backoffice/expo-safe/README.md +26 -26
package/src/backoffice/expo-safe/index.ts +41 -41
package/src/backoffice/index.ts +5 -5
package/src/backoffice/services/FIXES_README.md +102 -102
package/src/backoffice/services/README.md +40 -40
package/src/backoffice/services/brand.service.ts +256 -256
package/src/backoffice/services/category.service.ts +318 -318
package/src/backoffice/services/constants.service.ts +385 -385
package/src/backoffice/services/documentation-template.service.ts +202 -202
package/src/backoffice/services/index.ts +8 -8
package/src/backoffice/services/migrate-products.ts +116 -116
package/src/backoffice/services/product.service.ts +553 -553
package/src/backoffice/services/requirement.service.ts +235 -235
package/src/backoffice/services/subcategory.service.ts +395 -395
package/src/backoffice/services/technology.service.ts +1070 -1070
package/src/backoffice/types/README.md +12 -12
package/src/backoffice/types/admin-constants.types.ts +69 -69
package/src/backoffice/types/brand.types.ts +29 -29
package/src/backoffice/types/category.types.ts +62 -62
package/src/backoffice/types/documentation-templates.types.ts +28 -28
package/src/backoffice/types/index.ts +10 -10
package/src/backoffice/types/procedure-product.types.ts +38 -38
package/src/backoffice/types/product.types.ts +240 -240
package/src/backoffice/types/requirement.types.ts +63 -63
package/src/backoffice/types/static/README.md +18 -18
package/src/backoffice/types/static/blocking-condition.types.ts +21 -21
package/src/backoffice/types/static/certification.types.ts +37 -37
package/src/backoffice/types/static/contraindication.types.ts +19 -19
package/src/backoffice/types/static/index.ts +6 -6
package/src/backoffice/types/static/pricing.types.ts +16 -16
package/src/backoffice/types/static/procedure-family.types.ts +14 -14
package/src/backoffice/types/static/treatment-benefit.types.ts +22 -22
package/src/backoffice/types/subcategory.types.ts +34 -34
package/src/backoffice/types/technology.types.ts +161 -161
package/src/backoffice/validations/index.ts +1 -1
package/src/backoffice/validations/schemas.ts +163 -163
package/src/config/__mocks__/firebase.ts +99 -99
package/src/config/firebase.ts +78 -78
package/src/config/index.ts +9 -9
package/src/errors/auth.error.ts +6 -6
package/src/errors/auth.errors.ts +200 -200
package/src/errors/clinic.errors.ts +32 -32
package/src/errors/firebase.errors.ts +47 -47
package/src/errors/user.errors.ts +99 -99
package/src/index.backup.ts +407 -407
package/src/index.ts +6 -6
package/src/locales/en.ts +31 -31
package/src/recommender/admin/index.ts +1 -1
package/src/recommender/admin/services/recommender.service.admin.ts +5 -5
package/src/recommender/front/index.ts +1 -1
package/src/recommender/front/services/onboarding.service.ts +5 -5
package/src/recommender/front/services/recommender.service.ts +3 -3
package/src/recommender/index.ts +1 -1
package/src/services/PATIENTAUTH.MD +197 -197
package/src/services/README.md +106 -106
package/src/services/__tests__/auth/auth.mock.test.ts +17 -17
package/src/services/__tests__/auth/auth.setup.ts +293 -293
package/src/services/__tests__/auth.service.test.ts +346 -346
package/src/services/__tests__/base.service.test.ts +77 -77
package/src/services/__tests__/user.service.test.ts +528 -528
package/src/services/appointment/README.md +17 -17
package/src/services/appointment/appointment.service.ts +2082 -2082
package/src/services/appointment/index.ts +1 -1
package/src/services/appointment/utils/appointment.utils.ts +552 -552
package/src/services/appointment/utils/extended-procedure.utils.ts +314 -314
package/src/services/appointment/utils/form-initialization.utils.ts +225 -225
package/src/services/appointment/utils/recommended-procedure.utils.ts +195 -195
package/src/services/appointment/utils/zone-management.utils.ts +353 -353
package/src/services/appointment/utils/zone-photo.utils.ts +152 -152
package/src/services/auth/auth.service.ts +989 -989
package/src/services/auth/auth.v2.service.ts +961 -961
package/src/services/auth/index.ts +7 -7
package/src/services/auth/utils/error.utils.ts +90 -90
package/src/services/auth/utils/firebase.utils.ts +49 -49
package/src/services/auth/utils/index.ts +21 -21
package/src/services/auth/utils/practitioner.utils.ts +125 -125
package/src/services/base.service.ts +41 -41
package/src/services/calendar/calendar.service.ts +1077 -1077
package/src/services/calendar/calendar.v2.service.ts +1683 -1683
package/src/services/calendar/calendar.v3.service.ts +313 -313
package/src/services/calendar/externalCalendar.service.ts +178 -178
package/src/services/calendar/index.ts +5 -5
package/src/services/calendar/synced-calendars.service.ts +743 -743
package/src/services/calendar/utils/appointment.utils.ts +265 -265
package/src/services/calendar/utils/calendar-event.utils.ts +646 -646
package/src/services/calendar/utils/clinic.utils.ts +237 -237
package/src/services/calendar/utils/docs.utils.ts +157 -157
package/src/services/calendar/utils/google-calendar.utils.ts +697 -697
package/src/services/calendar/utils/index.ts +8 -8
package/src/services/calendar/utils/patient.utils.ts +198 -198
package/src/services/calendar/utils/practitioner.utils.ts +221 -221
package/src/services/calendar/utils/synced-calendar.utils.ts +472 -472
package/src/services/clinic/README.md +204 -204
package/src/services/clinic/__tests__/clinic-admin.service.test.ts +287 -287
package/src/services/clinic/__tests__/clinic-group.service.test.ts +352 -352
package/src/services/clinic/__tests__/clinic.service.test.ts +354 -354
package/src/services/clinic/billing-transactions.service.ts +217 -217
package/src/services/clinic/clinic-admin.service.ts +202 -202
package/src/services/clinic/clinic-group.service.ts +310 -310
package/src/services/clinic/clinic.service.ts +708 -708
package/src/services/clinic/index.ts +5 -5
package/src/services/clinic/practitioner-invite.service.ts +519 -519
package/src/services/clinic/utils/admin.utils.ts +551 -551
package/src/services/clinic/utils/clinic-group.utils.ts +646 -646
package/src/services/clinic/utils/clinic.utils.ts +949 -949
package/src/services/clinic/utils/filter.utils.d.ts +23 -23
package/src/services/clinic/utils/filter.utils.ts +446 -446
package/src/services/clinic/utils/index.ts +11 -11
package/src/services/clinic/utils/photos.utils.ts +188 -188
package/src/services/clinic/utils/search.utils.ts +84 -84
package/src/services/clinic/utils/tag.utils.ts +124 -124
package/src/services/documentation-templates/documentation-template.service.ts +537 -537
package/src/services/documentation-templates/filled-document.service.ts +587 -587
package/src/services/documentation-templates/index.ts +2 -2
package/src/services/index.ts +13 -13
package/src/services/media/index.ts +1 -1
package/src/services/media/media.service.ts +418 -418
package/src/services/notifications/__tests__/notification.service.test.ts +242 -242
package/src/services/notifications/index.ts +1 -1
package/src/services/notifications/notification.service.ts +215 -215
package/src/services/patient/README.md +48 -48
package/src/services/patient/To-Do.md +43 -43
package/src/services/patient/__tests__/patient.service.test.ts +294 -294
package/src/services/patient/index.ts +2 -2
package/src/services/patient/patient.service.ts +883 -883
package/src/services/patient/patientRequirements.service.ts +285 -285
package/src/services/patient/utils/aesthetic-analysis.utils.ts +176 -176
package/src/services/patient/utils/clinic.utils.ts +80 -80
package/src/services/patient/utils/docs.utils.ts +142 -142
package/src/services/patient/utils/index.ts +9 -9
package/src/services/patient/utils/location.utils.ts +126 -126
package/src/services/patient/utils/medical-stuff.utils.ts +143 -143
package/src/services/patient/utils/medical.utils.ts +458 -458
package/src/services/patient/utils/practitioner.utils.ts +260 -260
package/src/services/patient/utils/profile.utils.ts +510 -510
package/src/services/patient/utils/sensitive.utils.ts +260 -260
package/src/services/patient/utils/token.utils.ts +211 -211
package/src/services/practitioner/README.md +145 -145
package/src/services/practitioner/index.ts +1 -1
package/src/services/practitioner/practitioner.service.ts +1742 -1742
package/src/services/procedure/README.md +163 -163
package/src/services/procedure/index.ts +1 -1
package/src/services/procedure/procedure.service.ts +1682 -1682
package/src/services/reviews/index.ts +1 -1
package/src/services/reviews/reviews.service.ts +636 -636
package/src/services/user/index.ts +1 -1
package/src/services/user/user.service.ts +489 -489
package/src/services/user/user.v2.service.ts +466 -466
package/src/types/appointment/index.ts +453 -453
package/src/types/calendar/index.ts +258 -258
package/src/types/calendar/synced-calendar.types.ts +66 -66
package/src/types/clinic/index.ts +489 -489
package/src/types/clinic/practitioner-invite.types.ts +91 -91
package/src/types/clinic/preferences.types.ts +159 -159
package/src/types/clinic/to-do +3 -3
package/src/types/documentation-templates/index.ts +308 -308
package/src/types/index.ts +44 -44
package/src/types/notifications/README.md +77 -77
package/src/types/notifications/index.ts +265 -265
package/src/types/patient/aesthetic-analysis.types.ts +66 -66
package/src/types/patient/allergies.ts +58 -58
package/src/types/patient/index.ts +273 -273
package/src/types/patient/medical-info.types.ts +152 -152
package/src/types/patient/patient-requirements.ts +92 -81
package/src/types/patient/token.types.ts +61 -61
package/src/types/practitioner/index.ts +206 -206
package/src/types/procedure/index.ts +181 -181
package/src/types/profile/index.ts +39 -39
package/src/types/reviews/index.ts +130 -130
package/src/types/tz-lookup.d.ts +4 -4
package/src/types/user/index.ts +38 -38
package/src/utils/TIMESTAMPS.md +176 -176
package/src/utils/TimestampUtils.ts +241 -241
package/src/utils/index.ts +1 -1
package/src/validations/appointment.schema.ts +574 -574
package/src/validations/calendar.schema.ts +225 -225
package/src/validations/clinic.schema.ts +493 -493
package/src/validations/common.schema.ts +25 -25
package/src/validations/documentation-templates/index.ts +1 -1
package/src/validations/documentation-templates/template.schema.ts +220 -220
package/src/validations/documentation-templates.schema.ts +10 -10
package/src/validations/index.ts +20 -20
package/src/validations/media.schema.ts +10 -10
package/src/validations/notification.schema.ts +90 -90
package/src/validations/patient/aesthetic-analysis.schema.ts +55 -55
package/src/validations/patient/medical-info.schema.ts +125 -125
package/src/validations/patient/patient-requirements.schema.ts +84 -75
package/src/validations/patient/token.schema.ts +29 -29
package/src/validations/patient.schema.ts +216 -216
package/src/validations/practitioner.schema.ts +222 -222
package/src/validations/procedure-product.schema.ts +41 -41
package/src/validations/procedure.schema.ts +124 -124
package/src/validations/profile-info.schema.ts +41 -41
package/src/validations/reviews.schema.ts +189 -189
package/src/validations/schemas.ts +104 -104
package/src/validations/shared.schema.ts +78 -78

package/src/admin/mailing/appointment/index.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export * from "./appointment.mailing.service";
1	+ export * from "./appointment.mailing.service";

package/src/admin/mailing/appointment/templates/patient/appointment-confirmed.html CHANGED Viewed

@@ -1,40 +1,40 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Appointment Confirmed</title>
-    <style>
-      body {
-        font-family: Arial, sans-serif;
-        margin: 0;
-        padding: 20px;
-        color: #333;
-      }
-      .container {
-        background-color: #f9f9f9;
-        padding: 20px;
-        border-radius: 5px;
-      }
-      h1 {
-        color: #4caf50;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="container">
-      <h1>Appointment Confirmed!</h1>
-      <p>Dear {{patientName}},</p>
-      <p>
-        This is a placeholder email to confirm your appointment for
-        <strong>{{procedureName}}</strong>.
-      </p>
-      <p>Date: {{appointmentDate}}</p>
-      <p>Time: {{appointmentTime}}</p>
-      <p>With: {{practitionerName}}</p>
-      <p>At: {{clinicName}}</p>
-      <p>We look forward to seeing you!</p>
-      <p>Sincerely,<br />The {{clinicName}} Team</p>
-    </div>
-  </body>
-</html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Appointment Confirmed</title>
+    <style>
+      body {
+        font-family: Arial, sans-serif;
+        margin: 0;
+        padding: 20px;
+        color: #333;
+      }
+      .container {
+        background-color: #f9f9f9;
+        padding: 20px;
+        border-radius: 5px;
+      }
+      h1 {
+        color: #4caf50;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="container">
+      <h1>Appointment Confirmed!</h1>
+      <p>Dear {{patientName}},</p>
+      <p>
+        This is a placeholder email to confirm your appointment for
+        <strong>{{procedureName}}</strong>.
+      </p>
+      <p>Date: {{appointmentDate}}</p>
+      <p>Time: {{appointmentTime}}</p>
+      <p>With: {{practitionerName}}</p>
+      <p>At: {{clinicName}}</p>
+      <p>We look forward to seeing you!</p>
+      <p>Sincerely,<br />The {{clinicName}} Team</p>
+    </div>
+  </body>
+</html>

package/src/admin/mailing/base.mailing.service.ts CHANGED Viewed

@@ -1,208 +1,208 @@
-import * as admin from "firebase-admin";
-// Import the new Mailgun types if available, or use a generic 'any' if not directly importable
-// For a shared library, it's often better to define a minimal interface for what you need
-// or expect the caller (Cloud Function) to pass a pre-configured client of 'any' type.
-// import Mailgun from "mailgun.js"; // This might not be a direct dep of the API pkg
-import { Logger } from "../logger"; // Assuming logger is in Api/src/logger
-/**
- * Minimal interface for the new mailgun.js client's messages API
- * This helps avoid a direct dependency on mailgun.js in the API package if not desired,
- * or provides clearer typing if it is.
- */
-interface NewMailgunMessagesAPI {
-  create(domain: string, data: any): Promise<any>;
-}
-export interface NewMailgunClient {
-  messages: NewMailgunMessagesAPI;
-  // Add other methods/properties if your BaseMailingService uses them
-}
-/**
- * Base mailing service class that provides common functionality for all mailing services
- * This version is updated to expect a mailgun.js v10+ client.
- */
-export class BaseMailingService {
-  protected db: FirebaseFirestore.Firestore;
-  protected mailgunClient: NewMailgunClient; // Expecting the new mailgun.js client
-  /**
-   * Constructor for BaseMailingService
-   * @param firestore Firestore instance provided by the caller
-   * @param mailgunClient Mailgun client instance (mailgun.js v10+) provided by the caller
-   */
-  constructor(
-    firestore: FirebaseFirestore.Firestore,
-    mailgunClient: NewMailgunClient // Expect the new client
-  ) {
-    this.db = firestore;
-    this.mailgunClient = mailgunClient;
-    if (!this.db) {
-      Logger.error("[BaseMailingService] No Firestore instance provided");
-      throw new Error("Firestore instance is required");
-    }
-    if (
-      !this.mailgunClient ||
-      typeof this.mailgunClient.messages?.create !== "function"
-    ) {
-      Logger.error(
-        "[BaseMailingService] Invalid Mailgun client provided (must be mailgun.js v10+ client)"
-      );
-      throw new Error("A valid mailgun.js v10+ client is required");
-    }
-    // The new client is configured with the URL (e.g., EU endpoint) by the caller.
-    // Validation of this configuration can be logged if details are accessible,
-    // but the primary responsibility for correct endpoint is now with client setup.
-    Logger.info(
-      "[BaseMailingService] Service initialized with mailgun.js client."
-    );
-  }
-  /**
-   * Sends an email using the new Mailgun client API.
-   * @param domain The Mailgun domain to send from (e.g., mg.metaesthetics.net)
-   * @param data Email data to send, compatible with mailgun.js messages.create API
-   * @returns Promise with the sending result
-   */
-  protected async sendEmail(
-    domain: string, // The new API requires the domain as the first argument to messages.create
-    data: any // Data format according to mailgun.js messages.create
-  ): Promise<any> {
-    if (!domain) {
-      throw new Error("Mailgun domain is required for sending email.");
-    }
-    if (!data) {
-      throw new Error("Email data object is required");
-    }
-    if (!data.to) {
-      throw new Error("Email 'to' address is required");
-    }
-    if (!data.from) {
-      throw new Error("Email 'from' address is required");
-    }
-    if (!data.subject) {
-      throw new Error("Email 'subject' is required");
-    }
-    if (!data.html && !data.text) {
-      throw new Error("Email must have either 'html' or 'text' content");
-    }
-    Logger.info(
-      "[BaseMailingService] Sending email via Mailgun (mailgun.js API)",
-      {
-        domain,
-        to: data.to,
-        from: data.from,
-        subject: data.subject,
-        hasHtml: !!data.html,
-        hasText: !!data.text,
-      }
-    );
-    try {
-      // Use the new mailgun.js client API: client.messages.create(domain, data)
-      const result = await this.mailgunClient.messages.create(domain, data);
-      Logger.info(
-        "[BaseMailingService] Email sent successfully with mailgun.js client",
-        result
-      );
-      return result;
-    } catch (error: any) {
-      Logger.error(
-        "[BaseMailingService] Error sending email with mailgun.js client",
-        {
-          errorMessage: error?.message,
-          errorDetails: error?.details, // mailgun.js errors often have a details field
-          errorStatusCode: error?.status, // and a status field for HTTP status code
-          stack: error?.stack,
-          domain,
-          to: data.to,
-        }
-      );
-      // Re-throw a more specific error or the original
-      const mailgunError = new Error(
-        `Mailgun API Error (${error?.status || "unknown"}): ${
-          error?.details || error?.message || "Failed to send email"
-        }`
-      );
-      (mailgunError as any).originalError = error;
-      throw mailgunError;
-    }
-  }
-  /**
-   * Logs email sending attempt to Firestore for tracking
-   * @param emailData Email data that was sent
-   * @param success Whether the email was sent successfully
-   * @param error Error object if the email failed to send
-   */
-  protected async logEmailAttempt(
-    emailData: { to: string; subject: string; templateName?: string },
-    success: boolean,
-    error?: any
-  ): Promise<void> {
-    try {
-      const emailLogRef = this.db.collection("email_logs").doc();
-      await emailLogRef.set({
-        to: emailData.to,
-        subject: emailData.subject,
-        templateName: emailData.templateName,
-        success,
-        error: error
-          ? {
-              message: error.message,
-              details: (error as any).details,
-              status: (error as any).status,
-              stack: error.stack,
-            }
-          : null,
-        sentAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
-      Logger.info(
-        `[BaseMailingService] Email log recorded. Success: ${success}`
-      );
-    } catch (logError: any) {
-      Logger.error("[BaseMailingService] Error logging email attempt:", {
-        errorMessage: logError.message,
-        stack: logError.stack,
-      });
-      // Don't throw here to prevent disrupting the main flow
-    }
-  }
-  /**
-   * Renders a simple HTML email template with variables
-   * @param template HTML template string
-   * @param variables Key-value pairs to replace in the template
-   * @returns Rendered HTML string
-   */
-  protected renderTemplate(
-    template: string,
-    variables: Record<string, string>
-  ): string {
-    if (!template) {
-      throw new Error("Email template is required");
-    }
-    try {
-      let rendered = template;
-      Object.entries(variables).forEach(([key, value]) => {
-        const regex = new RegExp(`{{\s*${key}\s*}}`, "g");
-        rendered = rendered.replace(regex, value || "");
-      });
-      return rendered;
-    } catch (renderError: any) {
-      Logger.error("[BaseMailingService] Error rendering template:", {
-        errorMessage: renderError.message,
-      });
-      throw new Error(
-        `Template rendering failed: ${renderError.message || "Unknown error"}`
-      );
-    }
-  }
-}
+import * as admin from "firebase-admin";
+// Import the new Mailgun types if available, or use a generic 'any' if not directly importable
+// For a shared library, it's often better to define a minimal interface for what you need
+// or expect the caller (Cloud Function) to pass a pre-configured client of 'any' type.
+// import Mailgun from "mailgun.js"; // This might not be a direct dep of the API pkg
+import { Logger } from "../logger"; // Assuming logger is in Api/src/logger
+/**
+ * Minimal interface for the new mailgun.js client's messages API
+ * This helps avoid a direct dependency on mailgun.js in the API package if not desired,
+ * or provides clearer typing if it is.
+ */
+interface NewMailgunMessagesAPI {
+  create(domain: string, data: any): Promise<any>;
+}
+export interface NewMailgunClient {
+  messages: NewMailgunMessagesAPI;
+  // Add other methods/properties if your BaseMailingService uses them
+}
+/**
+ * Base mailing service class that provides common functionality for all mailing services
+ * This version is updated to expect a mailgun.js v10+ client.
+ */
+export class BaseMailingService {
+  protected db: FirebaseFirestore.Firestore;
+  protected mailgunClient: NewMailgunClient; // Expecting the new mailgun.js client
+  /**
+   * Constructor for BaseMailingService
+   * @param firestore Firestore instance provided by the caller
+   * @param mailgunClient Mailgun client instance (mailgun.js v10+) provided by the caller
+   */
+  constructor(
+    firestore: FirebaseFirestore.Firestore,
+    mailgunClient: NewMailgunClient // Expect the new client
+  ) {
+    this.db = firestore;
+    this.mailgunClient = mailgunClient;
+    if (!this.db) {
+      Logger.error("[BaseMailingService] No Firestore instance provided");
+      throw new Error("Firestore instance is required");
+    }
+    if (
+      !this.mailgunClient ||
+      typeof this.mailgunClient.messages?.create !== "function"
+    ) {
+      Logger.error(
+        "[BaseMailingService] Invalid Mailgun client provided (must be mailgun.js v10+ client)"
+      );
+      throw new Error("A valid mailgun.js v10+ client is required");
+    }
+    // The new client is configured with the URL (e.g., EU endpoint) by the caller.
+    // Validation of this configuration can be logged if details are accessible,
+    // but the primary responsibility for correct endpoint is now with client setup.
+    Logger.info(
+      "[BaseMailingService] Service initialized with mailgun.js client."
+    );
+  }
+  /**
+   * Sends an email using the new Mailgun client API.
+   * @param domain The Mailgun domain to send from (e.g., mg.metaesthetics.net)
+   * @param data Email data to send, compatible with mailgun.js messages.create API
+   * @returns Promise with the sending result
+   */
+  protected async sendEmail(
+    domain: string, // The new API requires the domain as the first argument to messages.create
+    data: any // Data format according to mailgun.js messages.create
+  ): Promise<any> {
+    if (!domain) {
+      throw new Error("Mailgun domain is required for sending email.");
+    }
+    if (!data) {
+      throw new Error("Email data object is required");
+    }
+    if (!data.to) {
+      throw new Error("Email 'to' address is required");
+    }
+    if (!data.from) {
+      throw new Error("Email 'from' address is required");
+    }
+    if (!data.subject) {
+      throw new Error("Email 'subject' is required");
+    }
+    if (!data.html && !data.text) {
+      throw new Error("Email must have either 'html' or 'text' content");
+    }
+    Logger.info(
+      "[BaseMailingService] Sending email via Mailgun (mailgun.js API)",
+      {
+        domain,
+        to: data.to,
+        from: data.from,
+        subject: data.subject,
+        hasHtml: !!data.html,
+        hasText: !!data.text,
+      }
+    );
+    try {
+      // Use the new mailgun.js client API: client.messages.create(domain, data)
+      const result = await this.mailgunClient.messages.create(domain, data);
+      Logger.info(
+        "[BaseMailingService] Email sent successfully with mailgun.js client",
+        result
+      );
+      return result;
+    } catch (error: any) {
+      Logger.error(
+        "[BaseMailingService] Error sending email with mailgun.js client",
+        {
+          errorMessage: error?.message,
+          errorDetails: error?.details, // mailgun.js errors often have a details field
+          errorStatusCode: error?.status, // and a status field for HTTP status code
+          stack: error?.stack,
+          domain,
+          to: data.to,
+        }
+      );
+      // Re-throw a more specific error or the original
+      const mailgunError = new Error(
+        `Mailgun API Error (${error?.status || "unknown"}): ${
+          error?.details || error?.message || "Failed to send email"
+        }`
+      );
+      (mailgunError as any).originalError = error;
+      throw mailgunError;
+    }
+  }
+  /**
+   * Logs email sending attempt to Firestore for tracking
+   * @param emailData Email data that was sent
+   * @param success Whether the email was sent successfully
+   * @param error Error object if the email failed to send
+   */
+  protected async logEmailAttempt(
+    emailData: { to: string; subject: string; templateName?: string },
+    success: boolean,
+    error?: any
+  ): Promise<void> {
+    try {
+      const emailLogRef = this.db.collection("email_logs").doc();
+      await emailLogRef.set({
+        to: emailData.to,
+        subject: emailData.subject,
+        templateName: emailData.templateName,
+        success,
+        error: error
+          ? {
+              message: error.message,
+              details: (error as any).details,
+              status: (error as any).status,
+              stack: error.stack,
+            }
+          : null,
+        sentAt: admin.firestore.FieldValue.serverTimestamp(),
+      });
+      Logger.info(
+        `[BaseMailingService] Email log recorded. Success: ${success}`
+      );
+    } catch (logError: any) {
+      Logger.error("[BaseMailingService] Error logging email attempt:", {
+        errorMessage: logError.message,
+        stack: logError.stack,
+      });
+      // Don't throw here to prevent disrupting the main flow
+    }
+  }
+  /**
+   * Renders a simple HTML email template with variables
+   * @param template HTML template string
+   * @param variables Key-value pairs to replace in the template
+   * @returns Rendered HTML string
+   */
+  protected renderTemplate(
+    template: string,
+    variables: Record<string, string>
+  ): string {
+    if (!template) {
+      throw new Error("Email template is required");
+    }
+    try {
+      let rendered = template;
+      Object.entries(variables).forEach(([key, value]) => {
+        const regex = new RegExp(`{{\s*${key}\s*}}`, "g");
+        rendered = rendered.replace(regex, value || "");
+      });
+      return rendered;
+    } catch (renderError: any) {
+      Logger.error("[BaseMailingService] Error rendering template:", {
+        errorMessage: renderError.message,
+      });
+      throw new Error(
+        `Template rendering failed: ${renderError.message || "Unknown error"}`
+      );
+    }
+  }
+}

package/src/admin/mailing/index.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-export * from "./base.mailing.service";
-export * from "./practitionerInvite";
-export * from "./appointment";
+export * from "./base.mailing.service";
+export * from "./practitionerInvite";
+export * from "./appointment";