@blackcode_sa/metaestetics-api 1.11.1 → 1.11.2

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

@@ -14,8 +14,8 @@ import {
 import { Technology, TECHNOLOGIES_COLLECTION } from "../types/technology.types";
 import { Requirement, RequirementType } from "../types/requirement.types";
 import { BlockingCondition } from "../types/static/blocking-condition.types";
-import { ContraindicationDynamic } from "../types/admin-constants.types";
-import { TreatmentBenefitDynamic } from "../types/admin-constants.types";
+import { Contraindication } from "../types/static/contraindication.types";
+import { TreatmentBenefit } from "../types/static/treatment-benefit.types";
 import {
   CertificationLevel,
   CertificationSpecialty,
@@ -346,21 +346,12 @@ export class TechnologyService extends BaseService {
    */
   async addContraindication(
     technologyId: string,
-    contraindication: ContraindicationDynamic
+    contraindication: Contraindication
   ) {
     const docRef = doc(this.getTechnologiesRef(), technologyId);
-    const technology = await this.getById(technologyId);
-    if (!technology) {
-      throw new Error(`Technology with id ${technologyId} not found`);
-    }
-
-    const existingContraindications = technology.contraindications || [];
-    if (existingContraindications.some((c) => c.id === contraindication.id)) {
-      return technology; // Already exists, do nothing
-    }
 
     await updateDoc(docRef, {
-      contraindications: [...existingContraindications, contraindication],
+      contraindications: arrayUnion(contraindication),
       updatedAt: new Date(),
     });
 
@@ -375,62 +366,12 @@ export class TechnologyService extends BaseService {
    */
   async removeContraindication(
     technologyId: string,
-    contraindication: ContraindicationDynamic
+    contraindication: Contraindication
   ) {
     const docRef = doc(this.getTechnologiesRef(), technologyId);
-    const technology = await this.getById(technologyId);
-    if (!technology) {
-      throw new Error(`Technology with id ${technologyId} not found`);
-    }
-
-    const updatedContraindications = (
-      technology.contraindications || []
-    ).filter((c) => c.id !== contraindication.id);
-
-    await updateDoc(docRef, {
-      contraindications: updatedContraindications,
-      updatedAt: new Date(),
-    });
-
-    return this.getById(technologyId);
-  }
-
-  /**
-   * Updates an existing contraindication in a technology's list.
-   * If the contraindication does not exist, it will not be added.
-   * @param technologyId - ID of the technology
-   * @param contraindication - The updated contraindication object
-   * @returns The updated technology
-   */
-  async updateContraindication(
-    technologyId: string,
-    contraindication: ContraindicationDynamic
-  ) {
-    const docRef = doc(this.getTechnologiesRef(), technologyId);
-    const technology = await this.getById(technologyId);
-    if (!technology) {
-      throw new Error(`Technology with id ${technologyId} not found`);
-    }
-
-    const contraindications = technology.contraindications || [];
-    const index = contraindications.findIndex(
-      (c) => c.id === contraindication.id
-    );
-
-    if (index === -1) {
-      // If contraindication doesn't exist, do not update
-      // Consider throwing an error if this is an unexpected state
-      console.warn(
-        `Contraindication with id ${contraindication.id} not found for technology ${technologyId}. No update performed.`
-      );
-      return technology;
-    }
-
-    const updatedContraindications = [...contraindications];
-    updatedContraindications[index] = contraindication;
 
     await updateDoc(docRef, {
-      contraindications: updatedContraindications,
+      contraindications: arrayRemove(contraindication),
       updatedAt: new Date(),
     });
 
@@ -443,20 +384,11 @@ export class TechnologyService extends BaseService {
    * @param benefit - Benefit koji se dodaje
    * @returns Ažurirana tehnologija
    */
-  async addBenefit(technologyId: string, benefit: TreatmentBenefitDynamic) {
+  async addBenefit(technologyId: string, benefit: TreatmentBenefit) {
     const docRef = doc(this.getTechnologiesRef(), technologyId);
-    const technology = await this.getById(technologyId);
-    if (!technology) {
-      throw new Error(`Technology with id ${technologyId} not found`);
-    }
-
-    const existingBenefits = technology.benefits || [];
-    if (existingBenefits.some((b) => b.id === benefit.id)) {
-      return technology; // Already exists, do nothing
-    }
 
     await updateDoc(docRef, {
-      benefits: [...existingBenefits, benefit],
+      benefits: arrayUnion(benefit),
       updatedAt: new Date(),
     });
 
@@ -469,55 +401,11 @@ export class TechnologyService extends BaseService {
    * @param benefit - Benefit koji se uklanja
    * @returns Ažurirana tehnologija
    */
-  async removeBenefit(technologyId: string, benefit: TreatmentBenefitDynamic) {
+  async removeBenefit(technologyId: string, benefit: TreatmentBenefit) {
     const docRef = doc(this.getTechnologiesRef(), technologyId);
-    const technology = await this.getById(technologyId);
-    if (!technology) {
-      throw new Error(`Technology with id ${technologyId} not found`);
-    }
-
-    const updatedBenefits = (technology.benefits || []).filter(
-      (b) => b.id !== benefit.id
-    );
-
-    await updateDoc(docRef, {
-      benefits: updatedBenefits,
-      updatedAt: new Date(),
-    });
-
-    return this.getById(technologyId);
-  }
-
-  /**
-   * Updates an existing benefit in a technology's list.
-   * If the benefit does not exist, it will not be added.
-   * @param technologyId - ID of the technology
-   * @param benefit - The updated benefit object
-   * @returns The updated technology
-   */
-  async updateBenefit(technologyId: string, benefit: TreatmentBenefitDynamic) {
-    const docRef = doc(this.getTechnologiesRef(), technologyId);
-    const technology = await this.getById(technologyId);
-    if (!technology) {
-      throw new Error(`Technology with id ${technologyId} not found`);
-    }
-
-    const benefits = technology.benefits || [];
-    const index = benefits.findIndex((b) => b.id === benefit.id);
-
-    if (index === -1) {
-      // If benefit doesn't exist, do not update
-      console.warn(
-        `Benefit with id ${benefit.id} not found for technology ${technologyId}. No update performed.`
-      );
-      return technology;
-    }
-
-    const updatedBenefits = [...benefits];
-    updatedBenefits[index] = benefit;
 
     await updateDoc(docRef, {
-      benefits: updatedBenefits,
+      benefits: arrayRemove(benefit),
       updatedAt: new Date(),
     });
 

package/src/backoffice/types/index.ts

@@ -6,4 +6,3 @@ export * from "./requirement.types";
 export * from "./subcategory.types";
 export * from "./technology.types";
 export * from "./static";
-export * from "./admin-constants.types";

package/src/backoffice/types/product.types.ts

@@ -1,5 +1,3 @@
-import type { ContraindicationDynamic } from "./admin-constants.types";
-
 /**
  * Product used in procedures
  * Can be consumables, equipment, or any other product needed for performing procedures
@@ -35,7 +33,7 @@ export interface Product {
   dosage?: string;
   composition?: string;
   indications?: string[];
-  contraindications?: ContraindicationDynamic[];
+  contraindications?: string[];
 }
 
 /**

package/src/backoffice/types/technology.types.ts

@@ -1,10 +1,10 @@
 import { Requirement } from "./requirement.types";
 import { BlockingCondition } from "./static/blocking-condition.types";
+import { Contraindication } from "./static/contraindication.types";
+import { TreatmentBenefit } from "./static/treatment-benefit.types";
 import { CertificationRequirement } from "./static/certification.types";
 import { DocumentTemplate } from "../../types/documentation-templates";
 import { ProcedureFamily } from "./static/procedure-family.types";
-import { ContraindicationDynamic } from "./admin-constants.types";
-import { TreatmentBenefitDynamic } from "./admin-constants.types";
 
 /**
  * Reference to a documentation template with metadata
@@ -65,8 +65,8 @@ export interface Technology {
     post: Requirement[];
   };
   blockingConditions: BlockingCondition[];
-  contraindications: ContraindicationDynamic[];
-  benefits: TreatmentBenefitDynamic[];
+  contraindications: Contraindication[];
+  benefits: TreatmentBenefit[];
   certificationRequirement: CertificationRequirement;
   documentationTemplates?: TechnologyDocumentationTemplate[];
   isActive: boolean;

package/src/backoffice/validations/schemas.ts

@@ -1,53 +1,27 @@
 import { z } from "zod";
 import { ProcedureFamily } from "../types/static/procedure-family.types";
 import { BlockingCondition } from "../types/static/blocking-condition.types";
+import { Contraindication } from "../types/static/contraindication.types";
+import { TreatmentBenefit } from "../types/static/treatment-benefit.types";
 import { TimeUnit, RequirementType } from "../types/requirement.types";
 import {
   CertificationLevel,
   CertificationSpecialty,
 } from "../types/static/certification.types";
-
+import {
+  DocumentElementType,
+  HeadingLevel,
+  ListType,
+} from "../types/documentation-templates.types";
 import { documentTemplateSchema } from "../../validations/documentation-templates.schema";
 
-/**
- * Zod validation schema for a single dynamic contraindication.
- * @see ContraindicationDynamic in admin-constants.types.ts
- */
-export const contraindicationDynamicSchema = z.object({
-  id: z
-    .string()
-    .min(1, "Contraindication ID is required")
-    .regex(
-      /^[a-z0-9_]+$/,
-      "ID must be in snake_case (lowercase, numbers, and underscores only)"
-    ),
-  name: z.string().min(1, "Contraindication name is required"),
-  description: z.string().optional(),
-});
-
-/**
- * Zod validation schema for a single dynamic treatment benefit.
- * @see TreatmentBenefitDynamic in admin-constants.types.ts
- */
-export const treatmentBenefitDynamicSchema = z.object({
-  id: z
-    .string()
-    .min(1, "Benefit ID is required")
-    .regex(
-      /^[a-z0-9_]+$/,
-      "ID must be in snake_case (lowercase, numbers, and underscores only)"
-    ),
-  name: z.string().min(1, "Benefit name is required"),
-  description: z.string().optional(),
-});
-
 /**
  * Base validation schemas for enums
  */
 export const blockingConditionSchemaBackoffice =
   z.nativeEnum(BlockingCondition);
-export const contraindicationSchemaBackoffice = contraindicationDynamicSchema;
-export const treatmentBenefitSchemaBackoffice = treatmentBenefitDynamicSchema;
+export const contraindicationSchemaBackoffice = z.nativeEnum(Contraindication);
+export const treatmentBenefitSchemaBackoffice = z.nativeEnum(TreatmentBenefit);
 export const procedureFamilySchemaBackoffice = z.nativeEnum(ProcedureFamily);
 export const timeUnitSchemaBackoffice = z.nativeEnum(TimeUnit);
 export const requirementTypeSchema = z.nativeEnum(RequirementType);

package/src/services/appointment/appointment.service.ts

@@ -21,15 +21,18 @@ import { BaseService } from "../base.service";
 import {
   Appointment,
   AppointmentStatus,
+  CreateAppointmentData,
   UpdateAppointmentData,
   SearchAppointmentsParams,
   PaymentStatus,
   AppointmentMediaItem,
   PatientReviewInfo,
+  LinkedFormInfo,
   type CreateAppointmentHttpData,
   APPOINTMENTS_COLLECTION,
 } from "../../types/appointment";
 import {
+  createAppointmentSchema,
   updateAppointmentSchema,
   searchAppointmentsSchema,
   rescheduleAppointmentSchema,
@@ -44,6 +47,8 @@ import { FilledDocumentService } from "../documentation-templates/filled-documen
 
 // Import utility functions
 import {
+  fetchAggregatedInfoUtil,
+  createAppointmentUtil,
   updateAppointmentUtil,
   getAppointmentByIdUtil,
   searchAppointmentsUtil,

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

@@ -33,6 +33,7 @@ import {
   PractitionerProfileInfo,
 } from "../../../types/profile";
 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 { PRACTITIONERS_COLLECTION } from "../../../types/practitioner";
 import { CLINICS_COLLECTION } from "../../../types/clinic";
@@ -42,7 +43,6 @@ import {
   Technology,
   TECHNOLOGIES_COLLECTION,
 } from "../../../backoffice/types/technology.types";
-import type { ContraindicationDynamic } from "../../../backoffice";
 
 /**
  * Fetches all the necessary information for an appointment by IDs.
@@ -66,7 +66,7 @@ export async function fetchAggregatedInfoUtil(
   patientInfo: PatientProfileInfo;
   procedureInfo: ProcedureSummaryInfo;
   blockingConditions: BlockingCondition[];
-  contraindications: ContraindicationDynamic[];
+  contraindications: Contraindication[];
   preProcedureRequirements: Requirement[];
   postProcedureRequirements: Requirement[];
 }> {
@@ -162,7 +162,7 @@ export async function fetchAggregatedInfoUtil(
     }
 
     let blockingConditions: BlockingCondition[] = [];
-    let contraindications: ContraindicationDynamic[] = [];
+    let contraindications: Contraindication[] = [];
     let preProcedureRequirements: Requirement[] = [];
     let postProcedureRequirements: Requirement[] = [];
 
@@ -213,85 +213,85 @@ export async function fetchAggregatedInfoUtil(
  * @param generateId Function to generate a unique ID
  * @returns The created Appointment
  */
-// export async function createAppointmentUtil(
-//   db: Firestore,
-//   data: CreateAppointmentData,
-//   aggregatedInfo: {
-//     clinicInfo: ClinicInfo;
-//     practitionerInfo: PractitionerProfileInfo;
-//     patientInfo: PatientProfileInfo;
-//     procedureInfo: ProcedureSummaryInfo;
-//     blockingConditions: BlockingCondition[];
-//     contraindications: ContraindicationDynamic[];
-//     preProcedureRequirements: Requirement[];
-//     postProcedureRequirements: Requirement[];
-//   },
-//   generateId: () => string
-// ): Promise<Appointment> {
-//   try {
-//     const appointmentId = generateId();
-
-//     // Create appointment object
-//     const appointment: Omit<Appointment, "createdAt" | "updatedAt"> & {
-//       createdAt: any;
-//       updatedAt: any;
-//     } = {
-//       id: appointmentId,
-//       calendarEventId: data.calendarEventId,
-//       clinicBranchId: data.clinicBranchId,
-//       clinicInfo: aggregatedInfo.clinicInfo,
-//       practitionerId: data.practitionerId,
-//       practitionerInfo: aggregatedInfo.practitionerInfo,
-//       patientId: data.patientId,
-//       patientInfo: aggregatedInfo.patientInfo,
-//       procedureId: data.procedureId,
-//       procedureInfo: aggregatedInfo.procedureInfo,
-//       status: data.initialStatus,
-//       bookingTime: Timestamp.now(),
-//       appointmentStartTime: data.appointmentStartTime,
-//       appointmentEndTime: data.appointmentEndTime,
-//       patientNotes: data.patientNotes || null,
-//       cost: data.cost,
-//       currency: data.currency,
-//       paymentStatus: data.initialPaymentStatus || PaymentStatus.UNPAID,
-//       blockingConditions: aggregatedInfo.blockingConditions,
-//       contraindications: aggregatedInfo.contraindications,
-//       preProcedureRequirements: aggregatedInfo.preProcedureRequirements,
-//       postProcedureRequirements: aggregatedInfo.postProcedureRequirements,
-//       completedPreRequirements: [],
-//       completedPostRequirements: [],
-//       createdAt: serverTimestamp(),
-//       updatedAt: serverTimestamp(),
-//     };
-
-//     // Add additional fields for confirmation if appointment is already confirmed
-//     if (data.initialStatus === AppointmentStatus.CONFIRMED) {
-//       appointment.confirmationTime = Timestamp.now();
-//     }
-
-//     // Save to Firestore
-//     await setDoc(doc(db, APPOINTMENTS_COLLECTION, appointmentId), appointment);
-
-//     // Update the calendar event with the appointment ID
-//     const calendarEventRef = doc(db, CALENDAR_COLLECTION, data.calendarEventId);
-//     await updateDoc(calendarEventRef, {
-//       appointmentId: appointmentId,
-//       updatedAt: serverTimestamp(),
-//     });
-
-//     // Return the created appointment
-//     // Convert serverTimestamp to regular Timestamp for immediate use
-//     const now = Timestamp.now();
-//     return {
-//       ...appointment,
-//       createdAt: now,
-//       updatedAt: now,
-//     } as Appointment;
-//   } catch (error) {
-//     console.error("Error creating appointment:", error);
-//     throw error;
-//   }
-// }
+export async function createAppointmentUtil(
+  db: Firestore,
+  data: CreateAppointmentData,
+  aggregatedInfo: {
+    clinicInfo: ClinicInfo;
+    practitionerInfo: PractitionerProfileInfo;
+    patientInfo: PatientProfileInfo;
+    procedureInfo: ProcedureSummaryInfo;
+    blockingConditions: BlockingCondition[];
+    contraindications: Contraindication[];
+    preProcedureRequirements: Requirement[];
+    postProcedureRequirements: Requirement[];
+  },
+  generateId: () => string
+): Promise<Appointment> {
+  try {
+    const appointmentId = generateId();
+
+    // Create appointment object
+    const appointment: Omit<Appointment, "createdAt" | "updatedAt"> & {
+      createdAt: any;
+      updatedAt: any;
+    } = {
+      id: appointmentId,
+      calendarEventId: data.calendarEventId,
+      clinicBranchId: data.clinicBranchId,
+      clinicInfo: aggregatedInfo.clinicInfo,
+      practitionerId: data.practitionerId,
+      practitionerInfo: aggregatedInfo.practitionerInfo,
+      patientId: data.patientId,
+      patientInfo: aggregatedInfo.patientInfo,
+      procedureId: data.procedureId,
+      procedureInfo: aggregatedInfo.procedureInfo,
+      status: data.initialStatus,
+      bookingTime: Timestamp.now(),
+      appointmentStartTime: data.appointmentStartTime,
+      appointmentEndTime: data.appointmentEndTime,
+      patientNotes: data.patientNotes || null,
+      cost: data.cost,
+      currency: data.currency,
+      paymentStatus: data.initialPaymentStatus || PaymentStatus.UNPAID,
+      blockingConditions: aggregatedInfo.blockingConditions,
+      contraindications: aggregatedInfo.contraindications,
+      preProcedureRequirements: aggregatedInfo.preProcedureRequirements,
+      postProcedureRequirements: aggregatedInfo.postProcedureRequirements,
+      completedPreRequirements: [],
+      completedPostRequirements: [],
+      createdAt: serverTimestamp(),
+      updatedAt: serverTimestamp(),
+    };
+
+    // Add additional fields for confirmation if appointment is already confirmed
+    if (data.initialStatus === AppointmentStatus.CONFIRMED) {
+      appointment.confirmationTime = Timestamp.now();
+    }
+
+    // Save to Firestore
+    await setDoc(doc(db, APPOINTMENTS_COLLECTION, appointmentId), appointment);
+
+    // Update the calendar event with the appointment ID
+    const calendarEventRef = doc(db, CALENDAR_COLLECTION, data.calendarEventId);
+    await updateDoc(calendarEventRef, {
+      appointmentId: appointmentId,
+      updatedAt: serverTimestamp(),
+    });
+
+    // Return the created appointment
+    // Convert serverTimestamp to regular Timestamp for immediate use
+    const now = Timestamp.now();
+    return {
+      ...appointment,
+      createdAt: now,
+      updatedAt: now,
+    } as Appointment;
+  } catch (error) {
+    console.error("Error creating appointment:", error);
+    throw error;
+  }
+}
 
 /**
  * Updates an existing appointment in Firestore.
@@ -327,27 +327,23 @@ export async function updateAppointmentUtil(
       const validPreReqIds = currentAppointment.preProcedureRequirements.map(
         (req) => req.id
       );
+      const invalidPreReqIds = data.completedPreRequirements.filter(
+        (id) => !validPreReqIds.includes(id)
+      );
 
-      // Only perform validation and merging if the input is an array
-      if (Array.isArray(data.completedPreRequirements)) {
-        const invalidPreReqIds = data.completedPreRequirements.filter(
-          (id) => !validPreReqIds.includes(id)
+      if (invalidPreReqIds.length > 0) {
+        throw new Error(
+          `Invalid pre-requirement IDs: ${invalidPreReqIds.join(", ")}`
         );
-
-        if (invalidPreReqIds.length > 0) {
-          throw new Error(
-            `Invalid pre-requirement IDs: ${invalidPreReqIds.join(", ")}`
-          );
-        }
-
-        // Update the completed pre-requirements
-        completedPreRequirements = [
-          ...new Set([
-            ...completedPreRequirements,
-            ...data.completedPreRequirements,
-          ]),
-        ];
       }
+
+      // Update the completed pre-requirements
+      completedPreRequirements = [
+        ...new Set([
+          ...completedPreRequirements,
+          ...data.completedPreRequirements,
+        ]),
+      ];
     }
 
     if (data.completedPostRequirements) {
@@ -355,37 +351,30 @@ export async function updateAppointmentUtil(
       const validPostReqIds = currentAppointment.postProcedureRequirements.map(
         (req) => req.id
       );
+      const invalidPostReqIds = data.completedPostRequirements.filter(
+        (id) => !validPostReqIds.includes(id)
+      );
 
-      if (Array.isArray(data.completedPostRequirements)) {
-        const invalidPostReqIds = data.completedPostRequirements.filter(
-          (id) => !validPostReqIds.includes(id)
+      if (invalidPostReqIds.length > 0) {
+        throw new Error(
+          `Invalid post-requirement IDs: ${invalidPostReqIds.join(", ")}`
         );
-
-        if (invalidPostReqIds.length > 0) {
-          throw new Error(
-            `Invalid post-requirement IDs: ${invalidPostReqIds.join(", ")}`
-          );
-        }
-
-        // Update the completed post-requirements
-        completedPostRequirements = [
-          ...new Set([
-            ...completedPostRequirements,
-            ...data.completedPostRequirements,
-          ]),
-        ];
       }
+
+      // Update the completed post-requirements
+      completedPostRequirements = [
+        ...new Set([
+          ...completedPostRequirements,
+          ...data.completedPostRequirements,
+        ]),
+      ];
     }
 
     // Prepare update data
     const updateData: any = {
       ...data,
-      completedPreRequirements: Array.isArray(data.completedPreRequirements)
-        ? completedPreRequirements
-        : data.completedPreRequirements,
-      completedPostRequirements: Array.isArray(data.completedPostRequirements)
-        ? completedPostRequirements
-        : data.completedPostRequirements,
+      completedPreRequirements,
+      completedPostRequirements,
       updatedAt: serverTimestamp(),
     };
 
@@ -465,7 +454,7 @@ async function updateCalendarEventStatus(
       case AppointmentStatus.CANCELED_CLINIC:
         calendarStatus = "canceled";
         break;
-      case AppointmentStatus.RESCHEDULED_BY_CLINIC:
+      case AppointmentStatus.RESCHEDULED:
         calendarStatus = "rescheduled";
         break;
       case AppointmentStatus.COMPLETED: