@blackcode_sa/metaestetics-api 1.10.0 → 1.11.1

package/src/types/appointment/index.ts

@@ -10,10 +10,12 @@ import {
   type PricingMeasure,
 } from "../../backoffice/types/static/pricing.types";
 import { BlockingCondition } from "../../backoffice/types/static/blocking-condition.types";
-import { Contraindication } from "../../backoffice/types/static/contraindication.types";
 import { Requirement } from "../../backoffice/types/requirement.types";
 import { FilledDocumentStatus } from "../documentation-templates";
-import type { ProcedureFamily } from "../../backoffice";
+import type {
+  ContraindicationDynamic,
+  ProcedureFamily,
+} from "../../backoffice";
 import type { MediaResource } from "../../services/media/media.service";
 
 /**
@@ -196,6 +198,8 @@ export interface Appointment {
   clinicBranchId: string;
   /** Aggregated clinic information (snapshot) */
   clinicInfo: ClinicInfo;
+  /** IANA timezone of the clinic */
+  clinic_tz: string;
 
   /** ID of the practitioner */
   practitionerId: string;
@@ -243,7 +247,7 @@ export interface Appointment {
 
   /** Procedure-related conditions and requirements */
   blockingConditions: BlockingCondition[];
-  contraindications: Contraindication[];
+  contraindications: ContraindicationDynamic[];
   preProcedureRequirements: Requirement[];
   postProcedureRequirements: Requirement[];
 
@@ -299,6 +303,7 @@ export interface CreateAppointmentData {
   patientNotes?: string | null;
   initialStatus: AppointmentStatus;
   initialPaymentStatus?: PaymentStatus; // Defaults to UNPAID if not provided
+  clinic_tz: string;
 }
 
 /**
@@ -336,6 +341,7 @@ export interface UpdateAppointmentData {
   cost?: number; // If cost is adjusted
   clinicBranchId?: string; // If appointment is moved to another branch (complex scenario)
   practitionerId?: string; // If practitioner is changed
+  clinic_tz?: string;
 
   /** NEW: For updating linked forms - typically managed by dedicated methods */
   linkedFormIds?: string[] | FieldValue;

package/src/types/clinic/index.ts

@@ -1,10 +1,5 @@
 import { Timestamp, FieldValue } from "firebase/firestore";
-import type { ProcedureFamily } from "../../backoffice/types/static/procedure-family.types";
-import type { TreatmentBenefit } from "../../backoffice/types/static/treatment-benefit.types";
-import type {
-  Currency,
-  PricingMeasure,
-} from "../../backoffice/types/static/pricing.types";
+
 import type { ClinicInfo } from "../profile";
 import { ClinicReviewInfo } from "../reviews";
 import { ProcedureSummaryInfo } from "../procedure";
@@ -44,6 +39,7 @@ export interface ClinicLocation {
   latitude: number;
   longitude: number;
   geohash?: string | null;
+  tz?: string | null;
 }
 
 /**
@@ -228,6 +224,7 @@ export interface CreateClinicGroupData {
   calendarSyncEnabled?: boolean;
   autoConfirmAppointments?: boolean;
   businessIdentificationNumber?: string | null;
+  tz?: string | null;
   onboarding?: {
     completed?: boolean;
     step?: number;

package/src/types/patient/medical-info.types.ts

@@ -1,7 +1,7 @@
 import { Timestamp } from "firebase/firestore";
 import { BlockingCondition } from "../../backoffice/types/static/blocking-condition.types";
-import { Contraindication } from "../../backoffice/types/static/contraindication.types";
 import { AllergyType, AllergySubtype } from "./allergies";
+import type { ContraindicationDynamic } from "../../backoffice";
 
 export const PATIENT_MEDICAL_INFO_COLLECTION = "medical_info";
 
@@ -38,7 +38,7 @@ export interface PatientMedicalInfo {
   }[];
 
   contraindications: {
-    condition: Contraindication;
+    condition: ContraindicationDynamic;
     lastOccurrence: Timestamp;
     frequency: "rare" | "occasional" | "frequent";
     isActive: boolean;
@@ -113,7 +113,7 @@ export interface UpdateBlockingConditionData
 
 // Interfejsi za kontraindikacije
 export interface AddContraindicationData {
-  condition: Contraindication;
+  condition: ContraindicationDynamic;
   lastOccurrence: Timestamp;
   frequency: "rare" | "occasional" | "frequent";
   isActive: boolean;

package/src/types/procedure/index.ts

@@ -1,25 +1,24 @@
-import { ProcedureFamily } from "../../backoffice/types/static/procedure-family.types";
+import {
+  BlockingCondition,
+  CertificationRequirement,
+  ProcedureFamily,
+} from "../../backoffice/types";
+import {
+  ContraindicationDynamic,
+  TreatmentBenefitDynamic,
+} from "../../backoffice/types/admin-constants.types";
+import { Requirement } from "../../backoffice/types/requirement.types";
 import { Category } from "../../backoffice/types/category.types";
 import { Subcategory } from "../../backoffice/types/subcategory.types";
-import {
-  Technology,
-  type TechnologyDocumentationTemplate,
-} from "../../backoffice/types/technology.types";
+import { Technology } from "../../backoffice/types/technology.types";
 import { Product } from "../../backoffice/types/product.types";
+import { ClinicInfo, DoctorInfo } from "../../types/";
+import { ProcedureReviewInfo } from "../reviews";
+import { TechnologyDocumentationTemplate } from "../../backoffice/types/technology.types";
 import {
   PricingMeasure,
   Currency,
 } from "../../backoffice/types/static/pricing.types";
-import { Requirement } from "../../backoffice/types/requirement.types";
-import { BlockingCondition } from "../../backoffice/types/static/blocking-condition.types";
-import { TreatmentBenefit } from "../../backoffice/types/static/treatment-benefit.types";
-import { CertificationRequirement } from "../../backoffice/types/static/certification.types";
-import { DocumentTemplate } from "../documentation-templates";
-import { ClinicInfo } from "../profile";
-import { DoctorInfo } from "../clinic";
-import { PRACTITIONERS_COLLECTION } from "../practitioner";
-import { ProcedureReviewInfo } from "../reviews";
-import type { Contraindication } from "../../backoffice/types/static/contraindication.types";
 import { MediaResource } from "../../services/media/media.service";
 
 /**
@@ -58,9 +57,13 @@ export interface Procedure {
   /** Blocking conditions that prevent this procedure */
   blockingConditions: BlockingCondition[];
   /** Treatment benefits of this procedure */
-  treatmentBenefits: TreatmentBenefit[];
+  treatmentBenefits: TreatmentBenefitDynamic[];
+  /** A list of just the string IDs of the treatment benefits, for efficient querying. */
+  treatmentBenefitIds: string[];
   /** Contraindications of this procedure */
-  contraindications: Contraindication[];
+  contraindications: ContraindicationDynamic[];
+  /** A list of just the string IDs of the contraindications, for efficient querying. */
+  contraindicationIds: string[];
   /** Pre-procedure requirements */
   preRequirements: Requirement[];
   /** Post-procedure requirements */

package/src/validations/appointment.schema.ts

@@ -248,6 +248,7 @@ export const createAppointmentSchema = z
     initialPaymentStatus: paymentStatusSchema
       .optional()
       .default(PaymentStatus.UNPAID),
+    clinic_tz: z.string().min(1, "Timezone is required"),
   })
   .refine((data) => data.appointmentEndTime > data.appointmentStartTime, {
     message: "Appointment end time must be after start time",
@@ -325,6 +326,7 @@ export const updateAppointmentSchema = z
     cost: z.number().min(0).optional(),
     clinicBranchId: z.string().min(MIN_STRING_LENGTH).optional(),
     practitionerId: z.string().min(MIN_STRING_LENGTH).optional(),
+    clinic_tz: z.string().min(MIN_STRING_LENGTH).optional(),
     linkedForms: z
       .union([z.array(linkedFormInfoSchema).max(MAX_ARRAY_LENGTH), z.any()])
       .optional(),

package/src/validations/clinic.schema.ts

@@ -7,12 +7,7 @@ import {
   PracticeType,
   Language,
 } from "../types/clinic";
-import { ProcedureFamily } from "../backoffice/types/static/procedure-family.types";
-import { TreatmentBenefit } from "../backoffice/types/static/treatment-benefit.types";
-import {
-  Currency,
-  PricingMeasure,
-} from "../backoffice/types/static/pricing.types";
+
 import { clinicReviewInfoSchema } from "./reviews.schema";
 import {
   procedureSummaryInfoSchema,
@@ -42,6 +37,7 @@ export const clinicLocationSchema = z.object({
   latitude: z.number().min(-90).max(90),
   longitude: z.number().min(-180).max(180),
   geohash: z.string().nullable().optional(),
+  tz: z.string().nullable().optional(),
 });
 
 /**
@@ -261,6 +257,7 @@ export const createClinicGroupSchema = z.object({
   calendarSyncEnabled: z.boolean().optional(),
   autoConfirmAppointments: z.boolean().optional(),
   businessIdentificationNumber: z.string().optional().nullable(),
+  tz: z.string().nullable().optional(),
   onboarding: z
     .object({
       completed: z.boolean().optional().default(false),

package/src/validations/patient/medical-info.schema.ts

@@ -7,7 +7,6 @@ import {
   CosmeticAllergySubtype,
 } from "../../types/patient/allergies";
 import { BlockingCondition } from "../../backoffice/types/static/blocking-condition.types";
-import { Contraindication } from "../../backoffice/types/static/contraindication.types";
 import { timestampSchema } from "../common.schema";
 
 export const allergySubtypeSchema = z.union([
@@ -50,8 +49,14 @@ export const blockingConditionSchema = z.object({
   isActive: z.boolean(),
 });
 
+export const contraindicationDynamicSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  description: z.string().optional(),
+});
+
 export const contraindicationSchema = z.object({
-  condition: z.nativeEnum(Contraindication),
+  condition: contraindicationDynamicSchema,
   lastOccurrence: timestampSchema,
   frequency: z.enum(["rare", "occasional", "frequent"]),
   notes: z.string().optional().nullable(),

package/src/validations/procedure.schema.ts

@@ -1,18 +1,16 @@
-import { z } from "zod";
-import { ProcedureFamily } from "../backoffice/types/static/procedure-family.types";
-import {
-  Currency,
-  PricingMeasure,
-} from "../backoffice/types/static/pricing.types";
-import { clinicInfoSchema, doctorInfoSchema } from "./shared.schema";
-import { procedureReviewInfoSchema } from "./reviews.schema";
-import { mediaResourceSchema } from "./media.schema";
+import { z } from 'zod';
+import { ProcedureFamily } from '../backoffice/types/static/procedure-family.types';
+import { Currency, PricingMeasure } from '../backoffice/types/static/pricing.types';
+import { clinicInfoSchema, doctorInfoSchema } from './shared.schema';
+import { procedureReviewInfoSchema } from './reviews.schema';
+import { mediaResourceSchema } from './media.schema';
 /**
  * Schema for creating a new procedure
  */
 export const createProcedureSchema = z.object({
   name: z.string().min(1).max(200),
-  nameLower: z.string().min(1).max(200),
+  // Optional: service will derive from name if not provided by client
+  nameLower: z.string().min(1).max(200).optional(),
   description: z.string().min(1).max(2000),
   family: z.nativeEnum(ProcedureFamily),
   categoryId: z.string().min(1),

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

@@ -1,196 +0,0 @@
-import { BrandService } from "../brand.service";
-import { Brand } from "../../types/brand.types";
-import {
-  collection,
-  doc,
-  getDoc,
-  getDocs,
-  addDoc,
-  updateDoc,
-  query,
-  where,
-} from "firebase/firestore";
-
-// Mock Firebase
-jest.mock("firebase/firestore");
-jest.mock("../../../config/firebase", () => ({
-  getFirebaseInstance: jest.fn().mockResolvedValue({
-    db: {},
-    auth: {},
-  }),
-}));
-
-const COLLECTION = "backoffice_brands";
-
-describe("BrandService", () => {
-  let service: BrandService;
-
-  const mockBrand: Omit<Brand, "id" | "createdAt" | "updatedAt"> = {
-    name: "Test Brand",
-    manufacturer: "Test Manufacturer",
-    website: "https://test.com",
-    description: "Test Description",
-    isActive: true,
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    service = new BrandService();
-  });
-
-  describe("create", () => {
-    it("treba da kreira novi brend sa ispravnim podacima", async () => {
-      const mockDocRef = { id: "test-id" };
-      (collection as jest.Mock).mockReturnValue("brands-collection");
-      (addDoc as jest.Mock).mockResolvedValue(mockDocRef);
-
-      const result = await service.create(mockBrand);
-
-      expect(collection).toHaveBeenCalledWith({}, COLLECTION);
-      expect(addDoc).toHaveBeenCalledWith(
-        "brands-collection",
-        expect.objectContaining({
-          ...mockBrand,
-          createdAt: expect.any(Date),
-          updatedAt: expect.any(Date),
-        })
-      );
-      expect(result).toEqual({
-        id: "test-id",
-        ...mockBrand,
-        createdAt: expect.any(Date),
-        updatedAt: expect.any(Date),
-      });
-    });
-  });
-
-  describe("getAll", () => {
-    it("treba da vrati sve aktivne brendove", async () => {
-      const mockDocs = [
-        {
-          id: "test-id-1",
-          data: () => ({
-            ...mockBrand,
-            createdAt: new Date(),
-            updatedAt: new Date(),
-          }),
-        },
-        {
-          id: "test-id-2",
-          data: () => ({
-            ...mockBrand,
-            name: "Test Brand 2",
-            createdAt: new Date(),
-            updatedAt: new Date(),
-          }),
-        },
-      ];
-
-      (collection as jest.Mock).mockReturnValue("brands-collection");
-      (query as jest.Mock).mockReturnValue("filtered-query");
-      (where as jest.Mock).mockReturnValue("where-clause");
-      (getDocs as jest.Mock).mockResolvedValue({ docs: mockDocs });
-
-      const result = await service.getAll();
-
-      expect(collection).toHaveBeenCalledWith({}, COLLECTION);
-      expect(query).toHaveBeenCalledWith("brands-collection", "where-clause");
-      expect(where).toHaveBeenCalledWith("isActive", "==", true);
-      expect(result).toHaveLength(2);
-      expect(result[0]).toEqual({
-        id: "test-id-1",
-        ...mockBrand,
-        createdAt: expect.any(Date),
-        updatedAt: expect.any(Date),
-      });
-    });
-  });
-
-  describe("update", () => {
-    it("treba da ažurira postojeći brend", async () => {
-      const updateData = { name: "Updated Brand" };
-
-      (collection as jest.Mock).mockReturnValue("brands-collection");
-      (doc as jest.Mock).mockReturnValue("doc-ref");
-      (getDoc as jest.Mock).mockResolvedValue({
-        exists: () => true,
-        id: "test-id",
-        data: () => ({
-          ...mockBrand,
-          ...updateData,
-          createdAt: new Date(),
-          updatedAt: new Date(),
-        }),
-      });
-      (updateDoc as jest.Mock).mockResolvedValue(undefined);
-
-      const result = await service.update("test-id", updateData);
-
-      expect(collection).toHaveBeenCalledWith({}, COLLECTION);
-      expect(doc).toHaveBeenCalledWith("brands-collection", "test-id");
-      expect(updateDoc).toHaveBeenCalledWith(
-        "doc-ref",
-        expect.objectContaining({
-          ...updateData,
-          updatedAt: expect.any(Date),
-        })
-      );
-    });
-  });
-
-  describe("delete", () => {
-    it("treba da izvrši soft delete brenda", async () => {
-      (collection as jest.Mock).mockReturnValue("brands-collection");
-      (doc as jest.Mock).mockReturnValue("doc-ref");
-      (updateDoc as jest.Mock).mockResolvedValue(undefined);
-
-      await service.delete("test-id");
-
-      expect(collection).toHaveBeenCalledWith({}, COLLECTION);
-      expect(doc).toHaveBeenCalledWith("brands-collection", "test-id");
-      expect(updateDoc).toHaveBeenCalledWith("doc-ref", {
-        isActive: false,
-        updatedAt: expect.any(Date),
-      });
-    });
-  });
-
-  describe("getById", () => {
-    it("treba da vrati brend po ID-u", async () => {
-      (collection as jest.Mock).mockReturnValue("brands-collection");
-      (doc as jest.Mock).mockReturnValue("doc-ref");
-      (getDoc as jest.Mock).mockResolvedValue({
-        exists: () => true,
-        id: "test-id",
-        data: () => ({
-          ...mockBrand,
-          createdAt: new Date(),
-          updatedAt: new Date(),
-        }),
-      });
-
-      const result = await service.getById("test-id");
-
-      expect(collection).toHaveBeenCalledWith({}, COLLECTION);
-      expect(doc).toHaveBeenCalledWith("brands-collection", "test-id");
-      expect(result).toEqual({
-        id: "test-id",
-        ...mockBrand,
-        createdAt: expect.any(Date),
-        updatedAt: expect.any(Date),
-      });
-    });
-
-    it("treba da vrati null ako brend ne postoji", async () => {
-      (collection as jest.Mock).mockReturnValue("brands-collection");
-      (doc as jest.Mock).mockReturnValue("doc-ref");
-      (getDoc as jest.Mock).mockResolvedValue({
-        exists: () => false,
-      });
-
-      const result = await service.getById("non-existent-id");
-
-      expect(result).toBeNull();
-    });
-  });
-});

package/src/backoffice/services/__tests__/category.service.test.ts

@@ -1,201 +0,0 @@
-import { CategoryService } from "../category.service";
-import { Category } from "../../types/category.types";
-import { ProcedureFamily } from "../../types/static/procedure-family.types";
-import {
-  collection,
-  doc,
-  getDoc,
-  getDocs,
-  addDoc,
-  updateDoc,
-  query,
-  where,
-} from "firebase/firestore";
-
-// Mock Firebase
-jest.mock("firebase/firestore");
-jest.mock("../../../config/firebase", () => ({
-  getFirebaseInstance: jest.fn().mockResolvedValue({
-    db: {},
-    auth: {},
-  }),
-}));
-
-const COLLECTION = "backoffice_categories";
-
-describe("CategoryService", () => {
-  let service: CategoryService;
-
-  const mockCategory: Omit<Category, "id" | "createdAt" | "updatedAt"> = {
-    name: "Test Category",
-    description: "Test Description",
-    family: ProcedureFamily.AESTHETICS,
-    isActive: true,
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    service = new CategoryService();
-  });
-
-  describe("create", () => {
-    it("treba da kreira novu kategoriju", async () => {
-      const mockDocRef = { id: "test-id" };
-      (collection as jest.Mock).mockReturnValue("categories-collection");
-      (addDoc as jest.Mock).mockResolvedValue(mockDocRef);
-
-      const result = await service.create(mockCategory);
-
-      expect(collection).toHaveBeenCalledWith({}, COLLECTION);
-      expect(addDoc).toHaveBeenCalledWith(
-        "categories-collection",
-        expect.objectContaining({
-          ...mockCategory,
-          createdAt: expect.any(Date),
-          updatedAt: expect.any(Date),
-        })
-      );
-      expect(result).toEqual({
-        id: "test-id",
-        ...mockCategory,
-        createdAt: expect.any(Date),
-        updatedAt: expect.any(Date),
-      });
-    });
-  });
-
-  describe("getAll", () => {
-    it("treba da vrati sve aktivne kategorije", async () => {
-      const mockDocs = [
-        {
-          id: "cat-1",
-          data: () => ({
-            ...mockCategory,
-            createdAt: new Date(),
-            updatedAt: new Date(),
-          }),
-        },
-        {
-          id: "cat-2",
-          data: () => ({
-            ...mockCategory,
-            name: "Test Category 2",
-            createdAt: new Date(),
-            updatedAt: new Date(),
-          }),
-        },
-      ];
-
-      (collection as jest.Mock).mockReturnValue("categories-collection");
-      (query as jest.Mock).mockReturnValue("filtered-query");
-      (where as jest.Mock).mockReturnValue("where-clause");
-      (getDocs as jest.Mock).mockResolvedValue({ docs: mockDocs });
-
-      const results = await service.getAll();
-
-      expect(collection).toHaveBeenCalledWith({}, COLLECTION);
-      expect(query).toHaveBeenCalledWith(
-        "categories-collection",
-        "where-clause"
-      );
-      expect(where).toHaveBeenCalledWith("isActive", "==", true);
-      expect(results).toHaveLength(2);
-      expect(results[0]).toEqual({
-        id: "cat-1",
-        ...mockCategory,
-        createdAt: expect.any(Date),
-        updatedAt: expect.any(Date),
-      });
-    });
-  });
-
-  describe("getAllByFamily", () => {
-    it("treba da vrati sve kategorije za određenu familiju", async () => {
-      const mockDocs = [
-        {
-          id: "cat-1",
-          data: () => ({
-            ...mockCategory,
-            family: ProcedureFamily.AESTHETICS,
-            createdAt: new Date(),
-            updatedAt: new Date(),
-          }),
-        },
-      ];
-
-      (collection as jest.Mock).mockReturnValue("categories-collection");
-      (query as jest.Mock).mockReturnValue("filtered-query");
-      (where as jest.Mock).mockReturnValue("where-clause");
-      (getDocs as jest.Mock).mockResolvedValue({ docs: mockDocs });
-
-      const results = await service.getAllByFamily(ProcedureFamily.AESTHETICS);
-
-      expect(query).toHaveBeenCalledWith(
-        "categories-collection",
-        "where-clause",
-        "where-clause"
-      );
-      expect(where).toHaveBeenCalledWith(
-        "family",
-        "==",
-        ProcedureFamily.AESTHETICS
-      );
-      expect(where).toHaveBeenCalledWith("isActive", "==", true);
-      expect(results).toHaveLength(1);
-      expect(results[0].family).toBe(ProcedureFamily.AESTHETICS);
-    });
-  });
-
-  describe("update", () => {
-    it("treba da ažurira postojeću kategoriju", async () => {
-      const updateData = { name: "Updated Category" };
-
-      (collection as jest.Mock).mockReturnValue("categories-collection");
-      (doc as jest.Mock).mockReturnValue("doc-ref");
-      (updateDoc as jest.Mock).mockResolvedValue(undefined);
-      (getDoc as jest.Mock).mockResolvedValue({
-        exists: () => true,
-        id: "test-id",
-        data: () => ({
-          ...mockCategory,
-          ...updateData,
-          createdAt: new Date(),
-          updatedAt: new Date(),
-        }),
-      });
-
-      const result = await service.update("test-id", updateData);
-
-      expect(collection).toHaveBeenCalledWith({}, COLLECTION);
-      expect(doc).toHaveBeenCalledWith("categories-collection", "test-id");
-      expect(updateDoc).toHaveBeenCalledWith("doc-ref", {
-        ...updateData,
-        updatedAt: expect.any(Date),
-      });
-      expect(result).toEqual({
-        id: "test-id",
-        ...mockCategory,
-        ...updateData,
-        createdAt: expect.any(Date),
-        updatedAt: expect.any(Date),
-      });
-    });
-  });
-
-  describe("delete", () => {
-    it("treba da izvrši soft delete kategorije", async () => {
-      (collection as jest.Mock).mockReturnValue("categories-collection");
-      (doc as jest.Mock).mockReturnValue("doc-ref");
-      (updateDoc as jest.Mock).mockResolvedValue(undefined);
-
-      await service.delete("test-id");
-
-      expect(collection).toHaveBeenCalledWith({}, COLLECTION);
-      expect(doc).toHaveBeenCalledWith("categories-collection", "test-id");
-      expect(updateDoc).toHaveBeenCalledWith("doc-ref", {
-        isActive: false,
-        updatedAt: expect.any(Date),
-      });
-    });
-  });
-});