@blackcode_sa/metaestetics-api 1.14.23 → 1.14.27

package/src/backoffice/services/brand.service.ts

@@ -46,12 +46,18 @@ export class BrandService extends BaseService {
   }
 
   /**
-   * Gets a paginated list of active brands, optionally filtered by name.
+   * Gets a paginated list of active brands, optionally filtered by name and category.
    * @param rowsPerPage - The number of brands to fetch.
    * @param searchTerm - An optional string to filter brand names by (starts-with search).
    * @param lastVisible - An optional document snapshot to use as a cursor for pagination.
+   * @param category - An optional category to filter brands by.
    */
-  async getAll(rowsPerPage: number, searchTerm?: string, lastVisible?: any) {
+  async getAll(
+    rowsPerPage: number,
+    searchTerm?: string,
+    lastVisible?: any,
+    category?: string
+  ) {
     const constraints: QueryConstraint[] = [
       where("isActive", "==", true),
       orderBy("name_lowercase"),
@@ -65,6 +71,10 @@ export class BrandService extends BaseService {
       );
     }
 
+    if (category) {
+      constraints.push(where("category", "==", category));
+    }
+
     if (lastVisible) {
       constraints.push(startAfter(lastVisible));
     }
@@ -87,10 +97,11 @@ export class BrandService extends BaseService {
   }
 
   /**
-   * Gets the total count of active brands, optionally filtered by name.
+   * Gets the total count of active brands, optionally filtered by name and category.
    * @param searchTerm - An optional string to filter brand names by (starts-with search).
+   * @param category - An optional category to filter brands by.
    */
-  async getBrandsCount(searchTerm?: string) {
+  async getBrandsCount(searchTerm?: string, category?: string) {
     const constraints: QueryConstraint[] = [where("isActive", "==", true)];
 
     if (searchTerm) {
@@ -101,6 +112,10 @@ export class BrandService extends BaseService {
       );
     }
 
+    if (category) {
+      constraints.push(where("category", "==", category));
+    }
+
     const q = query(this.getBrandsRef(), ...constraints);
     const snapshot = await getCountFromServer(q);
     return snapshot.data().count;
@@ -184,6 +199,7 @@ export class BrandService extends BaseService {
       "id",
       "name",
       "manufacturer",
+      "category",
       "website",
       "description",
       "isActive",
@@ -230,6 +246,7 @@ export class BrandService extends BaseService {
       brand.id ?? "",
       brand.name ?? "",
       brand.manufacturer ?? "",
+      brand.category ?? "",
       brand.website ?? "",
       brand.description ?? "",
       String(brand.isActive ?? ""),

package/src/backoffice/types/brand.types.ts

@@ -7,6 +7,7 @@
  * @property manufacturer - Naziv proizvođača
  * @property description - Detaljan opis brenda i njegovih proizvoda
  * @property website - Web stranica brenda
+ * @property category - Kategorija brenda (npr. "laser", "peeling", "injectables") - za filtriranje
  * @property isActive - Da li je brend aktivan u sistemu
  * @property createdAt - Datum kreiranja
  * @property updatedAt - Datum poslednjeg ažuriranja
@@ -21,6 +22,7 @@ export interface Brand {
   isActive: boolean;
   website?: string;
   description?: string;
+  category?: string;
 }
 
 /**

package/src/services/auth/auth.service.ts

@@ -45,7 +45,6 @@ import { FirebaseErrorCode } from '../../errors/firebase.errors';
 import { FirebaseError } from '../../errors/firebase.errors';
 import { BaseService } from '../base.service';
 import { UserService } from '../user/user.service';
-import { throws } from 'assert';
 import {
   ClinicGroup,
   AdminToken,
@@ -639,11 +638,23 @@ export class AuthService extends BaseService {
       }
 
       const firebaseError = error as FirebaseError;
-      if (firebaseError.code === FirebaseErrorCode.USER_NOT_FOUND) {
-        throw AUTH_ERRORS.USER_NOT_FOUND;
+      
+      // Handle specific Firebase errors
+      switch (firebaseError.code) {
+        case FirebaseErrorCode.USER_NOT_FOUND:
+          throw AUTH_ERRORS.USER_NOT_FOUND;
+        case FirebaseErrorCode.INVALID_EMAIL:
+          throw AUTH_ERRORS.INVALID_EMAIL;
+        case FirebaseErrorCode.TOO_MANY_REQUESTS:
+          throw AUTH_ERRORS.TOO_MANY_REQUESTS;
+        case FirebaseErrorCode.NETWORK_ERROR:
+          throw AUTH_ERRORS.NETWORK_ERROR;
+        case FirebaseErrorCode.OPERATION_NOT_ALLOWED:
+          throw AUTH_ERRORS.OPERATION_NOT_ALLOWED;
+        default:
+          // Re-throw unknown errors as-is
+          throw error;
       }
-
-      throw error;
     }
   }
 

package/src/services/patient/patient.service.ts

@@ -86,6 +86,7 @@ import {
   getPatientsByPractitionerUtil,
   getPatientsByPractitionerWithDetailsUtil,
   getPatientsByClinicUtil,
+  getPatientsByClinicWithDetailsUtil,
   createPatientTokenUtil,
   validatePatientTokenUtil,
   markPatientTokenAsUsedUtil,
@@ -763,13 +764,14 @@ export class PatientService extends BaseService {
   }
 
   /**
-   * Gets all patients associated with a specific clinic.
+   * Gets all patients associated with a specific clinic, including sensitive info.
+   * This merges data from PatientProfile and PatientSensitiveInfo subcollection.
    *
    * @param {string} clinicId - ID of the clinic whose patients to retrieve
    * @param {Object} options - Optional parameters for pagination
    * @param {number} options.limit - Maximum number of profiles to return
    * @param {string} options.startAfter - The ID of the document to start after (for pagination)
-   * @returns {Promise<PatientProfile[]>} A promise resolving to an array of patient profiles
+   * @returns {Promise<PatientProfile[]>} A promise resolving to an array of patient profiles with merged sensitive info
    */
   async getPatientsByClinic(
     clinicId: string,
@@ -778,8 +780,8 @@ export class PatientService extends BaseService {
       startAfter?: string;
     },
   ): Promise<PatientProfile[]> {
-    console.log(`[PatientService.getPatientsByClinic] Fetching patients for clinic: ${clinicId}`);
-    return getPatientsByClinicUtil(this.db, clinicId, options);
+    console.log(`[PatientService.getPatientsByClinic] Fetching patients with details for clinic: ${clinicId}`);
+    return getPatientsByClinicWithDetailsUtil(this.db, clinicId, options);
   }
 
   /**

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

@@ -10,7 +10,12 @@ import {
   getDoc,
   QueryConstraint,
 } from "firebase/firestore";
-import { PatientProfile, PATIENTS_COLLECTION } from "../../../types/patient";
+import {
+  PatientProfile,
+  PATIENTS_COLLECTION,
+  PatientSensitiveInfo,
+} from "../../../types/patient";
+import { getSensitiveInfoDocRef } from "./docs.utils";
 
 /**
  * Retrieves all patients associated with a specific clinic with pagination support.
@@ -78,3 +83,75 @@ export const getPatientsByClinicUtil = async (
     );
   }
 };
+
+/**
+ * Retrieves all patients associated with a specific clinic, including their sensitive info.
+ * This merges data from PatientProfile and PatientSensitiveInfo subcollection.
+ *
+ * @param {Firestore} db - Firestore instance
+ * @param {string} clinicId - ID of the clinic whose patients to retrieve
+ * @param {Object} options - Optional parameters for pagination
+ * @param {number} options.limit - Maximum number of profiles to return
+ * @param {string} options.startAfter - The ID of the document to start after (for pagination)
+ * @returns {Promise<PatientProfile[]>} A promise resolving to an array of patient profiles with merged sensitive info
+ */
+export const getPatientsByClinicWithDetailsUtil = async (
+  db: Firestore,
+  clinicId: string,
+  options?: { limit?: number; startAfter?: string }
+): Promise<PatientProfile[]> => {
+  try {
+    console.log(
+      `[getPatientsByClinicWithDetailsUtil] Fetching patients with details for clinic ID: ${clinicId} with options:`,
+      options
+    );
+
+    // First, get all patient profiles for this clinic
+    const patientProfiles = await getPatientsByClinicUtil(db, clinicId, options);
+
+    // Then, fetch sensitive info for each patient and merge it
+    const patientsWithDetails: PatientProfile[] = await Promise.all(
+      patientProfiles.map(async (profile) => {
+        try {
+          const sensitiveInfoDoc = await getDoc(
+            getSensitiveInfoDocRef(db, profile.id)
+          );
+          const sensitiveInfo = sensitiveInfoDoc.exists()
+            ? (sensitiveInfoDoc.data() as PatientSensitiveInfo)
+            : null;
+
+          // Merge sensitive info into profile (sensitive info takes precedence)
+          return {
+            ...profile,
+            // Merge phoneNumber from sensitive info if not in profile
+            phoneNumber: profile.phoneNumber || sensitiveInfo?.phoneNumber || null,
+            // Merge dateOfBirth from sensitive info if not in profile
+            dateOfBirth: profile.dateOfBirth || sensitiveInfo?.dateOfBirth || null,
+          } as PatientProfile;
+        } catch (error) {
+          console.error(
+            `[getPatientsByClinicWithDetailsUtil] Error fetching sensitive info for patient ${profile.id}:`,
+            error
+          );
+          // Return profile without sensitive info in case of error
+          return profile;
+        }
+      })
+    );
+
+    console.log(
+      `[getPatientsByClinicWithDetailsUtil] Found ${patientsWithDetails.length} patients with details for clinic ID: ${clinicId}`
+    );
+    return patientsWithDetails;
+  } catch (error) {
+    console.error(
+      `[getPatientsByClinicWithDetailsUtil] Error fetching patients with details:`,
+      error
+    );
+    throw new Error(
+      `Failed to retrieve patients with details: ${
+        error instanceof Error ? error.message : String(error)
+      }`
+    );
+  }
+};