@blackcode_sa/metaestetics-api 1.12.8 → 1.12.11

package/dist/admin/index.js

@@ -3867,14 +3867,37 @@ var FilledFormsAggregationService = class {
         );
         return;
       }
+      let templateData;
+      const templateRef = this.db.collection("documentation-templates").doc(filledDocument.templateId);
+      const templateDoc = await templateRef.get();
+      if (templateDoc.exists) {
+        const currentTemplateData = templateDoc.data();
+        if (currentTemplateData && currentTemplateData.version === filledDocument.templateVersion) {
+          templateData = currentTemplateData;
+        } else {
+          const versionRef = templateRef.collection("versions").doc(filledDocument.templateVersion.toString());
+          const versionDoc = await versionRef.get();
+          if (versionDoc.exists) {
+            templateData = versionDoc.data();
+          } else {
+            Logger.warn(
+              `[FilledFormsAggregationService] Template version ${filledDocument.templateVersion} not found for template ${filledDocument.templateId}. Falling back to the latest version.`
+            );
+            templateData = currentTemplateData;
+          }
+        }
+      } else {
+        Logger.error(
+          `[FilledFormsAggregationService] Document template ${filledDocument.templateId} not found. Cannot retrieve title.`
+        );
+      }
       const appointment = appointmentDoc.data();
       const formSubcollection = filledDocument.isUserForm ? USER_FORMS_SUBCOLLECTION : DOCTOR_FORMS_SUBCOLLECTION;
       const linkedFormInfo = {
         formId: filledDocument.id,
         templateId: filledDocument.templateId,
         templateVersion: filledDocument.templateVersion,
-        title: filledDocument.isUserForm ? "User Form" : "Doctor Form",
-        // Default title if not available
+        title: (templateData == null ? void 0 : templateData.title) || (filledDocument.isUserForm ? "User Form" : "Doctor Form"),
         isUserForm: filledDocument.isUserForm,
         isRequired: filledDocument.isRequired,
         status: filledDocument.status,
@@ -3909,7 +3932,9 @@ var FilledFormsAggregationService = class {
       }
       if (filledDocument.isUserForm && filledDocument.isRequired && (filledDocument.status === "completed" /* COMPLETED */ || filledDocument.status === "signed" /* SIGNED */)) {
         if (appointment.pendingUserFormsIds && appointment.pendingUserFormsIds.includes(filledDocument.id)) {
-          updateData.pendingUserFormsIds = admin8.firestore.FieldValue.arrayRemove(filledDocument.id);
+          updateData.pendingUserFormsIds = admin8.firestore.FieldValue.arrayRemove(
+            filledDocument.id
+          );
           Logger.info(
             `[FilledFormsAggregationService] Removing form ${filledDocument.id} from pendingUserFormsIds`
           );
@@ -3957,9 +3982,7 @@ var FilledFormsAggregationService = class {
         }
       }
       if (appointment.linkedFormIds && appointment.linkedFormIds.includes(filledDocument.id)) {
-        updateData.linkedFormIds = admin8.firestore.FieldValue.arrayRemove(
-          filledDocument.id
-        );
+        updateData.linkedFormIds = admin8.firestore.FieldValue.arrayRemove(filledDocument.id);
       }
       if (filledDocument.isUserForm && filledDocument.isRequired) {
         if (filledDocument.status !== "completed" /* COMPLETED */ && filledDocument.status !== "signed" /* SIGNED */) {
@@ -4009,9 +4032,7 @@ var FilledFormsAggregationService = class {
         return;
       }
       await appointmentRef.update({
-        pendingUserFormsIds: admin8.firestore.FieldValue.arrayUnion(
-          filledDocument.id
-        ),
+        pendingUserFormsIds: admin8.firestore.FieldValue.arrayUnion(filledDocument.id),
         updatedAt: admin8.firestore.FieldValue.serverTimestamp()
       });
       Logger.info(

package/dist/admin/index.mjs

@@ -3805,14 +3805,37 @@ var FilledFormsAggregationService = class {
         );
         return;
       }
+      let templateData;
+      const templateRef = this.db.collection("documentation-templates").doc(filledDocument.templateId);
+      const templateDoc = await templateRef.get();
+      if (templateDoc.exists) {
+        const currentTemplateData = templateDoc.data();
+        if (currentTemplateData && currentTemplateData.version === filledDocument.templateVersion) {
+          templateData = currentTemplateData;
+        } else {
+          const versionRef = templateRef.collection("versions").doc(filledDocument.templateVersion.toString());
+          const versionDoc = await versionRef.get();
+          if (versionDoc.exists) {
+            templateData = versionDoc.data();
+          } else {
+            Logger.warn(
+              `[FilledFormsAggregationService] Template version ${filledDocument.templateVersion} not found for template ${filledDocument.templateId}. Falling back to the latest version.`
+            );
+            templateData = currentTemplateData;
+          }
+        }
+      } else {
+        Logger.error(
+          `[FilledFormsAggregationService] Document template ${filledDocument.templateId} not found. Cannot retrieve title.`
+        );
+      }
       const appointment = appointmentDoc.data();
       const formSubcollection = filledDocument.isUserForm ? USER_FORMS_SUBCOLLECTION : DOCTOR_FORMS_SUBCOLLECTION;
       const linkedFormInfo = {
         formId: filledDocument.id,
         templateId: filledDocument.templateId,
         templateVersion: filledDocument.templateVersion,
-        title: filledDocument.isUserForm ? "User Form" : "Doctor Form",
-        // Default title if not available
+        title: (templateData == null ? void 0 : templateData.title) || (filledDocument.isUserForm ? "User Form" : "Doctor Form"),
         isUserForm: filledDocument.isUserForm,
         isRequired: filledDocument.isRequired,
         status: filledDocument.status,
@@ -3847,7 +3870,9 @@ var FilledFormsAggregationService = class {
       }
       if (filledDocument.isUserForm && filledDocument.isRequired && (filledDocument.status === "completed" /* COMPLETED */ || filledDocument.status === "signed" /* SIGNED */)) {
         if (appointment.pendingUserFormsIds && appointment.pendingUserFormsIds.includes(filledDocument.id)) {
-          updateData.pendingUserFormsIds = admin8.firestore.FieldValue.arrayRemove(filledDocument.id);
+          updateData.pendingUserFormsIds = admin8.firestore.FieldValue.arrayRemove(
+            filledDocument.id
+          );
           Logger.info(
             `[FilledFormsAggregationService] Removing form ${filledDocument.id} from pendingUserFormsIds`
           );
@@ -3895,9 +3920,7 @@ var FilledFormsAggregationService = class {
         }
       }
       if (appointment.linkedFormIds && appointment.linkedFormIds.includes(filledDocument.id)) {
-        updateData.linkedFormIds = admin8.firestore.FieldValue.arrayRemove(
-          filledDocument.id
-        );
+        updateData.linkedFormIds = admin8.firestore.FieldValue.arrayRemove(filledDocument.id);
       }
       if (filledDocument.isUserForm && filledDocument.isRequired) {
         if (filledDocument.status !== "completed" /* COMPLETED */ && filledDocument.status !== "signed" /* SIGNED */) {
@@ -3947,9 +3970,7 @@ var FilledFormsAggregationService = class {
         return;
       }
       await appointmentRef.update({
-        pendingUserFormsIds: admin8.firestore.FieldValue.arrayUnion(
-          filledDocument.id
-        ),
+        pendingUserFormsIds: admin8.firestore.FieldValue.arrayUnion(filledDocument.id),
         updatedAt: admin8.firestore.FieldValue.serverTimestamp()
       });
       Logger.info(

package/dist/index.d.mts

@@ -5885,7 +5885,7 @@ declare class AppointmentService extends BaseService {
      */
     updateAppointmentStatus(appointmentId: string, newStatus: AppointmentStatus, details?: {
         cancellationReason?: string;
-        canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+        canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
     }): Promise<Appointment>;
     /**
      * Confirms a PENDING appointment by an Admin/Clinic.
@@ -5944,7 +5944,7 @@ declare class AppointmentService extends BaseService {
     /**
      * Adds a media item to an appointment.
      */
-    addMediaToAppointment(appointmentId: string, mediaItemData: Omit<AppointmentMediaItem, "id" | "uploadedAt">): Promise<Appointment>;
+    addMediaToAppointment(appointmentId: string, mediaItemData: Omit<AppointmentMediaItem, 'id' | 'uploadedAt'>): Promise<Appointment>;
     /**
      * Removes a media item from an appointment.
      */
@@ -5952,7 +5952,7 @@ declare class AppointmentService extends BaseService {
     /**
      * Adds or updates review information for an appointment.
      */
-    addReviewToAppointment(appointmentId: string, reviewData: Omit<PatientReviewInfo, "reviewedAt" | "reviewId">): Promise<Appointment>;
+    addReviewToAppointment(appointmentId: string, reviewData: Omit<PatientReviewInfo, 'reviewedAt' | 'reviewId'>): Promise<Appointment>;
     /**
      * Updates the payment status of an appointment.
      */
@@ -6002,6 +6002,15 @@ declare class AppointmentService extends BaseService {
         appointments: Appointment[];
         lastDoc: DocumentSnapshot | null;
     }>;
+    /**
+     * Counts completed appointments for a patient with optional clinic filtering.
+     *
+     * @param patientId ID of the patient.
+     * @param clinicBranchId Optional ID of the clinic branch to either include or exclude.
+     * @param excludeClinic Optional boolean. If true (default), excludes the specified clinic. If false, includes only that clinic.
+     * @returns The count of completed appointments.
+     */
+    countCompletedAppointments(patientId: string, clinicBranchId?: string, excludeClinic?: boolean): Promise<number>;
 }
 
 declare class UserService extends BaseService {
@@ -6066,8 +6075,6 @@ declare class UserService extends BaseService {
 
 declare class AuthService extends BaseService {
     private googleProvider;
-    private facebookProvider;
-    private appleProvider;
     private userService;
     constructor(db: Firestore, auth: Auth, app: FirebaseApp, userService: UserService);
     /**
@@ -6105,20 +6112,6 @@ declare class AuthService extends BaseService {
         clinicAdmin: ClinicAdmin;
         clinicGroup: ClinicGroup;
     }>;
-    /**
-     * Prijavljuje korisnika sa Facebook-om
-     */
-    signInWithFacebook(): Promise<User>;
-    /**
-     * Prijavljuje korisnika sa Google nalogom
-     */
-    signInWithGoogle(initialRole?: UserRole, options?: {
-        patientInviteToken?: string;
-    }): Promise<User>;
-    /**
-     * Prijavljuje korisnika sa Apple-om
-     */
-    signInWithApple(): Promise<User>;
     /**
      * Prijavljuje korisnika anonimno
      */
@@ -6136,19 +6129,6 @@ declare class AuthService extends BaseService {
      */
     onAuthStateChange(callback: (user: User$1 | null) => void): () => void;
     upgradeAnonymousUser(email: string, password: string): Promise<User>;
-    /**
-     * Upgrades an anonymous user to a regular user by signing in with a Google account.
-     *
-     * @throws {AuthError} If the user is not anonymous.
-     * @throws {AuthError} If the user is not authenticated.
-     * @throws {AuthError} If the popup window is closed by the user.
-     * @throws {FirebaseError} If any other Firebase error occurs.
-     *
-     * @returns {Promise<User>} The upgraded user.
-     */
-    upgradeAnonymousUserWithGoogle(): Promise<User>;
-    upgradeAnonymousUserWithFacebook(): Promise<User>;
-    upgradeAnonymousUserWithApple(): Promise<User>;
     /**
      * Šalje email za resetovanje lozinke korisniku
      * @param email Email adresa korisnika
@@ -6203,6 +6183,43 @@ declare class AuthService extends BaseService {
         user: User;
         practitioner: Practitioner;
     }>;
+    /**
+     * Signs in a user with a Google ID token from a mobile client.
+     * If the user does not exist, a new user is created.
+     * @param idToken - The Google ID token obtained from the mobile app.
+     * @param initialRole - The role to assign to the user if they are being created.
+     * @returns The signed-in or newly created user.
+     */
+    signInWithGoogleIdToken(idToken: string, initialRole?: UserRole): Promise<User>;
+    /**
+     * Signs in a user with a Google authorization code from a mobile client.
+     * This method directly exchanges the authorization code for tokens using Google's OAuth2 API
+     * with the platform-specific client ID (no client secret needed for native apps).
+     * @param authorizationCode - The Google authorization code obtained from the mobile app.
+     * @param redirectUri - The redirect URI used in the OAuth flow.
+     * @param platform - The platform (ios/android) to determine which client ID to use.
+     * @param initialRole - The role to assign to the user if they are being created.
+     * @returns The signed-in or newly created user.
+     */
+    signInWithGoogleAuthCode(authorizationCode: string, redirectUri: string, platform: 'ios' | 'android', initialRole?: UserRole): Promise<User>;
+    /**
+     * Links a Google account to the currently signed-in user using an ID token.
+     * This is used to upgrade an anonymous user or to allow an existing user
+     * to sign in with Google in the future.
+     * @param idToken - The Google ID token obtained from the mobile app.
+     * @returns The updated user profile.
+     */
+    linkGoogleAccount(idToken: string): Promise<User>;
+    /**
+     * Links a Google account to the currently signed-in user using an authorization code.
+     * This method directly exchanges the authorization code for tokens using Google's OAuth2 API
+     * with the platform-specific client ID, then links the Google account to the current user.
+     * @param authorizationCode - The Google authorization code obtained from the mobile app.
+     * @param redirectUri - The redirect URI used in the OAuth flow.
+     * @param platform - The platform (ios/android) to determine which client ID to use.
+     * @returns The updated user profile.
+     */
+    linkGoogleAccountWithAuthCode(authorizationCode: string, redirectUri: string, platform: 'ios' | 'android'): Promise<User>;
 }
 
 /**

package/dist/index.d.ts

@@ -5885,7 +5885,7 @@ declare class AppointmentService extends BaseService {
      */
     updateAppointmentStatus(appointmentId: string, newStatus: AppointmentStatus, details?: {
         cancellationReason?: string;
-        canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+        canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
     }): Promise<Appointment>;
     /**
      * Confirms a PENDING appointment by an Admin/Clinic.
@@ -5944,7 +5944,7 @@ declare class AppointmentService extends BaseService {
     /**
      * Adds a media item to an appointment.
      */
-    addMediaToAppointment(appointmentId: string, mediaItemData: Omit<AppointmentMediaItem, "id" | "uploadedAt">): Promise<Appointment>;
+    addMediaToAppointment(appointmentId: string, mediaItemData: Omit<AppointmentMediaItem, 'id' | 'uploadedAt'>): Promise<Appointment>;
     /**
      * Removes a media item from an appointment.
      */
@@ -5952,7 +5952,7 @@ declare class AppointmentService extends BaseService {
     /**
      * Adds or updates review information for an appointment.
      */
-    addReviewToAppointment(appointmentId: string, reviewData: Omit<PatientReviewInfo, "reviewedAt" | "reviewId">): Promise<Appointment>;
+    addReviewToAppointment(appointmentId: string, reviewData: Omit<PatientReviewInfo, 'reviewedAt' | 'reviewId'>): Promise<Appointment>;
     /**
      * Updates the payment status of an appointment.
      */
@@ -6002,6 +6002,15 @@ declare class AppointmentService extends BaseService {
         appointments: Appointment[];
         lastDoc: DocumentSnapshot | null;
     }>;
+    /**
+     * Counts completed appointments for a patient with optional clinic filtering.
+     *
+     * @param patientId ID of the patient.
+     * @param clinicBranchId Optional ID of the clinic branch to either include or exclude.
+     * @param excludeClinic Optional boolean. If true (default), excludes the specified clinic. If false, includes only that clinic.
+     * @returns The count of completed appointments.
+     */
+    countCompletedAppointments(patientId: string, clinicBranchId?: string, excludeClinic?: boolean): Promise<number>;
 }
 
 declare class UserService extends BaseService {
@@ -6066,8 +6075,6 @@ declare class UserService extends BaseService {
 
 declare class AuthService extends BaseService {
     private googleProvider;
-    private facebookProvider;
-    private appleProvider;
     private userService;
     constructor(db: Firestore, auth: Auth, app: FirebaseApp, userService: UserService);
     /**
@@ -6105,20 +6112,6 @@ declare class AuthService extends BaseService {
         clinicAdmin: ClinicAdmin;
         clinicGroup: ClinicGroup;
     }>;
-    /**
-     * Prijavljuje korisnika sa Facebook-om
-     */
-    signInWithFacebook(): Promise<User>;
-    /**
-     * Prijavljuje korisnika sa Google nalogom
-     */
-    signInWithGoogle(initialRole?: UserRole, options?: {
-        patientInviteToken?: string;
-    }): Promise<User>;
-    /**
-     * Prijavljuje korisnika sa Apple-om
-     */
-    signInWithApple(): Promise<User>;
     /**
      * Prijavljuje korisnika anonimno
      */
@@ -6136,19 +6129,6 @@ declare class AuthService extends BaseService {
      */
     onAuthStateChange(callback: (user: User$1 | null) => void): () => void;
     upgradeAnonymousUser(email: string, password: string): Promise<User>;
-    /**
-     * Upgrades an anonymous user to a regular user by signing in with a Google account.
-     *
-     * @throws {AuthError} If the user is not anonymous.
-     * @throws {AuthError} If the user is not authenticated.
-     * @throws {AuthError} If the popup window is closed by the user.
-     * @throws {FirebaseError} If any other Firebase error occurs.
-     *
-     * @returns {Promise<User>} The upgraded user.
-     */
-    upgradeAnonymousUserWithGoogle(): Promise<User>;
-    upgradeAnonymousUserWithFacebook(): Promise<User>;
-    upgradeAnonymousUserWithApple(): Promise<User>;
     /**
      * Šalje email za resetovanje lozinke korisniku
      * @param email Email adresa korisnika
@@ -6203,6 +6183,43 @@ declare class AuthService extends BaseService {
         user: User;
         practitioner: Practitioner;
     }>;
+    /**
+     * Signs in a user with a Google ID token from a mobile client.
+     * If the user does not exist, a new user is created.
+     * @param idToken - The Google ID token obtained from the mobile app.
+     * @param initialRole - The role to assign to the user if they are being created.
+     * @returns The signed-in or newly created user.
+     */
+    signInWithGoogleIdToken(idToken: string, initialRole?: UserRole): Promise<User>;
+    /**
+     * Signs in a user with a Google authorization code from a mobile client.
+     * This method directly exchanges the authorization code for tokens using Google's OAuth2 API
+     * with the platform-specific client ID (no client secret needed for native apps).
+     * @param authorizationCode - The Google authorization code obtained from the mobile app.
+     * @param redirectUri - The redirect URI used in the OAuth flow.
+     * @param platform - The platform (ios/android) to determine which client ID to use.
+     * @param initialRole - The role to assign to the user if they are being created.
+     * @returns The signed-in or newly created user.
+     */
+    signInWithGoogleAuthCode(authorizationCode: string, redirectUri: string, platform: 'ios' | 'android', initialRole?: UserRole): Promise<User>;
+    /**
+     * Links a Google account to the currently signed-in user using an ID token.
+     * This is used to upgrade an anonymous user or to allow an existing user
+     * to sign in with Google in the future.
+     * @param idToken - The Google ID token obtained from the mobile app.
+     * @returns The updated user profile.
+     */
+    linkGoogleAccount(idToken: string): Promise<User>;
+    /**
+     * Links a Google account to the currently signed-in user using an authorization code.
+     * This method directly exchanges the authorization code for tokens using Google's OAuth2 API
+     * with the platform-specific client ID, then links the Google account to the current user.
+     * @param authorizationCode - The Google authorization code obtained from the mobile app.
+     * @param redirectUri - The redirect URI used in the OAuth flow.
+     * @param platform - The platform (ios/android) to determine which client ID to use.
+     * @returns The updated user profile.
+     */
+    linkGoogleAccountWithAuthCode(authorizationCode: string, redirectUri: string, platform: 'ios' | 'android'): Promise<User>;
 }
 
 /**