@blackcode_sa/metaestetics-api 1.11.3 → 1.12.1

package/src/types/appointment/index.ts

@@ -3,10 +3,9 @@ import { ClinicInfo, PractitionerProfileInfo, PatientProfileInfo } from '../prof
 import { ProcedureSummaryInfo } from '../procedure';
 import { Currency, 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';
 
 /**
@@ -243,7 +242,7 @@ export interface Appointment {
 
   /** Procedure-related conditions and requirements */
   blockingConditions: BlockingCondition[];
-  contraindications: Contraindication[];
+  contraindications: ContraindicationDynamic[];
   preProcedureRequirements: Requirement[];
   postProcedureRequirements: Requirement[];
 

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";

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,26 +1,26 @@
-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";
+import type { ProcedureProduct } from "../../backoffice/types/procedure-product.types";
 
 /**
  * Procedure represents a specific medical procedure that can be performed by a practitioner in a clinic
@@ -45,22 +45,27 @@ export interface Procedure {
   subcategory: Subcategory;
   /** Technology used in this procedure */
   technology: Technology;
-  /** Product used in this procedure */
+  /** Default product used in this procedure */
   product: Product;
-  /** Price of the procedure */
+  /** Default price of the procedure */
   price: number;
   /** Currency for the price */
   currency: Currency;
-  /** How the price is measured (per ml, per zone, etc.) */
+  /** How the price is measured (per ml, per zone, etc.) - for default product*/
   pricingMeasure: PricingMeasure;
   /** Duration of the procedure in minutes */
+  productsMetadata: ProcedureProduct[];
   duration: number;
   /** 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 */
@@ -101,6 +106,13 @@ export interface CreateProcedureData {
   technologyId: string;
   productId: string;
   price: number;
+  productsMetadata: {
+    productId: string;
+    price: number;
+    currency: Currency;
+    pricingMeasure: PricingMeasure;
+    isDefault?: boolean;
+  }[];
   currency: Currency;
   pricingMeasure: PricingMeasure;
   duration: number;
@@ -120,6 +132,13 @@ export interface UpdateProcedureData {
   price?: number;
   currency?: Currency;
   pricingMeasure?: PricingMeasure;
+  productsMetadata?: {
+    productId: string;
+    price: number;
+    currency: Currency;
+    pricingMeasure: PricingMeasure;
+    isDefault?: boolean;
+  }[];
   duration?: number;
   isActive?: boolean;
   practitionerId?: string;

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,

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-product.schema.ts

@@ -0,0 +1,41 @@
+import { z } from "zod";
+import {
+  Currency,
+  PricingMeasure,
+} from "../backoffice/types/static/pricing.types";
+
+/**
+ * Schema for validating procedure product data.
+ * This is used when creating or updating a procedure to validate the products associated with it.
+ */
+export const procedureProductDataSchema = z.object({
+  /**
+   * The ID of the product. Must be a non-empty string.
+   * @validation
+   */
+  productId: z.string().min(1, "Product ID is required"),
+
+  /**
+   * The price of the product. Must be a non-negative number.
+   * @validation
+   */
+  price: z.number().min(0, "Price must be a non-negative number"),
+
+  /**
+   * The currency for the price. Must be one of the values from the Currency enum.
+   * @validation
+   */
+  currency: z.nativeEnum(Currency),
+
+  /**
+   * The pricing measure for the product. Must be one of the values from the PricingMeasure enum.
+   * @validation
+   */
+  pricingMeasure: z.nativeEnum(PricingMeasure),
+
+  /**
+   * Whether this is the default product for the procedure.
+   * @validation
+   */
+  isDefault: z.boolean().optional(),
+});

package/src/validations/procedure.schema.ts

@@ -1,9 +1,45 @@
-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";
+import { procedureProductDataSchema } from "./procedure-product.schema";
+
+/**
+ * Schema for validating stored procedure product data (with full product objects).
+ * This is used when validating complete procedure documents from Firestore.
+ */
+export const storedProcedureProductSchema = z.object({
+  /**
+   * The full product object used in the procedure.
+   */
+  product: z.any(), // We'll validate the full product object separately
+
+  /**
+   * The price of the procedure when using this specific product.
+   */
+  price: z.number().min(0, "Price must be a non-negative number"),
+
+  /**
+   * The currency for the price of this product.
+   */
+  currency: z.nativeEnum(Currency),
+
+  /**
+   * How the price is measured (e.g., per ml, per zone).
+   */
+  pricingMeasure: z.nativeEnum(PricingMeasure),
+
+  /**
+   * Whether this is the default product for the procedure.
+   */
+  isDefault: z.boolean().optional(),
+});
+
 /**
  * Schema for creating a new procedure
  */
@@ -20,6 +56,7 @@ export const createProcedureSchema = z.object({
   price: z.number().min(0),
   currency: z.nativeEnum(Currency),
   pricingMeasure: z.nativeEnum(PricingMeasure),
+  productsMetadata: z.array(procedureProductDataSchema).min(1),
   duration: z.number().min(1).max(480), // Max 8 hours
   practitionerId: z.string().min(1),
   clinicBranchId: z.string().min(1),
@@ -36,6 +73,7 @@ export const updateProcedureSchema = z.object({
   price: z.number().min(0).optional(),
   currency: z.nativeEnum(Currency).optional(),
   pricingMeasure: z.nativeEnum(PricingMeasure).optional(),
+  productsMetadata: z.array(procedureProductDataSchema).min(1).optional(),
   duration: z.number().min(0).optional(),
   isActive: z.boolean().optional(),
   practitionerId: z.string().optional(),
@@ -48,18 +86,31 @@ export const updateProcedureSchema = z.object({
 });
 
 /**
- * Schema for validating a complete procedure object
+ * Schema for validating a complete procedure object (as stored in Firestore)
  */
-export const procedureSchema = createProcedureSchema.extend({
+export const procedureSchema = z.object({
   id: z.string().min(1),
+  name: z.string().min(1).max(200),
   nameLower: z.string().min(1).max(200),
+  description: z.string().min(1).max(2000),
+  family: z.nativeEnum(ProcedureFamily),
   category: z.any(), // We'll validate the full category object separately
   subcategory: z.any(), // We'll validate the full subcategory object separately
   technology: z.any(), // We'll validate the full technology object separately
   product: z.any(), // We'll validate the full product object separately
+  productsMetadata: z.array(storedProcedureProductSchema).min(1), // Use stored format schema
+  price: z.number().min(0),
+  currency: z.nativeEnum(Currency),
+  pricingMeasure: z.nativeEnum(PricingMeasure),
+  duration: z.number().min(1).max(480),
+  practitionerId: z.string().min(1),
+  clinicBranchId: z.string().min(1),
+  photos: z.array(z.string()).optional(), // Stored as URL strings
   blockingConditions: z.array(z.any()), // We'll validate blocking conditions separately
   contraindications: z.array(z.any()), // We'll validate contraindications separately
+  contraindicationIds: z.array(z.string()), // Array of IDs for efficient querying
   treatmentBenefits: z.array(z.any()), // We'll validate treatment benefits separately
+  treatmentBenefitIds: z.array(z.string()), // Array of IDs for efficient querying
   preRequirements: z.array(z.any()), // We'll validate requirements separately
   postRequirements: z.array(z.any()), // We'll validate requirements separately
   certificationRequirement: z.any(), // We'll validate certification requirement separately

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();
-    });
-  });
-});