@blackcode_sa/metaestetics-api 1.14.78 → 1.15.2

package/package.json

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

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

@@ -13,7 +13,7 @@ import {
 } from '../../../types/patient/patient-requirements';
 import {
   Requirement as RequirementTemplate,
-  // REQUIREMENTS_COLLECTION as REQUIREMENTS_TEMPLATES_COLLECTION, // Not used directly after refactor
+  REQUIREMENTS_COLLECTION,
   RequirementType,
   TimeUnit, // Added import
 } from '../../../backoffice/types/requirement.types';
@@ -671,12 +671,17 @@ export class AppointmentAggregationService {
       // Store created instances for fallback direct creation if needed
       let createdInstances = [];
 
+      // Resolve string IDs to full RequirementTemplate objects
+      const resolvedPreRequirements = await this.resolveRequirements(
+        appointment.preProcedureRequirements as any,
+      );
+
       // Log more details about the pre-requirements
       Logger.info(
         `[AggService] Found ${
-          appointment.preProcedureRequirements.length
+          resolvedPreRequirements.length
         } pre-requirements to process: ${JSON.stringify(
-          appointment.preProcedureRequirements.map(r => ({
+          resolvedPreRequirements.map(r => ({
             id: r.id,
             name: r.name,
             type: r.type,
@@ -687,7 +692,7 @@ export class AppointmentAggregationService {
         )}`,
       );
 
-      for (const template of appointment.preProcedureRequirements) {
+      for (const template of resolvedPreRequirements) {
         if (!template) {
           Logger.warn(
             `[AggService] Found null/undefined template in preProcedureRequirements array`,
@@ -933,6 +938,51 @@ export class AppointmentAggregationService {
     }
   }
 
+  /**
+   * Resolves an array of requirement items that may be string IDs or full Requirement objects.
+   * String IDs are batch-fetched from the backoffice_requirements collection.
+   */
+  private async resolveRequirements(
+    items: (string | RequirementTemplate)[],
+  ): Promise<RequirementTemplate[]> {
+    if (items.length === 0) return [];
+
+    const resolved: RequirementTemplate[] = [];
+    const idsToFetch: string[] = [];
+
+    for (const item of items) {
+      if (typeof item === 'string') {
+        idsToFetch.push(item);
+      } else if (item && typeof item === 'object' && item.id) {
+        resolved.push(item);
+      }
+    }
+
+    if (idsToFetch.length > 0) {
+      Logger.info(
+        `[AggService] Resolving ${idsToFetch.length} requirement ID(s) from ${REQUIREMENTS_COLLECTION}`,
+      );
+
+      // Firestore getAll supports up to 500 docs per call
+      const refs = idsToFetch.map(id =>
+        this.db.collection(REQUIREMENTS_COLLECTION).doc(id),
+      );
+      const snapshots = await this.db.getAll(...refs);
+
+      for (const snap of snapshots) {
+        if (snap.exists) {
+          resolved.push({ id: snap.id, ...snap.data() } as RequirementTemplate);
+        } else {
+          Logger.warn(
+            `[AggService] Requirement template '${snap.id}' not found in ${REQUIREMENTS_COLLECTION}`,
+          );
+        }
+      }
+    }
+
+    return resolved;
+  }
+
   /**
    * Fetches post-requirements from a procedure document
    * @param procedureId - The procedure ID to fetch requirements from
@@ -949,12 +999,15 @@ export class AppointmentAggregationService {
       }
 
       const procedure = procedureDoc.data() as Procedure;
-      const postRequirements = procedure.postRequirements || [];
+      const rawPostRequirements = procedure.postRequirements || [];
 
-      if (postRequirements.length === 0) {
+      if (rawPostRequirements.length === 0) {
         return [];
       }
 
+      // Resolve string IDs to full Requirement objects if needed
+      const postRequirements = await this.resolveRequirements(rawPostRequirements as any);
+
       return postRequirements.map(req => ({
         requirement: req,
         sourceProcedures: [

package/src/services/__tests__/auth/auth.mock.test.ts

@@ -1,8 +1,8 @@
-import { setupMocks, mockFirebaseUser } from "./auth.setup";
+import { setupService, mockFirebaseUser } from "./auth.setup";
 
 describe("Firebase Mock Setup", () => {
   beforeEach(() => {
-    setupMocks();
+    setupService();
   });
 
   it("should properly initialize mock Firebase instance", async () => {

package/src/services/__tests__/auth/auth.setup.ts

@@ -288,6 +288,11 @@ export const getMockUser = () => ({
 
 // Setup service
 export const setupService = () => {
-  const service = new AuthService();
+  const service = new AuthService(
+    mockDb as unknown as Firestore,
+    mockAuth as unknown as Auth,
+    {} as FirebaseApp,
+    mockUserService
+  );
   return service;
 };

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

@@ -121,6 +121,10 @@ jest.mock("../../config/firebase", () => ({
 
 import { AuthService } from "../auth/auth.service";
 import { User as FirebaseUser } from "firebase/auth";
+import { Firestore } from "firebase/firestore";
+import { Auth } from "firebase/auth";
+import { FirebaseApp } from "firebase/app";
+import { UserService } from "../user/user.service";
 import { UserRole } from "../../types";
 
 const mockFacebookUser = {
@@ -150,8 +154,10 @@ describe("AuthService", () => {
   let service: AuthService;
 
   beforeEach(async () => {
-    service = new AuthService();
-    await service["initialized"]; // Čekamo da se inicijalizacija završi
+    const mockDb = {} as Firestore;
+    const mockApp = {} as FirebaseApp;
+    const mockUserService = {} as UserService;
+    service = new AuthService(mockDb, mockAuth as unknown as Auth, mockApp, mockUserService);
   });
 
   afterEach(() => {
@@ -243,48 +249,6 @@ describe("AuthService", () => {
     });
   });
 
-  describe("signInWithFacebook", () => {
-    it("should sign in user with Facebook", async () => {
-      const expectedUser = {
-        uid: "facebook-uid",
-        email: "facebook@example.com",
-        roles: [UserRole.PATIENT],
-        isAnonymous: false,
-        createdAt: expect.any(Date),
-        updatedAt: expect.any(Date),
-        lastLoginAt: expect.any(Date),
-        patientProfile: null,
-        practitionerProfile: null,
-        adminProfile: null,
-      };
-
-      const result = await service.signInWithFacebook();
-
-      expect(result).toEqual(expectedUser);
-    });
-  });
-
-  describe("signInWithApple", () => {
-    it("should sign in user with Apple", async () => {
-      const expectedUser = {
-        uid: "apple-uid",
-        email: "apple@example.com",
-        roles: [UserRole.PATIENT],
-        isAnonymous: false,
-        createdAt: expect.any(Date),
-        updatedAt: expect.any(Date),
-        lastLoginAt: expect.any(Date),
-        patientProfile: null,
-        practitionerProfile: null,
-        adminProfile: null,
-      };
-
-      const result = await service.signInWithApple();
-
-      expect(result).toEqual(expectedUser);
-    });
-  });
-
   describe("signInAnonymously", () => {
     it("should sign in user anonymously", async () => {
       const expectedUser = {

package/src/services/__tests__/base.service.test.ts

@@ -1,10 +1,7 @@
 import { BaseService } from "../base.service";
-import { getFirebaseInstance } from "../../config/firebase";
 import { Auth } from "firebase/auth";
 import { Firestore } from "firebase/firestore";
-
-// Mock Firebase config
-jest.mock("../../config/firebase");
+import { FirebaseApp } from "firebase/app";
 
 // Test implementacija BaseService klase
 class TestService extends BaseService {
@@ -16,62 +13,24 @@ class TestService extends BaseService {
   public getAuth(): Auth {
     return this.auth;
   }
-
-  // Expose initialize method for testing
-  public async testEnsureInitialized() {
-    await this.ensureInitialized();
-  }
 }
 
 describe("BaseService", () => {
   let service: TestService;
   const mockDb = {} as Firestore;
   const mockAuth = {} as Auth;
+  const mockApp = {} as FirebaseApp;
 
   beforeEach(() => {
     jest.clearAllMocks();
-    (getFirebaseInstance as jest.Mock).mockResolvedValue({
-      db: mockDb,
-      auth: mockAuth,
-    });
   });
 
   describe("initialization", () => {
-    it("treba da inicijalizuje Firebase servise", async () => {
-      service = new TestService();
-      await service.testEnsureInitialized();
+    it("treba da inicijalizuje Firebase servise", () => {
+      service = new TestService(mockDb, mockAuth, mockApp);
 
-      expect(getFirebaseInstance).toHaveBeenCalled();
       expect(service.getDb()).toBe(mockDb);
       expect(service.getAuth()).toBe(mockAuth);
     });
-
-    it("treba da hendla grešku pri inicijalizaciji", async () => {
-      const mockError = new Error("Firebase init error");
-      (getFirebaseInstance as jest.Mock).mockRejectedValue(mockError);
-
-      service = new TestService();
-
-      await expect(service.testEnsureInitialized()).rejects.toThrow(mockError);
-    });
-
-    it("treba da zadrži grešku inicijalizacije i baca je pri svakom pozivu", async () => {
-      const mockError = new Error("Firebase init error");
-      (getFirebaseInstance as jest.Mock).mockRejectedValue(mockError);
-
-      service = new TestService();
-
-      // Prvi pokušaj
-      await expect(service.testEnsureInitialized()).rejects.toThrow(mockError);
-
-      // Firebase je sada uspešno inicijalizovan
-      (getFirebaseInstance as jest.Mock).mockResolvedValue({
-        db: mockDb,
-        auth: mockAuth,
-      });
-
-      // Ali i dalje treba da dobijemo originalnu grešku
-      await expect(service.testEnsureInitialized()).rejects.toThrow(mockError);
-    });
   });
 });

package/src/services/__tests__/user.service.test.ts

@@ -131,9 +131,11 @@ describe("UserService", () => {
     });
 
     userService = new UserService(
+      mockDb,
       mockAuth,
-      new PatientService(),
-      new ClinicAdminService()
+      {} as any,
+      new PatientService(mockDb, mockAuth, {} as any),
+      new ClinicAdminService(mockDb, mockAuth, {} as any)
     );
   });
 
@@ -460,7 +462,7 @@ describe("UserService", () => {
     });
   });
 
-  describe("removeRole", () => {
+  describe("removeRoleAndProfile", () => {
     it("treba da ukloni ulogu korisniku", async () => {
       const userWithMultipleRoles = {
         ...mockUser,
@@ -487,7 +489,7 @@ describe("UserService", () => {
           data: () => updatedUser,
         });
 
-      await userService.removeRole("test-uid", UserRole.PATIENT);
+      await userService.removeRoleAndProfile("test-uid", UserRole.PATIENT);
 
       // Provera da li je pozvan updateDoc sa ispravnim parametrima
       expect(updateDoc).toHaveBeenCalledWith(

package/src/services/appointment/utils/appointment.utils.ts

@@ -33,9 +33,6 @@ import { PATIENTS_COLLECTION } from '../../../types/patient';
 import { CLINICS_COLLECTION } from '../../../types/clinic';
 import { BlockingCondition } from '../../../backoffice/types/static/blocking-condition.types';
 import { Requirement } from '../../../backoffice/types/requirement.types';
-import { PRACTITIONERS_COLLECTION } from '../../../types/practitioner';
-import { CLINICS_COLLECTION } from '../../../types/clinic';
-import { PATIENTS_COLLECTION } from '../../../types/patient';
 import { PROCEDURES_COLLECTION } from '../../../types/procedure';
 import { Technology, TECHNOLOGIES_COLLECTION } from '../../../backoffice/types/technology.types';
 import type { ContraindicationDynamic } from '../../../backoffice';

package/src/services/appointment/utils/extended-procedure.utils.ts

@@ -4,6 +4,7 @@ import {
   ExtendedProcedureInfo,
   AppointmentProductMetadata,
   APPOINTMENTS_COLLECTION,
+  LinkedFormInfo,
 } from '../../../types/appointment';
 import { getAppointmentOrThrow, initializeMetadata } from './zone-management.utils';
 import { PROCEDURES_COLLECTION } from '../../../types/procedure';

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

@@ -424,7 +424,7 @@ export class AuthServiceV2 extends BaseService {
       >(functions, "createAnonymousPatientProfile");
 
       const result = await createAnonymousPatientProfile({});
-      return result.data.user;
+      return (result.data as any).user;
     }
   }
 
@@ -450,7 +450,7 @@ export class AuthServiceV2 extends BaseService {
       );
 
       const result = await createAnonymousPatientProfile({});
-      return result.data.user;
+      return (result.data as any).user;
     }
   }
 
@@ -468,7 +468,7 @@ export class AuthServiceV2 extends BaseService {
     );
 
     const result = await createAnonymousPatientProfile({});
-    return result.data.user;
+    return (result.data as any).user;
   }
 
   /**
@@ -545,7 +545,7 @@ export class AuthServiceV2 extends BaseService {
         },
       });
 
-      return result.data.user;
+      return (result.data as any).user;
     } catch (error) {
       if (error instanceof z.ZodError) {
         throw AUTH_ERRORS.VALIDATION_ERROR;
@@ -598,7 +598,7 @@ export class AuthServiceV2 extends BaseService {
         },
       });
 
-      return result.data.user;
+      return (result.data as any).user;
     } catch (error: unknown) {
       const firebaseError = error as FirebaseError;
       if (firebaseError.code === FirebaseErrorCode.POPUP_CLOSED_BY_USER) {
@@ -645,7 +645,7 @@ export class AuthServiceV2 extends BaseService {
         },
       });
 
-      return result.data.user;
+      return (result.data as any).user;
     } catch (error: unknown) {
       const firebaseError = error as FirebaseError;
       if (firebaseError.code === FirebaseErrorCode.POPUP_CLOSED_BY_USER) {
@@ -693,7 +693,7 @@ export class AuthServiceV2 extends BaseService {
         },
       });
 
-      return result.data.user;
+      return (result.data as any).user;
     } catch (error: unknown) {
       const firebaseError = error as FirebaseError;
       if (firebaseError.code === FirebaseErrorCode.POPUP_CLOSED_BY_USER) {

package/src/services/clinic/__tests__/clinic-admin.service.test.ts

@@ -14,7 +14,7 @@ import {
 import {
   CreateClinicAdminData,
   ClinicAdmin,
-} from "../../../types/clinic-admin";
+} from "../../../types/clinic";
 import { CLINIC_ADMIN_ERRORS } from "../../../errors/clinic.errors";
 
 // Mock Firebase
@@ -30,6 +30,7 @@ describe("ClinicAdminService", () => {
     clinicGroupId: "test-group-id",
     isGroupOwner: false,
     clinicsManaged: ["clinic-1", "clinic-2"],
+    clinicsManagedInfo: [],
     contactInfo: {
       firstName: "John",
       lastName: "Doe",
@@ -39,8 +40,8 @@ describe("ClinicAdminService", () => {
     },
     roleTitle: "Clinic Administrator",
     isActive: true,
-    createdAt: mockTimestamp.now().toDate(),
-    updatedAt: mockTimestamp.now().toDate(),
+    createdAt: mockTimestamp.now(),
+    updatedAt: mockTimestamp.now(),
   };
 
   beforeEach(() => {
@@ -53,7 +54,11 @@ describe("ClinicAdminService", () => {
       analytics: null,
     });
 
-    clinicAdminService = new ClinicAdminService();
+    clinicAdminService = new ClinicAdminService(
+      {} as any,
+      {} as any,
+      {} as any
+    );
 
     // Mock Firestore functions
     (doc as jest.Mock).mockReturnValue("doc-ref");
@@ -218,41 +223,15 @@ describe("ClinicAdminService", () => {
     });
   });
 
-  describe("setActive", () => {
-    it("treba da aktivira/deaktivira clinic admina", async () => {
-      await clinicAdminService.setActive(mockClinicAdmin.id, false);
-
-      expect(updateDoc).toHaveBeenCalled();
-      expect(updateDoc).toHaveBeenCalledWith(
-        "doc-ref",
-        expect.objectContaining({
-          isActive: false,
-          updatedAt: expect.any(Date),
-        })
-      );
-    });
-
-    it("treba da baci grešku ako admin ne postoji", async () => {
-      (getDoc as jest.Mock).mockResolvedValueOnce({
-        exists: () => false,
-      });
-
-      await expect(
-        clinicAdminService.setActive("non-existent", false)
-      ).rejects.toThrow(CLINIC_ADMIN_ERRORS.NOT_FOUND);
-    });
-  });
-
   describe("addClinicToManaged", () => {
     it("treba da doda kliniku admin-u", async () => {
       const clinicId = "new-clinic-id";
-      const result = await clinicAdminService.addClinicToManaged(
+      await clinicAdminService.addClinicToManaged(
         mockClinicAdmin.id,
         clinicId
       );
 
       expect(updateDoc).toHaveBeenCalled();
-      expect(result.clinicsManaged).toContain(clinicId);
     });
 
     it("treba da baci grešku ako klinika već postoji", async () => {
@@ -267,13 +246,12 @@ describe("ClinicAdminService", () => {
   describe("removeClinicFromManaged", () => {
     it("treba da ukloni kliniku iz admin-a", async () => {
       const clinicId = mockClinicAdmin.clinicsManaged[0];
-      const result = await clinicAdminService.removeClinicFromManaged(
+      await clinicAdminService.removeClinicFromManaged(
         mockClinicAdmin.id,
         clinicId
       );
 
       expect(updateDoc).toHaveBeenCalled();
-      expect(result.clinicsManaged).not.toContain(clinicId);
     });
 
     it("treba da baci grešku ako klinika ne postoji", async () => {