@blackcode_sa/metaestetics-api 1.6.3 → 1.6.5

package/dist/index.mjs

@@ -1,17 +1,18 @@
 // src/validations/appointment.schema.ts
-import { z } from "zod";
+import { z as z2 } from "zod";
 
 // src/types/appointment/index.ts
 var AppointmentStatus = /* @__PURE__ */ ((AppointmentStatus2) => {
-  AppointmentStatus2["SCHEDULED"] = "scheduled";
+  AppointmentStatus2["PENDING"] = "pending";
   AppointmentStatus2["CONFIRMED"] = "confirmed";
   AppointmentStatus2["CHECKED_IN"] = "checked_in";
   AppointmentStatus2["IN_PROGRESS"] = "in_progress";
   AppointmentStatus2["COMPLETED"] = "completed";
   AppointmentStatus2["CANCELED_PATIENT"] = "canceled_patient";
+  AppointmentStatus2["CANCELED_PATIENT_RESCHEDULED"] = "canceled_patient_rescheduled";
   AppointmentStatus2["CANCELED_CLINIC"] = "canceled_clinic";
   AppointmentStatus2["NO_SHOW"] = "no_show";
-  AppointmentStatus2["RESCHEDULED"] = "rescheduled";
+  AppointmentStatus2["RESCHEDULED_BY_CLINIC"] = "rescheduled_by_clinic";
   return AppointmentStatus2;
 })(AppointmentStatus || {});
 var PaymentStatus = /* @__PURE__ */ ((PaymentStatus3) => {
@@ -22,82 +23,444 @@ var PaymentStatus = /* @__PURE__ */ ((PaymentStatus3) => {
   PaymentStatus3["NOT_APPLICABLE"] = "not_applicable";
   return PaymentStatus3;
 })(PaymentStatus || {});
+var MediaType = /* @__PURE__ */ ((MediaType2) => {
+  MediaType2["BEFORE_PHOTO"] = "before_photo";
+  MediaType2["AFTER_PHOTO"] = "after_photo";
+  MediaType2["CONSENT_SCAN"] = "consent_scan";
+  MediaType2["OTHER_DOCUMENT"] = "other_document";
+  return MediaType2;
+})(MediaType || {});
 var APPOINTMENTS_COLLECTION = "appointments";
 
+// src/validations/documentation-templates/template.schema.ts
+import { z } from "zod";
+
+// src/types/documentation-templates/index.ts
+var DOCUMENTATION_TEMPLATES_COLLECTION = "documentation-templates";
+var FILLED_DOCUMENTS_COLLECTION = "filled-documents";
+var USER_FORMS_SUBCOLLECTION = "user-forms";
+var DOCTOR_FORMS_SUBCOLLECTION = "doctor-forms";
+var DocumentElementType = /* @__PURE__ */ ((DocumentElementType2) => {
+  DocumentElementType2["HEADING"] = "heading";
+  DocumentElementType2["PARAGRAPH"] = "paragraph";
+  DocumentElementType2["LIST"] = "list";
+  DocumentElementType2["DYNAMIC_TEXT"] = "dynamic_text";
+  DocumentElementType2["BINARY_CHOICE"] = "binary_choice";
+  DocumentElementType2["MULTIPLE_CHOICE"] = "multiple_choice";
+  DocumentElementType2["SINGLE_CHOICE"] = "single_choice";
+  DocumentElementType2["RATING_SCALE"] = "rating_scale";
+  DocumentElementType2["TEXT_INPUT"] = "text_input";
+  DocumentElementType2["DATE_PICKER"] = "date_picker";
+  DocumentElementType2["SIGNATURE"] = "signature";
+  DocumentElementType2["DITIGAL_SIGNATURE"] = "digital_signature";
+  DocumentElementType2["FILE_UPLOAD"] = "file_upload";
+  return DocumentElementType2;
+})(DocumentElementType || {});
+var ListType = /* @__PURE__ */ ((ListType2) => {
+  ListType2["ORDERED"] = "ordered";
+  ListType2["UNORDERED"] = "unordered";
+  return ListType2;
+})(ListType || {});
+var HeadingLevel = /* @__PURE__ */ ((HeadingLevel2) => {
+  HeadingLevel2["H1"] = "h1";
+  HeadingLevel2["H2"] = "h2";
+  HeadingLevel2["H3"] = "h3";
+  HeadingLevel2["H4"] = "h4";
+  HeadingLevel2["H5"] = "h5";
+  HeadingLevel2["H6"] = "h6";
+  return HeadingLevel2;
+})(HeadingLevel || {});
+var DynamicVariable = /* @__PURE__ */ ((DynamicVariable2) => {
+  DynamicVariable2["PATIENT_NAME"] = "[PATIENT_NAME]";
+  DynamicVariable2["DOCTOR_NAME"] = "[DOCTOR_NAME]";
+  DynamicVariable2["CLINIC_NAME"] = "[CLINIC_NAME]";
+  DynamicVariable2["PATIENT_BIRTHDAY"] = "[PATIENT_BIRTHDAY]";
+  DynamicVariable2["APPOINTMENT_DATE"] = "[APPOINTMENT_DATE]";
+  DynamicVariable2["CURRENT_DATE"] = "[CURRENT_DATE]";
+  DynamicVariable2["PROCEDURE_NAME"] = "[PROCEDURE_NAME]";
+  DynamicVariable2["PROCEDURE_DESCRIPTION"] = "[PROCEDURE_DESCRIPTION]";
+  DynamicVariable2["PROCEDURE_COST"] = "[PROCEDURE_COST]";
+  DynamicVariable2["PROCEDURE_DURATION"] = "[PROCEDURE_DURATION]";
+  DynamicVariable2["PROCEDURE_RISK"] = "[PROCEDURE_RISK]";
+  return DynamicVariable2;
+})(DynamicVariable || {});
+var FilledDocumentStatus = /* @__PURE__ */ ((FilledDocumentStatus2) => {
+  FilledDocumentStatus2["DRAFT"] = "draft";
+  FilledDocumentStatus2["SKIPPED"] = "skipped";
+  FilledDocumentStatus2["PENDING"] = "pending";
+  FilledDocumentStatus2["COMPLETED"] = "completed";
+  FilledDocumentStatus2["SIGNED"] = "signed";
+  FilledDocumentStatus2["REJECTED"] = "rejected";
+  return FilledDocumentStatus2;
+})(FilledDocumentStatus || {});
+
+// src/validations/documentation-templates/template.schema.ts
+var baseElementSchema = z.object({
+  id: z.string().optional(),
+  // Make id optional so we can omit it later
+  type: z.nativeEnum(DocumentElementType),
+  required: z.boolean().optional()
+});
+var headingElementSchema = baseElementSchema.extend({
+  type: z.literal("heading" /* HEADING */),
+  text: z.string().min(1).max(200),
+  level: z.nativeEnum(HeadingLevel)
+});
+var paragraphElementSchema = baseElementSchema.extend({
+  type: z.literal("paragraph" /* PARAGRAPH */),
+  text: z.string().min(1).max(5e3)
+});
+var listElementSchema = baseElementSchema.extend({
+  type: z.literal("list" /* LIST */),
+  items: z.array(z.string().min(1).max(500)).min(1).max(100),
+  listType: z.nativeEnum(ListType)
+});
+var dynamicTextElementSchema = baseElementSchema.extend({
+  type: z.literal("dynamic_text" /* DYNAMIC_TEXT */),
+  text: z.string().min(1).max(5e3)
+});
+var binaryChoiceElementSchema = baseElementSchema.extend({
+  type: z.literal("binary_choice" /* BINARY_CHOICE */),
+  question: z.string().min(1).max(500),
+  defaultValue: z.boolean().optional()
+});
+var multipleChoiceElementSchema = baseElementSchema.extend({
+  type: z.literal("multiple_choice" /* MULTIPLE_CHOICE */),
+  question: z.string().min(1).max(500),
+  options: z.array(z.string().min(1).max(200)).min(2).max(50),
+  defaultValues: z.array(z.string()).optional()
+});
+var singleChoiceElementSchema = baseElementSchema.extend({
+  type: z.literal("single_choice" /* SINGLE_CHOICE */),
+  question: z.string().min(1).max(500),
+  options: z.array(z.string().min(1).max(200)).min(2).max(50),
+  defaultValue: z.string().optional()
+});
+var ratingScaleElementSchema = baseElementSchema.extend({
+  type: z.literal("rating_scale" /* RATING_SCALE */),
+  question: z.string().min(1).max(500),
+  min: z.number().int().min(0).max(10),
+  max: z.number().int().min(1).max(10),
+  labels: z.record(z.string()).optional(),
+  defaultValue: z.number().int().optional()
+});
+var textInputElementSchema = baseElementSchema.extend({
+  type: z.literal("text_input" /* TEXT_INPUT */),
+  label: z.string().min(1).max(200),
+  placeholder: z.string().max(200).optional(),
+  multiline: z.boolean().optional(),
+  defaultValue: z.string().optional()
+});
+var datePickerElementSchema = baseElementSchema.extend({
+  type: z.literal("date_picker" /* DATE_PICKER */),
+  label: z.string().min(1).max(200),
+  defaultValue: z.string().optional()
+  // ISO date string
+});
+var signatureElementSchema = baseElementSchema.extend({
+  type: z.literal("signature" /* SIGNATURE */),
+  label: z.string().min(1).max(200)
+});
+var digitalSignatureElementSchema = baseElementSchema.extend({
+  type: z.literal("digital_signature" /* DITIGAL_SIGNATURE */),
+  // Matching your type enum
+  label: z.string().min(1).max(200)
+});
+var fileUploadElementSchema = baseElementSchema.extend({
+  type: z.literal("file_upload" /* FILE_UPLOAD */),
+  label: z.string().min(1).max(200),
+  allowedFileTypes: z.array(z.string()).optional(),
+  maxFileSizeMB: z.number().positive().optional()
+});
+var documentElementSchema = z.discriminatedUnion("type", [
+  headingElementSchema,
+  paragraphElementSchema,
+  listElementSchema,
+  dynamicTextElementSchema,
+  binaryChoiceElementSchema,
+  multipleChoiceElementSchema,
+  singleChoiceElementSchema,
+  ratingScaleElementSchema,
+  textInputElementSchema,
+  datePickerElementSchema,
+  signatureElementSchema,
+  digitalSignatureElementSchema,
+  fileUploadElementSchema
+]);
+var documentElementWithoutIdSchema = z.discriminatedUnion("type", [
+  headingElementSchema.omit({ id: true }),
+  paragraphElementSchema.omit({ id: true }),
+  listElementSchema.omit({ id: true }),
+  dynamicTextElementSchema.omit({ id: true }),
+  binaryChoiceElementSchema.omit({ id: true }),
+  multipleChoiceElementSchema.omit({ id: true }),
+  singleChoiceElementSchema.omit({ id: true }),
+  ratingScaleElementSchema.omit({ id: true }),
+  textInputElementSchema.omit({ id: true }),
+  datePickerElementSchema.omit({ id: true }),
+  signatureElementSchema.omit({ id: true }),
+  digitalSignatureElementSchema.omit({ id: true }),
+  fileUploadElementSchema.omit({ id: true })
+]);
+var createDocumentTemplateSchema = z.object({
+  title: z.string().min(1).max(200),
+  description: z.string().max(1e3).optional(),
+  elements: z.array(documentElementWithoutIdSchema).min(1).max(100),
+  tags: z.array(z.string().min(1).max(50)).max(20).optional(),
+  isUserForm: z.boolean().optional().default(false),
+  isRequired: z.boolean().optional().default(false),
+  sortingOrder: z.number().int().optional().default(0)
+});
+var updateDocumentTemplateSchema = z.object({
+  title: z.string().min(1).max(200).optional(),
+  description: z.string().max(1e3).optional(),
+  elements: z.array(documentElementWithoutIdSchema).min(1).max(100).optional(),
+  tags: z.array(z.string().min(1).max(50)).max(20).optional(),
+  isActive: z.boolean().optional(),
+  isUserForm: z.boolean().optional(),
+  isRequired: z.boolean().optional(),
+  sortingOrder: z.number().int().optional()
+});
+var documentTemplateSchema = z.object({
+  id: z.string(),
+  title: z.string().min(1).max(200),
+  description: z.string().max(1e3).optional(),
+  createdAt: z.number(),
+  updatedAt: z.number(),
+  createdBy: z.string(),
+  elements: z.array(documentElementSchema),
+  tags: z.array(z.string().min(1).max(50)).max(20).optional(),
+  version: z.number().int().positive(),
+  isActive: z.boolean(),
+  isUserForm: z.boolean().optional().default(false),
+  isRequired: z.boolean().optional().default(false),
+  sortingOrder: z.number().int().optional().default(0)
+});
+var filledDocumentStatusSchema = z.nativeEnum(FilledDocumentStatus);
+var filledDocumentSchema = z.object({
+  id: z.string(),
+  templateId: z.string(),
+  templateVersion: z.number(),
+  isUserForm: z.boolean(),
+  procedureId: z.string(),
+  appointmentId: z.string(),
+  patientId: z.string(),
+  practitionerId: z.string(),
+  clinicId: z.string(),
+  createdAt: z.number(),
+  updatedAt: z.number(),
+  values: z.record(z.string(), z.any()),
+  status: filledDocumentStatusSchema
+});
+var createFilledDocumentDataSchema = z.object({
+  templateId: z.string(),
+  procedureId: z.string(),
+  appointmentId: z.string(),
+  patientId: z.string(),
+  practitionerId: z.string(),
+  clinicId: z.string(),
+  values: z.record(z.string(), z.any()).optional().default({}),
+  status: filledDocumentStatusSchema.optional().default("draft" /* DRAFT */)
+});
+var updateFilledDocumentDataSchema = z.object({
+  values: z.record(z.string(), z.any()).optional(),
+  status: filledDocumentStatusSchema.optional()
+});
+
 // src/validations/appointment.schema.ts
-var createAppointmentSchema = z.object({
-  calendarEventId: z.string().min(1, "Calendar event ID is required"),
-  clinicBranchId: z.string().min(1, "Clinic branch ID is required"),
-  practitionerId: z.string().min(1, "Practitioner ID is required"),
-  patientId: z.string().min(1, "Patient ID is required"),
-  procedureId: z.string().min(1, "Procedure ID is required"),
-  appointmentStartTime: z.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0,
-    "Appointment start time must be a valid timestamp"
+var MIN_STRING_LENGTH = 1;
+var MAX_STRING_LENGTH = 1024;
+var MAX_STRING_LENGTH_LONG = 4096;
+var MAX_ARRAY_LENGTH = 100;
+var appointmentStatusSchema = z2.nativeEnum(AppointmentStatus);
+var paymentStatusSchema = z2.nativeEnum(PaymentStatus);
+var mediaTypeSchema = z2.nativeEnum(MediaType);
+var appointmentMediaItemSchema = z2.object({
+  id: z2.string().min(MIN_STRING_LENGTH, "Media item ID is required"),
+  type: mediaTypeSchema,
+  url: z2.string().url("Media URL must be a valid URL"),
+  fileName: z2.string().optional(),
+  uploadedAt: z2.any().refine(
+    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "uploadedAt must be a valid timestamp or Date object"
+  ),
+  uploadedBy: z2.string().min(MIN_STRING_LENGTH, "Uploaded by user ID is required"),
+  description: z2.string().max(MAX_STRING_LENGTH, "Description too long").optional()
+});
+var procedureExtendedInfoSchema = z2.object({
+  id: z2.string().min(MIN_STRING_LENGTH),
+  name: z2.string().min(MIN_STRING_LENGTH),
+  description: z2.string(),
+  cost: z2.number().min(0),
+  duration: z2.number().min(0),
+  procedureFamily: z2.any(),
+  procedureCategoryId: z2.string(),
+  procedureCategoryName: z2.string(),
+  procedureSubCategoryId: z2.string(),
+  procedureSubCategoryName: z2.string(),
+  procedureTechnologyId: z2.string(),
+  procedureTechnologyName: z2.string(),
+  procedureProductBrandId: z2.string(),
+  procedureProductBrandName: z2.string(),
+  procedureProductId: z2.string(),
+  procedureProductName: z2.string()
+});
+var linkedFormInfoSchema = z2.object({
+  formId: z2.string().min(MIN_STRING_LENGTH, "Form ID is required"),
+  templateId: z2.string().min(MIN_STRING_LENGTH, "Template ID is required"),
+  templateVersion: z2.number().int().positive("Template version must be a positive integer"),
+  title: z2.string().min(MIN_STRING_LENGTH, "Form title is required"),
+  isUserForm: z2.boolean(),
+  status: filledDocumentStatusSchema,
+  path: z2.string().min(MIN_STRING_LENGTH, "Form path is required"),
+  submittedAt: z2.any().refine(
+    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "submittedAt must be a valid timestamp or Date object"
+  ).optional(),
+  completedAt: z2.any().refine(
+    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "completedAt must be a valid timestamp or Date object"
+  ).optional()
+});
+var patientReviewInfoSchema = z2.object({
+  reviewId: z2.string().min(MIN_STRING_LENGTH, "Review ID is required"),
+  rating: z2.number().min(1).max(5, "Rating must be between 1 and 5"),
+  comment: z2.string().max(MAX_STRING_LENGTH_LONG, "Comment too long").optional(),
+  reviewedAt: z2.any().refine(
+    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "reviewedAt must be a valid timestamp or Date object"
+  )
+});
+var finalizedDetailsSchema = z2.object({
+  by: z2.string().min(MIN_STRING_LENGTH, "Finalized by user ID is required"),
+  at: z2.any().refine(
+    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "Finalized at must be a valid timestamp or Date object"
+  ),
+  notes: z2.string().max(MAX_STRING_LENGTH_LONG, "Finalization notes too long").optional()
+});
+var createAppointmentSchema = z2.object({
+  clinicBranchId: z2.string().min(MIN_STRING_LENGTH, "Clinic branch ID is required"),
+  practitionerId: z2.string().min(MIN_STRING_LENGTH, "Practitioner ID is required"),
+  patientId: z2.string().min(MIN_STRING_LENGTH, "Patient ID is required"),
+  procedureId: z2.string().min(MIN_STRING_LENGTH, "Procedure ID is required"),
+  appointmentStartTime: z2.any().refine(
+    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "Appointment start time must be a valid timestamp or Date object"
   ),
-  appointmentEndTime: z.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0,
-    "Appointment end time must be a valid timestamp"
+  appointmentEndTime: z2.any().refine(
+    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "Appointment end time must be a valid timestamp or Date object"
   ),
-  cost: z.number().min(0, "Cost must be a non-negative number"),
-  currency: z.string().min(1, "Currency is required"),
-  patientNotes: z.string().nullable().optional(),
-  initialStatus: z.nativeEnum(AppointmentStatus, {
-    errorMap: () => ({ message: "Invalid appointment status" })
-  }),
-  initialPaymentStatus: z.nativeEnum(PaymentStatus, {
-    errorMap: () => ({ message: "Invalid payment status" })
-  }).optional().default("unpaid" /* UNPAID */)
+  cost: z2.number().min(0, "Cost must be a non-negative number"),
+  currency: z2.string().min(1, "Currency is required"),
+  patientNotes: z2.string().max(MAX_STRING_LENGTH, "Patient notes too long").nullable().optional(),
+  initialStatus: appointmentStatusSchema,
+  initialPaymentStatus: paymentStatusSchema.optional().default("unpaid" /* UNPAID */)
+}).refine((data) => data.appointmentEndTime > data.appointmentStartTime, {
+  message: "Appointment end time must be after start time",
+  path: ["appointmentEndTime"]
 });
-var updateAppointmentSchema = z.object({
-  status: z.nativeEnum(AppointmentStatus, {
-    errorMap: () => ({ message: "Invalid appointment status" })
-  }).optional(),
-  confirmationTime: z.any().refine(
-    (val) => val === null || val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0,
-    "Confirmation time must be a valid timestamp or null"
+var updateAppointmentSchema = z2.object({
+  status: appointmentStatusSchema.optional(),
+  confirmationTime: z2.any().optional().nullable(),
+  cancellationTime: z2.any().optional().nullable(),
+  rescheduleTime: z2.any().optional().nullable(),
+  procedureActualStartTime: z2.any().optional().nullable(),
+  actualDurationMinutes: z2.number().int().positive("Duration must be a positive integer").optional(),
+  cancellationReason: z2.string().max(MAX_STRING_LENGTH, "Cancellation reason too long").nullable().optional(),
+  canceledBy: z2.enum(["patient", "clinic", "practitioner", "system"]).optional(),
+  internalNotes: z2.string().max(MAX_STRING_LENGTH_LONG, "Internal notes too long").nullable().optional(),
+  patientNotes: z2.any().optional().nullable(),
+  paymentStatus: paymentStatusSchema.optional(),
+  paymentTransactionId: z2.any().optional().nullable(),
+  completedPreRequirements: z2.union([z2.array(z2.string()), z2.any()]).optional(),
+  completedPostRequirements: z2.union([z2.array(z2.string()), z2.any()]).optional(),
+  linkedFormIds: z2.union([z2.array(z2.string()), z2.any()]).optional(),
+  pendingUserFormsIds: z2.union([z2.array(z2.string()), z2.any()]).optional(),
+  appointmentStartTime: z2.any().refine(
+    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "Appointment start time must be a valid timestamp or Date object"
   ).optional(),
-  actualDurationMinutes: z.number().positive("Duration must be positive").optional(),
-  cancellationReason: z.string().nullable().optional(),
-  canceledBy: z.enum(["patient", "clinic", "practitioner", "system"]).optional(),
-  internalNotes: z.string().nullable().optional(),
-  paymentStatus: z.nativeEnum(PaymentStatus, {
-    errorMap: () => ({ message: "Invalid payment status" })
-  }).optional(),
-  paymentTransactionId: z.string().nullable().optional(),
-  completedPreRequirements: z.array(z.string()).optional(),
-  completedPostRequirements: z.array(z.string()).optional()
+  appointmentEndTime: z2.any().refine(
+    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "Appointment end time must be a valid timestamp or Date object"
+  ).optional(),
+  calendarEventId: z2.string().min(MIN_STRING_LENGTH).optional(),
+  cost: z2.number().min(0).optional(),
+  clinicBranchId: z2.string().min(MIN_STRING_LENGTH).optional(),
+  practitionerId: z2.string().min(MIN_STRING_LENGTH).optional(),
+  linkedForms: z2.union([z2.array(linkedFormInfoSchema).max(MAX_ARRAY_LENGTH), z2.any()]).optional(),
+  media: z2.union([
+    z2.array(appointmentMediaItemSchema).max(MAX_ARRAY_LENGTH),
+    z2.any()
+  ]).optional(),
+  reviewInfo: z2.union([patientReviewInfoSchema.nullable(), z2.any()]).optional(),
+  finalizedDetails: z2.union([finalizedDetailsSchema.nullable(), z2.any()]).optional(),
+  isArchived: z2.boolean().optional(),
+  updatedAt: z2.any().optional()
 }).refine(
   (data) => {
-    if (data.status === "canceled_clinic" /* CANCELED_CLINIC */ || data.status === "canceled_patient" /* CANCELED_PATIENT */) {
+    if (data.status === "canceled_clinic" /* CANCELED_CLINIC */ || data.status === "canceled_patient" /* CANCELED_PATIENT */ || data.status === "canceled_patient_rescheduled" /* CANCELED_PATIENT_RESCHEDULED */) {
       return !!data.cancellationReason && !!data.canceledBy;
     }
     return true;
   },
   {
-    message: "Cancellation reason and canceled by must be provided when canceling an appointment",
+    message: "Cancellation reason and canceled by must be provided when canceling an appointment with patient or clinic origin.",
     path: ["status"]
   }
+).refine(
+  (data) => {
+    if (data.appointmentStartTime && data.appointmentEndTime) {
+      return data.appointmentEndTime > data.appointmentStartTime;
+    }
+    return true;
+  },
+  {
+    message: "Appointment end time must be after start time if both are provided",
+    path: ["appointmentEndTime"]
+  }
 );
-var searchAppointmentsSchema = z.object({
-  patientId: z.string().optional(),
-  practitionerId: z.string().optional(),
-  clinicBranchId: z.string().optional(),
-  startDate: z.date().optional(),
-  endDate: z.date().optional(),
-  status: z.union([
-    z.nativeEnum(AppointmentStatus),
-    z.array(z.nativeEnum(AppointmentStatus))
+var searchAppointmentsSchema = z2.object({
+  patientId: z2.string().optional(),
+  practitionerId: z2.string().optional(),
+  clinicBranchId: z2.string().optional(),
+  startDate: z2.any().refine(
+    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "Start date must be a valid timestamp or Date object"
+  ).optional(),
+  endDate: z2.any().refine(
+    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    "End date must be a valid timestamp or Date object"
+  ).optional(),
+  status: z2.union([
+    appointmentStatusSchema,
+    z2.array(appointmentStatusSchema).nonempty()
   ]).optional(),
-  limit: z.number().positive().optional(),
-  startAfter: z.any().optional()
+  limit: z2.number().positive().int().optional().default(20),
+  startAfter: z2.any().optional()
 }).refine(
   (data) => {
-    return !!(data.patientId || data.practitionerId || data.clinicBranchId);
+    if (!data.startDate && !data.endDate && !data.status) {
+      return !!(data.patientId || data.practitionerId || data.clinicBranchId);
+    }
+    return true;
+  },
+  {
+    message: "At least one of patientId, practitionerId, or clinicBranchId must be provided if no date or status filters are set.",
+    path: ["patientId"]
+  }
+).refine(
+  (data) => {
+    if (data.startDate && data.endDate) {
+      return data.endDate >= data.startDate;
+    }
+    return true;
   },
   {
-    message: "At least one of patientId, practitionerId, or clinicBranchId must be provided",
-    path: ["searchCriteria"]
+    message: "End date must be after or the same as start date",
+    path: ["endDate"]
   }
 );
 
@@ -165,54 +528,6 @@ import {
   getDocs as getDocs13
 } from "firebase/firestore";
 
-// src/types/documentation-templates/index.ts
-var DOCUMENTATION_TEMPLATES_COLLECTION = "documentation-templates";
-var FILLED_DOCUMENTS_COLLECTION = "filled-documents";
-var DocumentElementType = /* @__PURE__ */ ((DocumentElementType2) => {
-  DocumentElementType2["HEADING"] = "heading";
-  DocumentElementType2["PARAGRAPH"] = "paragraph";
-  DocumentElementType2["LIST"] = "list";
-  DocumentElementType2["DYNAMIC_TEXT"] = "dynamic_text";
-  DocumentElementType2["BINARY_CHOICE"] = "binary_choice";
-  DocumentElementType2["MULTIPLE_CHOICE"] = "multiple_choice";
-  DocumentElementType2["SINGLE_CHOICE"] = "single_choice";
-  DocumentElementType2["RATING_SCALE"] = "rating_scale";
-  DocumentElementType2["TEXT_INPUT"] = "text_input";
-  DocumentElementType2["DATE_PICKER"] = "date_picker";
-  DocumentElementType2["SIGNATURE"] = "signature";
-  DocumentElementType2["FILE_UPLOAD"] = "file_upload";
-  return DocumentElementType2;
-})(DocumentElementType || {});
-var ListType = /* @__PURE__ */ ((ListType2) => {
-  ListType2["ORDERED"] = "ordered";
-  ListType2["UNORDERED"] = "unordered";
-  return ListType2;
-})(ListType || {});
-var HeadingLevel = /* @__PURE__ */ ((HeadingLevel2) => {
-  HeadingLevel2["H1"] = "h1";
-  HeadingLevel2["H2"] = "h2";
-  HeadingLevel2["H3"] = "h3";
-  HeadingLevel2["H4"] = "h4";
-  HeadingLevel2["H5"] = "h5";
-  HeadingLevel2["H6"] = "h6";
-  return HeadingLevel2;
-})(HeadingLevel || {});
-var DynamicVariable = /* @__PURE__ */ ((DynamicVariable2) => {
-  DynamicVariable2["PATIENT_NAME"] = "[PATIENT_NAME]";
-  DynamicVariable2["DOCTOR_NAME"] = "[DOCTOR_NAME]";
-  DynamicVariable2["CLINIC_NAME"] = "[CLINIC_NAME]";
-  DynamicVariable2["PATIENT_BIRTHDAY"] = "[PATIENT_BIRTHDAY]";
-  DynamicVariable2["APPOINTMENT_DATE"] = "[APPOINTMENT_DATE]";
-  DynamicVariable2["CURRENT_DATE"] = "[CURRENT_DATE]";
-  return DynamicVariable2;
-})(DynamicVariable || {});
-var FilledDocumentStatus = /* @__PURE__ */ ((FilledDocumentStatus2) => {
-  FilledDocumentStatus2["DRAFT"] = "draft";
-  FilledDocumentStatus2["COMPLETED"] = "completed";
-  FilledDocumentStatus2["SIGNED"] = "signed";
-  return FilledDocumentStatus2;
-})(FilledDocumentStatus || {});
-
 // src/types/calendar/index.ts
 var CalendarEventStatus = /* @__PURE__ */ ((CalendarEventStatus4) => {
   CalendarEventStatus4["PENDING"] = "pending";
@@ -259,136 +574,6 @@ import { z as z19 } from "zod";
 
 // src/validations/schemas.ts
 import { z as z3 } from "zod";
-
-// src/validations/documentation-templates/template.schema.ts
-import { z as z2 } from "zod";
-var baseElementSchema = z2.object({
-  id: z2.string().optional(),
-  // Make id optional so we can omit it later
-  type: z2.nativeEnum(DocumentElementType),
-  required: z2.boolean().optional()
-});
-var headingElementSchema = baseElementSchema.extend({
-  type: z2.literal("heading" /* HEADING */),
-  text: z2.string().min(1).max(200),
-  level: z2.nativeEnum(HeadingLevel)
-});
-var paragraphElementSchema = baseElementSchema.extend({
-  type: z2.literal("paragraph" /* PARAGRAPH */),
-  text: z2.string().min(1).max(5e3)
-});
-var listElementSchema = baseElementSchema.extend({
-  type: z2.literal("list" /* LIST */),
-  items: z2.array(z2.string().min(1).max(500)).min(1).max(100),
-  listType: z2.nativeEnum(ListType)
-});
-var dynamicTextElementSchema = baseElementSchema.extend({
-  type: z2.literal("dynamic_text" /* DYNAMIC_TEXT */),
-  text: z2.string().min(1).max(5e3)
-});
-var binaryChoiceElementSchema = baseElementSchema.extend({
-  type: z2.literal("binary_choice" /* BINARY_CHOICE */),
-  question: z2.string().min(1).max(500),
-  defaultValue: z2.boolean().optional()
-});
-var multipleChoiceElementSchema = baseElementSchema.extend({
-  type: z2.literal("multiple_choice" /* MULTIPLE_CHOICE */),
-  question: z2.string().min(1).max(500),
-  options: z2.array(z2.string().min(1).max(200)).min(2).max(50),
-  defaultValues: z2.array(z2.string()).optional()
-});
-var singleChoiceElementSchema = baseElementSchema.extend({
-  type: z2.literal("single_choice" /* SINGLE_CHOICE */),
-  question: z2.string().min(1).max(500),
-  options: z2.array(z2.string().min(1).max(200)).min(2).max(50),
-  defaultValue: z2.string().optional()
-});
-var ratingScaleElementSchema = baseElementSchema.extend({
-  type: z2.literal("rating_scale" /* RATING_SCALE */),
-  question: z2.string().min(1).max(500),
-  min: z2.number().int().min(0).max(10),
-  max: z2.number().int().min(1).max(10),
-  labels: z2.record(z2.string()).optional(),
-  defaultValue: z2.number().int().optional()
-});
-var textInputElementSchema = baseElementSchema.extend({
-  type: z2.literal("text_input" /* TEXT_INPUT */),
-  label: z2.string().min(1).max(200),
-  placeholder: z2.string().max(200).optional(),
-  multiline: z2.boolean().optional(),
-  defaultValue: z2.string().optional()
-});
-var datePickerElementSchema = baseElementSchema.extend({
-  type: z2.literal("date_picker" /* DATE_PICKER */),
-  label: z2.string().min(1).max(200),
-  defaultValue: z2.string().optional()
-  // ISO date string
-});
-var signatureElementSchema = baseElementSchema.extend({
-  type: z2.literal("signature" /* SIGNATURE */),
-  label: z2.string().min(1).max(200)
-});
-var fileUploadElementSchema = baseElementSchema.extend({
-  type: z2.literal("file_upload" /* FILE_UPLOAD */),
-  label: z2.string().min(1).max(200),
-  allowedFileTypes: z2.array(z2.string()).optional(),
-  maxFileSizeMB: z2.number().positive().optional()
-});
-var documentElementSchema = z2.discriminatedUnion("type", [
-  headingElementSchema,
-  paragraphElementSchema,
-  listElementSchema,
-  dynamicTextElementSchema,
-  binaryChoiceElementSchema,
-  multipleChoiceElementSchema,
-  singleChoiceElementSchema,
-  ratingScaleElementSchema,
-  textInputElementSchema,
-  datePickerElementSchema,
-  signatureElementSchema,
-  fileUploadElementSchema
-]);
-var documentElementWithoutIdSchema = z2.discriminatedUnion("type", [
-  headingElementSchema.omit({ id: true }),
-  paragraphElementSchema.omit({ id: true }),
-  listElementSchema.omit({ id: true }),
-  dynamicTextElementSchema.omit({ id: true }),
-  binaryChoiceElementSchema.omit({ id: true }),
-  multipleChoiceElementSchema.omit({ id: true }),
-  singleChoiceElementSchema.omit({ id: true }),
-  ratingScaleElementSchema.omit({ id: true }),
-  textInputElementSchema.omit({ id: true }),
-  datePickerElementSchema.omit({ id: true }),
-  signatureElementSchema.omit({ id: true }),
-  fileUploadElementSchema.omit({ id: true })
-]);
-var createDocumentTemplateSchema = z2.object({
-  title: z2.string().min(1).max(200),
-  description: z2.string().max(1e3).optional(),
-  elements: z2.array(documentElementWithoutIdSchema).min(1).max(100),
-  tags: z2.array(z2.string().min(1).max(50)).max(20).optional()
-});
-var updateDocumentTemplateSchema = z2.object({
-  title: z2.string().min(1).max(200).optional(),
-  description: z2.string().max(1e3).optional(),
-  elements: z2.array(documentElementWithoutIdSchema).min(1).max(100).optional(),
-  tags: z2.array(z2.string().min(1).max(50)).max(20).optional(),
-  isActive: z2.boolean().optional()
-});
-var documentTemplateSchema = z2.object({
-  id: z2.string(),
-  title: z2.string().min(1).max(200),
-  description: z2.string().max(1e3).optional(),
-  createdAt: z2.number(),
-  updatedAt: z2.number(),
-  createdBy: z2.string(),
-  elements: z2.array(documentElementSchema),
-  tags: z2.array(z2.string().min(1).max(50)).max(20).optional(),
-  version: z2.number().int().positive(),
-  isActive: z2.boolean()
-});
-
-// src/validations/schemas.ts
 var emailSchema = z3.string().email("Invalid email format").min(5, "Email must be at least 5 characters").max(255, "Email must be less than 255 characters");
 var passwordSchema = z3.string().min(8, "Password must be at least 8 characters").max(100, "Password must be less than 100 characters").regex(
   /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d\w\W]{8,}$/,
@@ -1452,9 +1637,9 @@ var addAllergyUtil = async (db, patientId, data, userRef) => {
 var updateAllergyUtil = async (db, patientId, data, userRef) => {
   const validatedData = updateAllergySchema.parse(data);
   const { allergyIndex, ...updateData } = validatedData;
-  const doc32 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc32.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc32.data();
+  const doc33 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc33.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc33.data();
   if (allergyIndex >= medicalInfo.allergies.length) {
     throw new Error("Invalid allergy index");
   }
@@ -1470,9 +1655,9 @@ var updateAllergyUtil = async (db, patientId, data, userRef) => {
   });
 };
 var removeAllergyUtil = async (db, patientId, allergyIndex, userRef) => {
-  const doc32 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc32.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc32.data();
+  const doc33 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc33.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc33.data();
   if (allergyIndex >= medicalInfo.allergies.length) {
     throw new Error("Invalid allergy index");
   }
@@ -1497,9 +1682,9 @@ var addBlockingConditionUtil = async (db, patientId, data, userRef) => {
 var updateBlockingConditionUtil = async (db, patientId, data, userRef) => {
   const validatedData = updateBlockingConditionSchema.parse(data);
   const { conditionIndex, ...updateData } = validatedData;
-  const doc32 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc32.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc32.data();
+  const doc33 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc33.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc33.data();
   if (conditionIndex >= medicalInfo.blockingConditions.length) {
     throw new Error("Invalid blocking condition index");
   }
@@ -1515,9 +1700,9 @@ var updateBlockingConditionUtil = async (db, patientId, data, userRef) => {
   });
 };
 var removeBlockingConditionUtil = async (db, patientId, conditionIndex, userRef) => {
-  const doc32 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc32.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc32.data();
+  const doc33 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc33.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc33.data();
   if (conditionIndex >= medicalInfo.blockingConditions.length) {
     throw new Error("Invalid blocking condition index");
   }
@@ -1542,9 +1727,9 @@ var addContraindicationUtil = async (db, patientId, data, userRef) => {
 var updateContraindicationUtil = async (db, patientId, data, userRef) => {
   const validatedData = updateContraindicationSchema.parse(data);
   const { contraindicationIndex, ...updateData } = validatedData;
-  const doc32 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc32.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc32.data();
+  const doc33 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc33.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc33.data();
   if (contraindicationIndex >= medicalInfo.contraindications.length) {
     throw new Error("Invalid contraindication index");
   }
@@ -1560,9 +1745,9 @@ var updateContraindicationUtil = async (db, patientId, data, userRef) => {
   });
 };
 var removeContraindicationUtil = async (db, patientId, contraindicationIndex, userRef) => {
-  const doc32 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc32.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc32.data();
+  const doc33 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc33.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc33.data();
   if (contraindicationIndex >= medicalInfo.contraindications.length) {
     throw new Error("Invalid contraindication index");
   }
@@ -1587,9 +1772,9 @@ var addMedicationUtil = async (db, patientId, data, userRef) => {
 var updateMedicationUtil = async (db, patientId, data, userRef) => {
   const validatedData = updateMedicationSchema.parse(data);
   const { medicationIndex, ...updateData } = validatedData;
-  const doc32 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc32.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc32.data();
+  const doc33 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc33.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc33.data();
   if (medicationIndex >= medicalInfo.currentMedications.length) {
     throw new Error("Invalid medication index");
   }
@@ -1605,9 +1790,9 @@ var updateMedicationUtil = async (db, patientId, data, userRef) => {
   });
 };
 var removeMedicationUtil = async (db, patientId, medicationIndex, userRef) => {
-  const doc32 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc32.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc32.data();
+  const doc33 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc33.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc33.data();
   if (medicationIndex >= medicalInfo.currentMedications.length) {
     throw new Error("Invalid medication index");
   }
@@ -1885,7 +2070,7 @@ var searchPatientsUtil = async (db, params, requester) => {
   try {
     const finalQuery = query2(patientsCollectionRef, ...constraints);
     const querySnapshot = await getDocs2(finalQuery);
-    const patients = querySnapshot.docs.map((doc32) => doc32.data());
+    const patients = querySnapshot.docs.map((doc33) => doc33.data());
     console.log(`[searchPatientsUtil] Found ${patients.length} patients matching criteria.`);
     return patients;
   } catch (error) {
@@ -1909,8 +2094,8 @@ var getAllPatientsUtil = async (db, options) => {
     }
     const patientsSnapshot = await getDocs2(q);
     const patients = [];
-    patientsSnapshot.forEach((doc32) => {
-      patients.push(doc32.data());
+    patientsSnapshot.forEach((doc33) => {
+      patients.push(doc33.data());
     });
     console.log(`[getAllPatientsUtil] Found ${patients.length} patients`);
     return patients;
@@ -2143,8 +2328,8 @@ var getPatientsByPractitionerUtil = async (db, practitionerId, options) => {
     }
     const patientsSnapshot = await getDocs3(q);
     const patients = [];
-    patientsSnapshot.forEach((doc32) => {
-      patients.push(doc32.data());
+    patientsSnapshot.forEach((doc33) => {
+      patients.push(doc33.data());
     });
     console.log(
       `[getPatientsByPractitionerUtil] Found ${patients.length} patients for practitioner ID: ${practitionerId}`
@@ -2241,8 +2426,8 @@ var getPatientsByClinicUtil = async (db, clinicId, options) => {
     }
     const patientsSnapshot = await getDocs4(q);
     const patients = [];
-    patientsSnapshot.forEach((doc32) => {
-      patients.push(doc32.data());
+    patientsSnapshot.forEach((doc33) => {
+      patients.push(doc33.data());
     });
     console.log(
       `[getPatientsByClinicUtil] Found ${patients.length} patients for clinic ID: ${clinicId}`
@@ -3367,7 +3552,7 @@ async function getClinicAdminsByGroup(db, clinicGroupId) {
     where5("clinicGroupId", "==", clinicGroupId)
   );
   const querySnapshot = await getDocs5(q);
-  return querySnapshot.docs.map((doc32) => doc32.data());
+  return querySnapshot.docs.map((doc33) => doc33.data());
 }
 async function updateClinicAdmin(db, adminId, data) {
   const admin = await getClinicAdmin(db, adminId);
@@ -3628,6 +3813,8 @@ var ClinicAdminService = class extends BaseService {
       this.getClinicService()
     );
   }
+  // TODO: Add more methods for clinic admins for managing permissions, editing profiles by the admin, or by the clinic group owner and so on
+  // Generally refactor admin permissions and clinic group permissions and systems for admin management
 };
 
 // src/services/practitioner/practitioner.service.ts
@@ -4081,7 +4268,7 @@ var PractitionerService = class extends BaseService {
       where6("expiresAt", ">", Timestamp8.now())
     );
     const querySnapshot = await getDocs6(q);
-    return querySnapshot.docs.map((doc32) => doc32.data());
+    return querySnapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Gets a token by its string value and validates it
@@ -4164,7 +4351,7 @@ var PractitionerService = class extends BaseService {
       where6("status", "==", "active" /* ACTIVE */)
     );
     const querySnapshot = await getDocs6(q);
-    return querySnapshot.docs.map((doc32) => doc32.data());
+    return querySnapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Dohvata sve zdravstvene radnike za određenu kliniku
@@ -4176,7 +4363,7 @@ var PractitionerService = class extends BaseService {
       where6("isActive", "==", true)
     );
     const querySnapshot = await getDocs6(q);
-    return querySnapshot.docs.map((doc32) => doc32.data());
+    return querySnapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Dohvata sve draft zdravstvene radnike za određenu kliniku sa statusom DRAFT
@@ -4188,7 +4375,7 @@ var PractitionerService = class extends BaseService {
       where6("status", "==", "draft" /* DRAFT */)
     );
     const querySnapshot = await getDocs6(q);
-    return querySnapshot.docs.map((doc32) => doc32.data());
+    return querySnapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Updates a practitioner
@@ -4370,7 +4557,7 @@ var PractitionerService = class extends BaseService {
       );
       const querySnapshot = await getDocs6(q);
       const practitioners = querySnapshot.docs.map(
-        (doc32) => doc32.data()
+        (doc33) => doc33.data()
       );
       const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
       return {
@@ -4441,8 +4628,8 @@ var PractitionerService = class extends BaseService {
       console.log(
         `[PRACTITIONER_SERVICE] Found ${querySnapshot.docs.length} practitioners with base query`
       );
-      let practitioners = querySnapshot.docs.map((doc32) => {
-        return { ...doc32.data(), id: doc32.id };
+      let practitioners = querySnapshot.docs.map((doc33) => {
+        return { ...doc33.data(), id: doc33.id };
       });
       const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
       if (filters.nameSearch && filters.nameSearch.trim() !== "") {
@@ -4696,7 +4883,7 @@ var UserService = class extends BaseService {
     ];
     const q = query7(collection7(this.db, USERS_COLLECTION), ...constraints);
     const querySnapshot = await getDocs7(q);
-    const users = querySnapshot.docs.map((doc32) => doc32.data());
+    const users = querySnapshot.docs.map((doc33) => doc33.data());
     return Promise.all(users.map((userData) => userSchema.parse(userData)));
   }
   /**
@@ -5076,7 +5263,7 @@ async function getAllActiveGroups(db) {
     where8("isActive", "==", true)
   );
   const querySnapshot = await getDocs8(q);
-  return querySnapshot.docs.map((doc32) => doc32.data());
+  return querySnapshot.docs.map((doc33) => doc33.data());
 }
 async function updateClinicGroup(db, groupId, data, app) {
   console.log("[CLINIC_GROUP] Updating clinic group", { groupId });
@@ -5448,6 +5635,11 @@ var ClinicGroupService = class extends BaseService {
       this.app
     );
   }
+  // TODO: Add a method to get all admin tokens for a clinic group (not just active ones)
+  // TODO: Refactor admin token methods not to add tokens to the clinicGroup document,
+  // but to add them to a subcollection called adminTokens that belongs to a specific clinicGroup document
+  // TODO: Add granular control over admin permissions, e.g. only allow admins to manage certain clinics to tokens directly
+  // TODO: Generally refactor admin tokens and invites, also create cloud function to send invites and send updates when sombody uses the token
 };
 
 // src/services/clinic/clinic.service.ts
@@ -5500,7 +5692,7 @@ async function getClinicsByGroup(db, groupId) {
     where9("isActive", "==", true)
   );
   const querySnapshot = await getDocs9(q);
-  return querySnapshot.docs.map((doc32) => doc32.data());
+  return querySnapshot.docs.map((doc33) => doc33.data());
 }
 async function updateClinic(db, clinicId, data, adminId, clinicAdminService, app) {
   console.log("[CLINIC] Starting clinic update", { clinicId, adminId });
@@ -5694,7 +5886,7 @@ async function getClinicsByAdmin(db, adminId, options = {}, clinicAdminService,
   }
   const q = query9(collection9(db, CLINICS_COLLECTION), ...constraints);
   const querySnapshot = await getDocs9(q);
-  return querySnapshot.docs.map((doc32) => doc32.data());
+  return querySnapshot.docs.map((doc33) => doc33.data());
 }
 async function getActiveClinicsByAdmin(db, adminId, clinicAdminService, clinicGroupService) {
   return getClinicsByAdmin(
@@ -5739,11 +5931,11 @@ async function getAllClinics(db, pagination, lastDoc) {
     }
     const clinicsSnapshot = await getDocs9(clinicsQuery);
     const lastVisible = clinicsSnapshot.docs[clinicsSnapshot.docs.length - 1];
-    const clinics = clinicsSnapshot.docs.map((doc32) => {
-      const data = doc32.data();
+    const clinics = clinicsSnapshot.docs.map((doc33) => {
+      const data = doc33.data();
       return {
         ...data,
-        id: doc32.id
+        id: doc33.id
       };
     });
     return {
@@ -5770,8 +5962,8 @@ async function getAllClinicsInRange(db, center, rangeInKm, pagination, lastDoc)
     ];
     const q = query9(collection9(db, CLINICS_COLLECTION), ...constraints);
     const querySnapshot = await getDocs9(q);
-    for (const doc32 of querySnapshot.docs) {
-      const clinic = doc32.data();
+    for (const doc33 of querySnapshot.docs) {
+      const clinic = doc33.data();
       const distance = distanceBetween2(
         [center.latitude, center.longitude],
         [clinic.location.latitude, clinic.location.longitude]
@@ -5893,8 +6085,8 @@ async function findClinicsInRadius(db, center, radiusInKm, filters) {
     }
     const q = query10(collection10(db, CLINICS_COLLECTION), ...constraints);
     const querySnapshot = await getDocs10(q);
-    for (const doc32 of querySnapshot.docs) {
-      const clinic = doc32.data();
+    for (const doc33 of querySnapshot.docs) {
+      const clinic = doc33.data();
       const distance = distanceBetween3(
         [center.latitude, center.longitude],
         [clinic.location.latitude, clinic.location.longitude]
@@ -5990,8 +6182,8 @@ async function getClinicsByFilters(db, filters) {
       console.log(
         `[FILTER_UTILS] Found ${querySnapshot.docs.length} clinics in geo bound`
       );
-      for (const doc32 of querySnapshot.docs) {
-        const clinic = { ...doc32.data(), id: doc32.id };
+      for (const doc33 of querySnapshot.docs) {
+        const clinic = { ...doc33.data(), id: doc33.id };
         const distance = distanceBetween4(
           [center.latitude, center.longitude],
           [clinic.location.latitude, clinic.location.longitude]
@@ -6047,8 +6239,8 @@ async function getClinicsByFilters(db, filters) {
     console.log(
       `[FILTER_UTILS] Found ${querySnapshot.docs.length} clinics with regular query`
     );
-    const clinics = querySnapshot.docs.map((doc32) => {
-      return { ...doc32.data(), id: doc32.id };
+    const clinics = querySnapshot.docs.map((doc33) => {
+      return { ...doc33.data(), id: doc33.id };
     });
     let filteredClinics = clinics;
     if (filters.center) {
@@ -7273,17 +7465,28 @@ import {
 
 // src/types/notifications/index.ts
 var NotificationType = /* @__PURE__ */ ((NotificationType3) => {
-  NotificationType3["PRE_REQUIREMENT"] = "preRequirement";
-  NotificationType3["POST_REQUIREMENT"] = "postRequirement";
   NotificationType3["APPOINTMENT_REMINDER"] = "appointmentReminder";
-  NotificationType3["APPOINTMENT_NOTIFICATION"] = "appointmentNotification";
+  NotificationType3["APPOINTMENT_STATUS_CHANGE"] = "appointmentStatusChange";
+  NotificationType3["APPOINTMENT_RESCHEDULED_PROPOSAL"] = "appointmentRescheduledProposal";
+  NotificationType3["APPOINTMENT_CANCELLED"] = "appointmentCancelled";
+  NotificationType3["REQUIREMENT_INSTRUCTION_DUE"] = "requirementInstructionDue";
+  NotificationType3["FORM_REMINDER"] = "formReminder";
+  NotificationType3["FORM_SUBMISSION_CONFIRMATION"] = "formSubmissionConfirmation";
+  NotificationType3["REVIEW_REQUEST"] = "reviewRequest";
+  NotificationType3["PAYMENT_DUE"] = "paymentDue";
+  NotificationType3["PAYMENT_CONFIRMATION"] = "paymentConfirmation";
+  NotificationType3["PAYMENT_FAILED"] = "paymentFailed";
+  NotificationType3["GENERAL_MESSAGE"] = "generalMessage";
+  NotificationType3["ACCOUNT_NOTIFICATION"] = "accountNotification";
   return NotificationType3;
 })(NotificationType || {});
 var NOTIFICATIONS_COLLECTION = "notifications";
 var NotificationStatus = /* @__PURE__ */ ((NotificationStatus2) => {
   NotificationStatus2["PENDING"] = "pending";
+  NotificationStatus2["PROCESSING"] = "processing";
   NotificationStatus2["SENT"] = "sent";
   NotificationStatus2["FAILED"] = "failed";
+  NotificationStatus2["DELIVERED"] = "delivered";
   NotificationStatus2["CANCELLED"] = "cancelled";
   NotificationStatus2["PARTIAL_SUCCESS"] = "partialSuccess";
   return NotificationStatus2;
@@ -7339,9 +7542,9 @@ var NotificationService = class extends BaseService {
       orderBy3("notificationTime", "desc")
     );
     const querySnapshot = await getDocs14(q);
-    return querySnapshot.docs.map((doc32) => ({
-      id: doc32.id,
-      ...doc32.data()
+    return querySnapshot.docs.map((doc33) => ({
+      id: doc33.id,
+      ...doc33.data()
     }));
   }
   /**
@@ -7355,9 +7558,9 @@ var NotificationService = class extends BaseService {
       orderBy3("notificationTime", "desc")
     );
     const querySnapshot = await getDocs14(q);
-    return querySnapshot.docs.map((doc32) => ({
-      id: doc32.id,
-      ...doc32.data()
+    return querySnapshot.docs.map((doc33) => ({
+      id: doc33.id,
+      ...doc33.data()
     }));
   }
   /**
@@ -7429,9 +7632,9 @@ var NotificationService = class extends BaseService {
       orderBy3("notificationTime", "desc")
     );
     const querySnapshot = await getDocs14(q);
-    return querySnapshot.docs.map((doc32) => ({
-      id: doc32.id,
-      ...doc32.data()
+    return querySnapshot.docs.map((doc33) => ({
+      id: doc33.id,
+      ...doc33.data()
     }));
   }
   /**
@@ -7444,9 +7647,9 @@ var NotificationService = class extends BaseService {
       orderBy3("notificationTime", "desc")
     );
     const querySnapshot = await getDocs14(q);
-    return querySnapshot.docs.map((doc32) => ({
-      id: doc32.id,
-      ...doc32.data()
+    return querySnapshot.docs.map((doc33) => ({
+      id: doc33.id,
+      ...doc33.data()
     }));
   }
 };
@@ -7487,7 +7690,8 @@ var createProcedureSchema = z20.object({
   duration: z20.number().min(1).max(480),
   // Max 8 hours
   practitionerId: z20.string().min(1),
-  clinicBranchId: z20.string().min(1)
+  clinicBranchId: z20.string().min(1),
+  photos: z20.array(z20.string()).optional()
 });
 var updateProcedureSchema = z20.object({
   name: z20.string().min(3).max(100).optional(),
@@ -7502,7 +7706,8 @@ var updateProcedureSchema = z20.object({
   subcategoryId: z20.string().optional(),
   technologyId: z20.string().optional(),
   productId: z20.string().optional(),
-  clinicBranchId: z20.string().optional()
+  clinicBranchId: z20.string().optional(),
+  photos: z20.array(z20.string()).optional()
 });
 var procedureSchema = createProcedureSchema.extend({
   id: z20.string().min(1),
@@ -7516,6 +7721,8 @@ var procedureSchema = createProcedureSchema.extend({
   // We'll validate the full product object separately
   blockingConditions: z20.array(z20.any()),
   // We'll validate blocking conditions separately
+  contraindications: z20.array(z20.any()),
+  // We'll validate contraindications separately
   treatmentBenefits: z20.array(z20.any()),
   // We'll validate treatment benefits separately
   preRequirements: z20.array(z20.any()),
@@ -7620,6 +7827,7 @@ var ProcedureService = class extends BaseService {
       technology,
       product,
       blockingConditions: technology.blockingConditions,
+      contraindications: technology.contraindications || [],
       treatmentBenefits: technology.benefits,
       preRequirements: technology.requirements.pre,
       postRequirements: technology.requirements.post,
@@ -7677,7 +7885,7 @@ var ProcedureService = class extends BaseService {
       where15("isActive", "==", true)
     );
     const snapshot = await getDocs15(q);
-    return snapshot.docs.map((doc32) => doc32.data());
+    return snapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Gets all procedures for a practitioner
@@ -7691,7 +7899,7 @@ var ProcedureService = class extends BaseService {
       where15("isActive", "==", true)
     );
     const snapshot = await getDocs15(q);
-    return snapshot.docs.map((doc32) => doc32.data());
+    return snapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Updates a procedure
@@ -7874,20 +8082,20 @@ var ProcedureService = class extends BaseService {
       const proceduresCollection = collection15(this.db, PROCEDURES_COLLECTION);
       let proceduresQuery = query15(proceduresCollection);
       if (pagination && pagination > 0) {
-        const { limit: limit11, startAfter: startAfter11 } = await import("firebase/firestore");
+        const { limit: limit12, startAfter: startAfter12 } = await import("firebase/firestore");
         if (lastDoc) {
           proceduresQuery = query15(
             proceduresCollection,
             orderBy4("name"),
             // Use imported orderBy
-            startAfter11(lastDoc),
-            limit11(pagination)
+            startAfter12(lastDoc),
+            limit12(pagination)
           );
         } else {
           proceduresQuery = query15(
             proceduresCollection,
             orderBy4("name"),
-            limit11(pagination)
+            limit12(pagination)
           );
         }
       } else {
@@ -7895,11 +8103,11 @@ var ProcedureService = class extends BaseService {
       }
       const proceduresSnapshot = await getDocs15(proceduresQuery);
       const lastVisible = proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1];
-      const procedures = proceduresSnapshot.docs.map((doc32) => {
-        const data = doc32.data();
+      const procedures = proceduresSnapshot.docs.map((doc33) => {
+        const data = doc33.data();
         return {
           ...data,
-          id: doc32.id
+          id: doc33.id
           // Ensure ID is present
         };
       });
@@ -7981,8 +8189,8 @@ var ProcedureService = class extends BaseService {
           console.log(
             `[PROCEDURE_SERVICE] Found ${querySnapshot.docs.length} procedures in geo bound`
           );
-          for (const doc32 of querySnapshot.docs) {
-            const procedure = { ...doc32.data(), id: doc32.id };
+          for (const doc33 of querySnapshot.docs) {
+            const procedure = { ...doc33.data(), id: doc33.id };
             const distance = distanceBetween6(
               [center.latitude, center.longitude],
               [
@@ -8033,8 +8241,8 @@ var ProcedureService = class extends BaseService {
         console.log(
           `[PROCEDURE_SERVICE] Found ${querySnapshot.docs.length} procedures with regular query`
         );
-        const procedures = querySnapshot.docs.map((doc32) => {
-          return { ...doc32.data(), id: doc32.id };
+        const procedures = querySnapshot.docs.map((doc33) => {
+          return { ...doc33.data(), id: doc33.id };
         });
         if (filters.location) {
           const center = filters.location;
@@ -8187,7 +8395,10 @@ var DocumentationTemplateService = class extends BaseService {
       createdBy: userId,
       version: 1,
       isActive: true,
-      tags: validatedData.tags || []
+      tags: validatedData.tags || [],
+      isUserForm: validatedData.isUserForm || false,
+      isRequired: validatedData.isRequired || false,
+      sortingOrder: validatedData.sortingOrder || 0
     };
     const docRef = doc16(this.collectionRef, templateId);
     await setDoc14(docRef, template);
@@ -8222,21 +8433,31 @@ var DocumentationTemplateService = class extends BaseService {
     if (validatedData.elements) {
       updatedElements = validatedData.elements.map((element) => ({
         ...element,
-        id: this.generateId()
+        id: element.id || this.generateId()
       }));
     }
-    const updateData = {
-      ...validatedData,
+    const updatePayload = {
       elements: updatedElements,
       updatedAt: Date.now(),
       version: template.version + 1
     };
+    if (validatedData.title !== void 0)
+      updatePayload.title = validatedData.title;
+    if (validatedData.description !== void 0)
+      updatePayload.description = validatedData.description;
+    if (validatedData.isActive !== void 0)
+      updatePayload.isActive = validatedData.isActive;
+    if (validatedData.tags !== void 0)
+      updatePayload.tags = validatedData.tags;
+    if (validatedData.isUserForm !== void 0)
+      updatePayload.isUserForm = validatedData.isUserForm;
+    if (validatedData.isRequired !== void 0)
+      updatePayload.isRequired = validatedData.isRequired;
+    if (validatedData.sortingOrder !== void 0)
+      updatePayload.sortingOrder = validatedData.sortingOrder;
     const docRef = doc16(this.collectionRef, templateId);
-    await updateDoc16(docRef, updateData);
-    return {
-      ...template,
-      ...updateData
-    };
+    await updateDoc16(docRef, updatePayload);
+    return { ...template, ...updatePayload };
   }
   /**
    * Delete a document template
@@ -8265,9 +8486,9 @@ var DocumentationTemplateService = class extends BaseService {
     const querySnapshot = await getDocs16(q);
     const templates = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc32) => {
-      templates.push(doc32.data());
-      lastVisible = doc32;
+    querySnapshot.forEach((doc33) => {
+      templates.push(doc33.data());
+      lastVisible = doc33;
     });
     return {
       templates,
@@ -8295,9 +8516,9 @@ var DocumentationTemplateService = class extends BaseService {
     const querySnapshot = await getDocs16(q);
     const templates = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc32) => {
-      templates.push(doc32.data());
-      lastVisible = doc32;
+    querySnapshot.forEach((doc33) => {
+      templates.push(doc33.data());
+      lastVisible = doc33;
     });
     return {
       templates,
@@ -8324,9 +8545,9 @@ var DocumentationTemplateService = class extends BaseService {
     const querySnapshot = await getDocs16(q);
     const templates = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc32) => {
-      templates.push(doc32.data());
-      lastVisible = doc32;
+    querySnapshot.forEach((doc33) => {
+      templates.push(doc33.data());
+      lastVisible = doc33;
     });
     return {
       templates,
@@ -8344,7 +8565,6 @@ import {
   setDoc as setDoc15,
   updateDoc as updateDoc17,
   query as query17,
-  where as where17,
   orderBy as orderBy6,
   limit as limit9,
   startAfter as startAfter9
@@ -8352,50 +8572,80 @@ import {
 var FilledDocumentService = class extends BaseService {
   constructor(...args) {
     super(...args);
-    this.collectionRef = collection17(
-      this.db,
-      FILLED_DOCUMENTS_COLLECTION
-    );
     this.templateService = new DocumentationTemplateService(...args);
   }
+  getFormSubcollectionPath(isUserForm) {
+    return isUserForm ? USER_FORMS_SUBCOLLECTION : DOCTOR_FORMS_SUBCOLLECTION;
+  }
   /**
-   * Create a new filled document
-   * @param templateId - ID of the template to use
-   * @param patientId - ID of the patient
-   * @param practitionerId - ID of the practitioner
-   * @param clinicId - ID of the clinic
-   * @returns The created filled document
+   * Create a new filled document within an appointment's subcollection.
+   * @param templateId - ID of the template to use.
+   * @param appointmentId - ID of the appointment this form belongs to.
+   * @param procedureId - ID of the procedure associated with this form.
+   * @param patientId - ID of the patient.
+   * @param practitionerId - ID of the practitioner (can be system/generic if patient is filling).
+   * @param clinicId - ID of the clinic.
+   * @param initialValues - Optional initial values for the form elements.
+   * @param initialStatus - Optional initial status for the form.
+   * @returns The created filled document.
    */
-  async createFilledDocument(templateId, patientId, practitionerId, clinicId) {
+  async createFilledDocumentForAppointment(templateId, appointmentId, procedureId, patientId, practitionerId, clinicId, initialValues = {}, initialStatus = "draft" /* DRAFT */) {
     const template = await this.templateService.getTemplateById(templateId);
     if (!template) {
       throw new Error(`Template with ID ${templateId} not found`);
     }
     const documentId3 = this.generateId();
     const now = Date.now();
+    const isUserForm = template.isUserForm || false;
+    const formSubcollection = this.getFormSubcollectionPath(isUserForm);
     const filledDocument = {
       id: documentId3,
       templateId,
       templateVersion: template.version,
+      isUserForm,
+      // Set based on template
+      isRequired: template.isRequired || false,
+      // Inherit isRequired from the template
+      appointmentId,
+      // NEW
+      procedureId,
+      // NEW
       patientId,
       practitionerId,
       clinicId,
       createdAt: now,
       updatedAt: now,
-      values: {},
-      status: "draft" /* DRAFT */
+      values: initialValues,
+      status: initialStatus
     };
-    const docRef = doc17(this.collectionRef, documentId3);
+    const docRef = doc17(
+      this.db,
+      APPOINTMENTS_COLLECTION,
+      // Replaced "appointments"
+      appointmentId,
+      formSubcollection,
+      documentId3
+    );
     await setDoc15(docRef, filledDocument);
     return filledDocument;
   }
   /**
-   * Get a filled document by ID
-   * @param documentId - ID of the filled document to retrieve
-   * @returns The filled document or null if not found
+   * Get a specific filled document from an appointment's subcollection.
+   * @param appointmentId - ID of the appointment.
+   * @param formId - ID of the filled document.
+   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
+   * @returns The filled document or null if not found.
    */
-  async getFilledDocumentById(documentId3) {
-    const docRef = doc17(this.collectionRef, documentId3);
+  async getFilledDocumentFromAppointmentById(appointmentId, formId, isUserForm) {
+    const formSubcollection = this.getFormSubcollectionPath(isUserForm);
+    const docRef = doc17(
+      this.db,
+      APPOINTMENTS_COLLECTION,
+      // Replaced "appointments"
+      appointmentId,
+      formSubcollection,
+      formId
+    );
     const docSnap = await getDoc20(docRef);
     if (!docSnap.exists()) {
       return null;
@@ -8403,178 +8653,183 @@ var FilledDocumentService = class extends BaseService {
     return docSnap.data();
   }
   /**
-   * Update values in a filled document
-   * @param documentId - ID of the filled document to update
-   * @param values - Updated values for elements
-   * @param status - Optional new status for the document
-   * @returns The updated filled document
+   * Update values or status in a filled document within an appointment's subcollection.
+   * @param appointmentId - ID of the appointment.
+   * @param formId - ID of the filled document to update.
+   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
+   * @param values - Updated values for elements.
+   * @param status - Optional new status for the document.
+   * @returns The updated filled document.
    */
-  async updateFilledDocument(documentId3, values, status) {
-    const filledDocument = await this.getFilledDocumentById(documentId3);
-    if (!filledDocument) {
-      throw new Error(`Filled document with ID ${documentId3} not found`);
+  async updateFilledDocumentInAppointment(appointmentId, formId, isUserForm, values, status) {
+    const formSubcollection = this.getFormSubcollectionPath(isUserForm);
+    const docRef = doc17(
+      this.db,
+      APPOINTMENTS_COLLECTION,
+      // Replaced "appointments"
+      appointmentId,
+      formSubcollection,
+      formId
+    );
+    const existingDoc = await this.getFilledDocumentFromAppointmentById(
+      appointmentId,
+      formId,
+      isUserForm
+    );
+    if (!existingDoc) {
+      throw new Error(
+        `Filled document with ID ${formId} not found in appointment ${appointmentId} ${formSubcollection}`
+      );
     }
-    const updateData = {
-      values: {
-        ...filledDocument.values,
-        ...values
-      },
+    const updatePayload = {
       updatedAt: Date.now()
     };
+    if (values) {
+      updatePayload.values = {
+        ...existingDoc.values,
+        ...values
+      };
+    }
     if (status) {
-      updateData.status = status;
+      updatePayload.status = status;
     }
-    const docRef = doc17(this.collectionRef, documentId3);
-    await updateDoc17(docRef, updateData);
-    return {
-      ...filledDocument,
-      ...updateData
-    };
+    if (Object.keys(updatePayload).length === 1 && "updatedAt" in updatePayload) {
+    }
+    await updateDoc17(docRef, updatePayload);
+    return { ...existingDoc, ...updatePayload };
   }
   /**
-   * Get filled documents for a patient
-   * @param patientId - ID of the patient
-   * @param pageSize - Number of documents to retrieve
-   * @param lastDoc - Last document from previous page for pagination
-   * @returns Array of filled documents and the last document for pagination
+   * Get all filled user forms for a specific appointment.
+   * @param appointmentId ID of the appointment.
+   * @param pageSize Number of documents to retrieve.
+   * @param lastDoc Last document from previous page for pagination.
    */
-  async getFilledDocumentsByPatient(patientId, pageSize = 20, lastDoc) {
+  async getFilledUserFormsForAppointment(appointmentId, pageSize = 20, lastDoc) {
+    const subcollectionRef = collection17(
+      this.db,
+      APPOINTMENTS_COLLECTION,
+      // Replaced "appointments"
+      appointmentId,
+      USER_FORMS_SUBCOLLECTION
+    );
     let q = query17(
-      this.collectionRef,
-      where17("patientId", "==", patientId),
+      subcollectionRef,
       orderBy6("updatedAt", "desc"),
       limit9(pageSize)
     );
     if (lastDoc) {
       q = query17(q, startAfter9(lastDoc));
     }
-    const querySnapshot = await getDocs17(q);
-    const documents = [];
-    let lastVisible = null;
-    querySnapshot.forEach((doc32) => {
-      documents.push(doc32.data());
-      lastVisible = doc32;
-    });
-    return {
-      documents,
-      lastDoc: lastVisible
-    };
+    return this.executeQuery(q);
   }
   /**
-   * Get filled documents for a practitioner
-   * @param practitionerId - ID of the practitioner
-   * @param pageSize - Number of documents to retrieve
-   * @param lastDoc - Last document from previous page for pagination
-   * @returns Array of filled documents and the last document for pagination
+   * Get all filled doctor forms for a specific appointment.
+   * @param appointmentId ID of the appointment.
+   * @param pageSize Number of documents to retrieve.
+   * @param lastDoc Last document from previous page for pagination.
    */
-  async getFilledDocumentsByPractitioner(practitionerId, pageSize = 20, lastDoc) {
+  async getFilledDoctorFormsForAppointment(appointmentId, pageSize = 20, lastDoc) {
+    const subcollectionRef = collection17(
+      this.db,
+      APPOINTMENTS_COLLECTION,
+      // Replaced "appointments"
+      appointmentId,
+      DOCTOR_FORMS_SUBCOLLECTION
+    );
     let q = query17(
-      this.collectionRef,
-      where17("practitionerId", "==", practitionerId),
+      subcollectionRef,
       orderBy6("updatedAt", "desc"),
       limit9(pageSize)
     );
     if (lastDoc) {
       q = query17(q, startAfter9(lastDoc));
     }
+    return this.executeQuery(q);
+  }
+  // Helper to execute query and return documents + lastDoc
+  async executeQuery(q) {
     const querySnapshot = await getDocs17(q);
     const documents = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc32) => {
-      documents.push(doc32.data());
-      lastVisible = doc32;
+    querySnapshot.forEach((doc33) => {
+      documents.push(doc33.data());
+      lastVisible = doc33;
     });
     return {
       documents,
       lastDoc: lastVisible
     };
   }
+  // IMPORTANT: The following methods that query across all patients/practitioners/clinics
+  // (e.g., getFilledDocumentsByPatient, getFilledDocumentsByPractitioner)
+  // will NOT work correctly if FILLED_DOCUMENTS_COLLECTION is no longer a top-level collection
+  // and data is only in appointment subcollections. You would need to use
+  // Firestore Collection Group Queries for that, which require an index and a different query approach.
+  // These methods are left here for now but would need significant rework or removal.
+  /**
+   * Get filled documents for a patient (NEEDS REWORK for subcollections or Collection Group Query)
+   * @param patientId - ID of the patient
+   * @param pageSize - Number of documents to retrieve
+   * @param lastDoc - Last document from previous page for pagination
+   * @returns Array of filled documents and the last document for pagination
+   */
+  async getFilledDocumentsByPatient(patientId, pageSize = 20, lastDoc) {
+    console.warn(
+      "getFilledDocumentsByPatient needs rework for subcollection model or Collection Group Queries."
+    );
+    return { documents: [], lastDoc: null };
+  }
+  /**
+   * Get filled documents for a practitioner (NEEDS REWORK for subcollections or Collection Group Query)
+   * @param practitionerId - ID of the practitioner
+   * @param pageSize - Number of documents to retrieve
+   * @param lastDoc - Last document from previous page for pagination
+   * @returns Array of filled documents and the last document for pagination
+   */
+  async getFilledDocumentsByPractitioner(practitionerId, pageSize = 20, lastDoc) {
+    console.warn(
+      "getFilledDocumentsByPractitioner needs rework for subcollection model or Collection Group Queries."
+    );
+    return { documents: [], lastDoc: null };
+  }
   /**
-   * Get filled documents for a clinic
+   * Get filled documents for a clinic (NEEDS REWORK for subcollections or Collection Group Query)
    * @param clinicId - ID of the clinic
    * @param pageSize - Number of documents to retrieve
    * @param lastDoc - Last document from previous page for pagination
    * @returns Array of filled documents and the last document for pagination
    */
   async getFilledDocumentsByClinic(clinicId, pageSize = 20, lastDoc) {
-    let q = query17(
-      this.collectionRef,
-      where17("clinicId", "==", clinicId),
-      orderBy6("updatedAt", "desc"),
-      limit9(pageSize)
+    console.warn(
+      "getFilledDocumentsByClinic needs rework for subcollection model or Collection Group Queries."
     );
-    if (lastDoc) {
-      q = query17(q, startAfter9(lastDoc));
-    }
-    const querySnapshot = await getDocs17(q);
-    const documents = [];
-    let lastVisible = null;
-    querySnapshot.forEach((doc32) => {
-      documents.push(doc32.data());
-      lastVisible = doc32;
-    });
-    return {
-      documents,
-      lastDoc: lastVisible
-    };
+    return { documents: [], lastDoc: null };
   }
   /**
-   * Get filled documents by template
+   * Get filled documents by template (NEEDS REWORK for subcollections or Collection Group Query)
    * @param templateId - ID of the template
    * @param pageSize - Number of documents to retrieve
    * @param lastDoc - Last document from previous page for pagination
    * @returns Array of filled documents and the last document for pagination
    */
   async getFilledDocumentsByTemplate(templateId, pageSize = 20, lastDoc) {
-    let q = query17(
-      this.collectionRef,
-      where17("templateId", "==", templateId),
-      orderBy6("updatedAt", "desc"),
-      limit9(pageSize)
+    console.warn(
+      "getFilledDocumentsByTemplate needs rework for subcollection model or Collection Group Queries."
     );
-    if (lastDoc) {
-      q = query17(q, startAfter9(lastDoc));
-    }
-    const querySnapshot = await getDocs17(q);
-    const documents = [];
-    let lastVisible = null;
-    querySnapshot.forEach((doc32) => {
-      documents.push(doc32.data());
-      lastVisible = doc32;
-    });
-    return {
-      documents,
-      lastDoc: lastVisible
-    };
+    return { documents: [], lastDoc: null };
   }
   /**
-   * Get filled documents by status
+   * Get filled documents by status (NEEDS REWORK for subcollections or Collection Group Query)
    * @param status - Status to filter by
    * @param pageSize - Number of documents to retrieve
    * @param lastDoc - Last document from previous page for pagination
    * @returns Array of filled documents and the last document for pagination
    */
   async getFilledDocumentsByStatus(status, pageSize = 20, lastDoc) {
-    let q = query17(
-      this.collectionRef,
-      where17("status", "==", status),
-      orderBy6("updatedAt", "desc"),
-      limit9(pageSize)
+    console.warn(
+      "getFilledDocumentsByStatus needs rework for subcollection model or Collection Group Queries."
     );
-    if (lastDoc) {
-      q = query17(q, startAfter9(lastDoc));
-    }
-    const querySnapshot = await getDocs17(q);
-    const documents = [];
-    let lastVisible = null;
-    querySnapshot.forEach((doc32) => {
-      documents.push(doc32.data());
-      lastVisible = doc32;
-    });
-    return {
-      documents,
-      lastDoc: lastVisible
-    };
+    return { documents: [], lastDoc: null };
   }
 };
 
@@ -9125,7 +9380,7 @@ async function searchCalendarEventsUtil(db, params) {
     const finalQuery = query21(collectionRef, ...constraints);
     const querySnapshot = await getDocs21(finalQuery);
     const events = querySnapshot.docs.map(
-      (doc32) => ({ id: doc32.id, ...doc32.data() })
+      (doc33) => ({ id: doc33.id, ...doc33.data() })
     );
     return events;
   } catch (error) {
@@ -9218,7 +9473,7 @@ async function getPractitionerSyncedCalendarsUtil(db, practitionerId) {
   );
   const q = query22(calendarsRef, orderBy11("createdAt", "desc"));
   const querySnapshot = await getDocs22(q);
-  return querySnapshot.docs.map((doc32) => doc32.data());
+  return querySnapshot.docs.map((doc33) => doc33.data());
 }
 async function getPatientSyncedCalendarUtil(db, patientId, calendarId) {
   const calendarRef = getPatientSyncedCalendarDocRef(db, patientId, calendarId);
@@ -9235,7 +9490,7 @@ async function getPatientSyncedCalendarsUtil(db, patientId) {
   );
   const q = query22(calendarsRef, orderBy11("createdAt", "desc"));
   const querySnapshot = await getDocs22(q);
-  return querySnapshot.docs.map((doc32) => doc32.data());
+  return querySnapshot.docs.map((doc33) => doc33.data());
 }
 async function getClinicSyncedCalendarUtil(db, clinicId, calendarId) {
   const calendarRef = getClinicSyncedCalendarDocRef(db, clinicId, calendarId);
@@ -9252,7 +9507,7 @@ async function getClinicSyncedCalendarsUtil(db, clinicId) {
   );
   const q = query22(calendarsRef, orderBy11("createdAt", "desc"));
   const querySnapshot = await getDocs22(q);
-  return querySnapshot.docs.map((doc32) => doc32.data());
+  return querySnapshot.docs.map((doc33) => doc33.data());
 }
 async function updatePractitionerSyncedCalendarUtil(db, practitionerId, calendarId, updateData) {
   const calendarRef = getPractitionerSyncedCalendarDocRef(
@@ -10607,9 +10862,9 @@ var CalendarServiceV2 = class extends BaseService {
         where23("eventTime.start", "<=", Timestamp25.fromDate(endDate))
       );
       const eventsSnapshot = await getDocs23(q);
-      const events = eventsSnapshot.docs.map((doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      const events = eventsSnapshot.docs.map((doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       }));
       const calendars = await this.syncedCalendarsService.getPractitionerSyncedCalendars(
         doctorId
@@ -11241,7 +11496,7 @@ var CalendarServiceV2 = class extends BaseService {
       ])
     );
     const querySnapshot = await getDocs23(q);
-    return querySnapshot.docs.map((doc32) => doc32.data());
+    return querySnapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Calculates available time slots based on working hours, schedule and existing appointments
@@ -11520,7 +11775,7 @@ var ReviewService = class extends BaseService {
       where24("patientId", "==", patientId)
     );
     const snapshot = await getDocs24(q);
-    return snapshot.docs.map((doc32) => doc32.data());
+    return snapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Gets all reviews for a specific clinic
@@ -11533,7 +11788,7 @@ var ReviewService = class extends BaseService {
       where24("clinicReview.clinicId", "==", clinicId)
     );
     const snapshot = await getDocs24(q);
-    return snapshot.docs.map((doc32) => doc32.data());
+    return snapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Gets all reviews for a specific practitioner
@@ -11546,7 +11801,7 @@ var ReviewService = class extends BaseService {
       where24("practitionerReview.practitionerId", "==", practitionerId)
     );
     const snapshot = await getDocs24(q);
-    return snapshot.docs.map((doc32) => doc32.data());
+    return snapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Gets all reviews for a specific procedure
@@ -11559,7 +11814,7 @@ var ReviewService = class extends BaseService {
       where24("procedureReview.procedureId", "==", procedureId)
     );
     const snapshot = await getDocs24(q);
-    return snapshot.docs.map((doc32) => doc32.data());
+    return snapshot.docs.map((doc33) => doc33.data());
   }
   /**
    * Gets all reviews for a specific appointment
@@ -11988,9 +12243,12 @@ var ReviewService = class extends BaseService {
 
 // src/services/appointment/appointment.service.ts
 import {
-  Timestamp as Timestamp28
+  Timestamp as Timestamp28,
+  serverTimestamp as serverTimestamp24,
+  arrayUnion as arrayUnion8,
+  arrayRemove as arrayRemove7
 } from "firebase/firestore";
-import { getFunctions, httpsCallable } from "firebase/functions";
+import { getFunctions } from "firebase/functions";
 
 // src/services/appointment/utils/appointment.utils.ts
 import {
@@ -12013,166 +12271,6 @@ import {
 var TECHNOLOGIES_COLLECTION = "technologies";
 
 // src/services/appointment/utils/appointment.utils.ts
-async function fetchAggregatedInfoUtil(db, clinicId, practitionerId, patientId, procedureId) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
-  try {
-    const [clinicDoc, practitionerDoc, patientDoc, procedureDoc] = await Promise.all([
-      getDoc28(doc26(db, CLINICS_COLLECTION, clinicId)),
-      getDoc28(doc26(db, PRACTITIONERS_COLLECTION, practitionerId)),
-      getDoc28(doc26(db, PATIENTS_COLLECTION, patientId)),
-      getDoc28(doc26(db, PROCEDURES_COLLECTION, procedureId))
-    ]);
-    if (!clinicDoc.exists()) {
-      throw new Error(`Clinic with ID ${clinicId} not found`);
-    }
-    if (!practitionerDoc.exists()) {
-      throw new Error(`Practitioner with ID ${practitionerId} not found`);
-    }
-    if (!patientDoc.exists()) {
-      throw new Error(`Patient with ID ${patientId} not found`);
-    }
-    if (!procedureDoc.exists()) {
-      throw new Error(`Procedure with ID ${procedureId} not found`);
-    }
-    const clinicData = clinicDoc.data();
-    const practitionerData = practitionerDoc.data();
-    const patientData = patientDoc.data();
-    const procedureData = procedureDoc.data();
-    const clinicInfo = {
-      id: clinicId,
-      featuredPhoto: ((_a = clinicData.featuredPhotos) == null ? void 0 : _a[0]) || "",
-      name: clinicData.name,
-      description: clinicData.description || null,
-      location: clinicData.location,
-      contactInfo: clinicData.contactInfo
-    };
-    const practitionerInfo = {
-      id: practitionerId,
-      practitionerPhoto: ((_b = practitionerData.basicInfo) == null ? void 0 : _b.profileImageUrl) || null,
-      name: `${((_c = practitionerData.basicInfo) == null ? void 0 : _c.firstName) || ""} ${((_d = practitionerData.basicInfo) == null ? void 0 : _d.lastName) || ""}`.trim(),
-      email: ((_e = practitionerData.basicInfo) == null ? void 0 : _e.email) || "",
-      phone: ((_f = practitionerData.basicInfo) == null ? void 0 : _f.phoneNumber) || null,
-      certification: practitionerData.certification
-    };
-    const patientInfo = {
-      id: patientId,
-      fullName: patientData.displayName || "",
-      email: patientData.email || "",
-      phone: patientData.phoneNumber || null,
-      dateOfBirth: patientData.dateOfBirth || Timestamp27.now(),
-      gender: patientData.gender || "other"
-    };
-    const procedureInfo = {
-      id: procedureId,
-      name: procedureData.name,
-      description: procedureData.description,
-      photo: procedureData.photo || "",
-      family: procedureData.family,
-      categoryName: ((_g = procedureData.category) == null ? void 0 : _g.name) || "",
-      subcategoryName: ((_h = procedureData.subcategory) == null ? void 0 : _h.name) || "",
-      technologyName: ((_i = procedureData.technology) == null ? void 0 : _i.name) || "",
-      brandName: ((_j = procedureData.product) == null ? void 0 : _j.brand) || "",
-      productName: ((_k = procedureData.product) == null ? void 0 : _k.name) || "",
-      price: procedureData.price || 0,
-      pricingMeasure: procedureData.pricingMeasure,
-      currency: procedureData.currency,
-      duration: procedureData.duration || 0,
-      clinicId,
-      clinicName: clinicInfo.name,
-      practitionerId,
-      practitionerName: practitionerInfo.name
-    };
-    let technologyId = "";
-    if ((_l = procedureData.technology) == null ? void 0 : _l.id) {
-      technologyId = procedureData.technology.id;
-    }
-    let blockingConditions = [];
-    let contraindications = [];
-    let preProcedureRequirements = [];
-    let postProcedureRequirements = [];
-    if (technologyId) {
-      const technologyDoc = await getDoc28(
-        doc26(db, TECHNOLOGIES_COLLECTION, technologyId)
-      );
-      if (technologyDoc.exists()) {
-        const technologyData = technologyDoc.data();
-        blockingConditions = technologyData.blockingConditions || [];
-        contraindications = technologyData.contraindications || [];
-        preProcedureRequirements = ((_m = technologyData.requirements) == null ? void 0 : _m.pre) || [];
-        postProcedureRequirements = ((_n = technologyData.requirements) == null ? void 0 : _n.post) || [];
-      }
-    } else {
-      blockingConditions = procedureData.blockingConditions || [];
-      contraindications = procedureData.contraindications || [];
-      preProcedureRequirements = procedureData.preRequirements || [];
-      postProcedureRequirements = procedureData.postRequirements || [];
-    }
-    return {
-      clinicInfo,
-      practitionerInfo,
-      patientInfo,
-      procedureInfo,
-      blockingConditions,
-      contraindications,
-      preProcedureRequirements,
-      postProcedureRequirements
-    };
-  } catch (error) {
-    console.error("Error fetching aggregated info:", error);
-    throw error;
-  }
-}
-async function createAppointmentUtil2(db, data, aggregatedInfo, generateId2) {
-  try {
-    const appointmentId = generateId2();
-    const appointment = {
-      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: Timestamp27.now(),
-      appointmentStartTime: data.appointmentStartTime,
-      appointmentEndTime: data.appointmentEndTime,
-      patientNotes: data.patientNotes || null,
-      cost: data.cost,
-      currency: data.currency,
-      paymentStatus: data.initialPaymentStatus || "unpaid" /* UNPAID */,
-      blockingConditions: aggregatedInfo.blockingConditions,
-      contraindications: aggregatedInfo.contraindications,
-      preProcedureRequirements: aggregatedInfo.preProcedureRequirements,
-      postProcedureRequirements: aggregatedInfo.postProcedureRequirements,
-      completedPreRequirements: [],
-      completedPostRequirements: [],
-      createdAt: serverTimestamp23(),
-      updatedAt: serverTimestamp23()
-    };
-    if (data.initialStatus === "confirmed" /* CONFIRMED */) {
-      appointment.confirmationTime = Timestamp27.now();
-    }
-    await setDoc23(doc26(db, APPOINTMENTS_COLLECTION, appointmentId), appointment);
-    const calendarEventRef = doc26(db, CALENDAR_COLLECTION, data.calendarEventId);
-    await updateDoc25(calendarEventRef, {
-      appointmentId,
-      updatedAt: serverTimestamp23()
-    });
-    const now = Timestamp27.now();
-    return {
-      ...appointment,
-      createdAt: now,
-      updatedAt: now
-    };
-  } catch (error) {
-    console.error("Error creating appointment:", error);
-    throw error;
-  }
-}
 async function updateAppointmentUtil2(db, appointmentId, data) {
   try {
     const appointmentRef = doc26(db, APPOINTMENTS_COLLECTION, appointmentId);
@@ -12274,7 +12372,7 @@ async function updateCalendarEventStatus(db, calendarEventId, appointmentStatus)
       case "canceled_clinic" /* CANCELED_CLINIC */:
         calendarStatus = "canceled";
         break;
-      case "rescheduled" /* RESCHEDULED */:
+      case AppointmentStatus.RESCHEDULED:
         calendarStatus = "rescheduled";
         break;
       case "completed" /* COMPLETED */:
@@ -12348,7 +12446,7 @@ async function searchAppointmentsUtil(db, params) {
     const q = query25(collection25(db, APPOINTMENTS_COLLECTION), ...constraints);
     const querySnapshot = await getDocs25(q);
     const appointments = querySnapshot.docs.map(
-      (doc32) => doc32.data()
+      (doc33) => doc33.data()
     );
     const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
     return { appointments, lastDoc };
@@ -12371,86 +12469,15 @@ var AppointmentService = class extends BaseService {
    * @param practitionerService Practitioner service instance
    * @param clinicService Clinic service instance
    */
-  constructor(db, auth, app, calendarService, patientService, practitionerService, clinicService) {
+  constructor(db, auth, app, calendarService, patientService, practitionerService, clinicService, filledDocumentService) {
     super(db, auth, app);
     this.calendarService = calendarService;
     this.patientService = patientService;
     this.practitionerService = practitionerService;
     this.clinicService = clinicService;
+    this.filledDocumentService = filledDocumentService;
     this.functions = getFunctions(app, "europe-west6");
   }
-  /**
-   * Test method using the callable function version of getAvailableBookingSlots
-   * For development and testing purposes only - not for production use
-   *
-   * @param clinicId ID of the clinic
-   * @param practitionerId ID of the practitioner
-   * @param procedureId ID of the procedure
-   * @param startDate Start date of the time range to check
-   * @param endDate End date of the time range to check
-   * @returns Test result from the callable function
-   */
-  async testGetAvailableBookingSlots(clinicId, practitionerId, procedureId, startDate, endDate) {
-    try {
-      console.log(
-        `[APPOINTMENT_SERVICE] Testing callable function for clinic: ${clinicId}, practitioner: ${practitionerId}, procedure: ${procedureId}`
-      );
-      const getAvailableBookingSlotsCallable = httpsCallable(
-        this.functions,
-        "getAvailableBookingSlots"
-      );
-      const result = await getAvailableBookingSlotsCallable({
-        clinicId,
-        practitionerId,
-        procedureId,
-        timeframe: {
-          start: startDate.getTime(),
-          end: endDate.getTime()
-        }
-      });
-      console.log(
-        "[APPOINTMENT_SERVICE] Callable function test result:",
-        result.data
-      );
-      return result.data;
-    } catch (error) {
-      console.error(
-        "[APPOINTMENT_SERVICE] Error testing callable function:",
-        error
-      );
-      throw error;
-    }
-  }
-  /**
-   * Gets available booking slots for a specific clinic, practitioner, and procedure.
-   *
-   * @param clinicId ID of the clinic
-   * @param practitionerId ID of the practitioner
-   * @param procedureId ID of the procedure
-   * @param startDate Start date of the time range to check
-   * @param endDate End date of the time range to check
-   * @returns Array of available booking slots
-   */
-  async getAvailableBookingSlots(clinicId, practitionerId, procedureId, startDate, endDate) {
-    try {
-      console.log(
-        `[APPOINTMENT_SERVICE] Getting available booking slots for clinic: ${clinicId}, practitioner: ${practitionerId}, procedure: ${procedureId}`
-      );
-      return this.getAvailableBookingSlotsHttp(
-        clinicId,
-        practitionerId,
-        procedureId,
-        startDate,
-        endDate
-      );
-    } catch (error) {
-      console.error(
-        "[APPOINTMENT_SERVICE] Error getting available booking slots:",
-        error
-      );
-      throw error;
-    }
-  }
   /**
    * Gets available booking slots for a specific clinic, practitioner, and procedure using HTTP request.
    * This is an alternative implementation using direct HTTP request instead of callable function.
@@ -12552,49 +12579,96 @@ var AppointmentService = class extends BaseService {
     }
   }
   /**
-   * Creates a new appointment.
+   * Creates an appointment via the Cloud Function orchestrateAppointmentCreation
    *
-   * @param data Data needed to create the appointment
+   * @param data - CreateAppointmentData object
    * @returns The created appointment
    */
-  async createAppointment(data) {
+  async createAppointmentHttp(data) {
     try {
-      console.log("[APPOINTMENT_SERVICE] Creating appointment");
-      const validatedData = await createAppointmentSchema.parseAsync(data);
-      const aggregatedInfo = await fetchAggregatedInfoUtil(
-        this.db,
-        validatedData.clinicBranchId,
-        validatedData.practitionerId,
-        validatedData.patientId,
-        validatedData.procedureId
-      );
-      const appointment = await createAppointmentUtil2(
-        this.db,
-        validatedData,
-        aggregatedInfo,
-        this.generateId.bind(this)
-      );
       console.log(
-        `[APPOINTMENT_SERVICE] Appointment created with ID: ${appointment.id}`
+        "[APPOINTMENT_SERVICE] Creating appointment via cloud function"
       );
-      return appointment;
-    } catch (error) {
-      console.error("[APPOINTMENT_SERVICE] Error creating appointment:", error);
-      throw error;
-    }
-  }
-  /**
-   * Gets an appointment by ID.
-   *
-   * @param appointmentId ID of the appointment to retrieve
-   * @returns The appointment or null if not found
-   */
-  async getAppointmentById(appointmentId) {
-    try {
+      const currentUser = this.auth.currentUser;
+      if (!currentUser) {
+        throw new Error("User must be authenticated to create an appointment");
+      }
+      const idToken = await currentUser.getIdToken();
+      const functionUrl = `https://europe-west6-metaestetics.cloudfunctions.net/bookingApi/orchestrateAppointmentCreation`;
+      const requestData = {
+        patientId: data.patientId,
+        procedureId: data.procedureId,
+        appointmentStartTime: data.appointmentStartTime.toMillis ? data.appointmentStartTime.toMillis() : new Date(data.appointmentStartTime).getTime(),
+        appointmentEndTime: data.appointmentEndTime.toMillis ? data.appointmentEndTime.toMillis() : new Date(data.appointmentEndTime).getTime(),
+        patientNotes: data.patientNotes || null
+      };
       console.log(
-        `[APPOINTMENT_SERVICE] Getting appointment with ID: ${appointmentId}`
+        `[APPOINTMENT_SERVICE] Making fetch request to ${functionUrl}`
       );
-      const appointment = await getAppointmentByIdUtil(this.db, appointmentId);
+      const response = await fetch(functionUrl, {
+        method: "POST",
+        mode: "cors",
+        cache: "no-cache",
+        credentials: "omit",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${idToken}`
+        },
+        redirect: "follow",
+        referrerPolicy: "no-referrer",
+        body: JSON.stringify(requestData)
+      });
+      console.log(
+        `[APPOINTMENT_SERVICE] Received response ${response.status}: ${response.statusText}`
+      );
+      if (!response.ok) {
+        const errorText = await response.text();
+        console.error(
+          `[APPOINTMENT_SERVICE] Error response details: ${errorText}`
+        );
+        throw new Error(
+          `Failed to create appointment: ${response.status} ${response.statusText} - ${errorText}`
+        );
+      }
+      const result = await response.json();
+      if (!result.success) {
+        throw new Error(result.error || "Failed to create appointment");
+      }
+      if (result.appointmentData) {
+        console.log(
+          `[APPOINTMENT_SERVICE] Appointment created with ID: ${result.appointmentId}`
+        );
+        return result.appointmentData;
+      }
+      const createdAppointment = await this.getAppointmentById(
+        result.appointmentId
+      );
+      if (!createdAppointment) {
+        throw new Error(
+          `Failed to retrieve created appointment with ID: ${result.appointmentId}`
+        );
+      }
+      return createdAppointment;
+    } catch (error) {
+      console.error(
+        "[APPOINTMENT_SERVICE] Error creating appointment via cloud function:",
+        error
+      );
+      throw error;
+    }
+  }
+  /**
+   * Gets an appointment by ID.
+   *
+   * @param appointmentId ID of the appointment to retrieve
+   * @returns The appointment or null if not found
+   */
+  async getAppointmentById(appointmentId) {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting appointment with ID: ${appointmentId}`
+      );
+      const appointment = await getAppointmentByIdUtil(this.db, appointmentId);
       console.log(
         `[APPOINTMENT_SERVICE] Appointment ${appointmentId} ${appointment ? "found" : "not found"}`
       );
@@ -12732,192 +12806,340 @@ var AppointmentService = class extends BaseService {
    *
    * @param appointmentId ID of the appointment
    * @param newStatus New status to set
-   * @param cancellationReason Required if canceling the appointment
-   * @param canceledBy Required if canceling the appointment
+   * @param details Optional details for the status change
    * @returns The updated appointment
    */
-  async updateAppointmentStatus(appointmentId, newStatus, cancellationReason, canceledBy) {
+  async updateAppointmentStatus(appointmentId, newStatus, details) {
     console.log(
       `[APPOINTMENT_SERVICE] Updating status of appointment ${appointmentId} to ${newStatus}`
     );
-    const updateData = { status: newStatus };
-    if (newStatus === "canceled_clinic" /* CANCELED_CLINIC */ || newStatus === "canceled_patient" /* CANCELED_PATIENT */) {
-      if (!cancellationReason) {
-        throw new Error(
-          "Cancellation reason is required when canceling an appointment"
-        );
+    const updateData = {
+      status: newStatus,
+      updatedAt: serverTimestamp24()
+    };
+    if (newStatus === "canceled_clinic" /* CANCELED_CLINIC */ || newStatus === "canceled_patient" /* CANCELED_PATIENT */ || newStatus === "canceled_patient_rescheduled" /* CANCELED_PATIENT_RESCHEDULED */) {
+      if (!(details == null ? void 0 : details.cancellationReason)) {
+        throw new Error("Cancellation reason is required when canceling.");
       }
-      if (!canceledBy) {
-        throw new Error(
-          "Canceled by is required when canceling an appointment"
-        );
+      if (!(details == null ? void 0 : details.canceledBy)) {
+        throw new Error("Canceled by is required when canceling.");
       }
-      updateData.cancellationReason = cancellationReason;
-      updateData.canceledBy = canceledBy;
+      updateData.cancellationReason = details.cancellationReason;
+      updateData.canceledBy = details.canceledBy;
+      updateData.cancellationTime = Timestamp28.now();
     }
     if (newStatus === "confirmed" /* CONFIRMED */) {
       updateData.confirmationTime = Timestamp28.now();
     }
+    if (newStatus === "rescheduled_by_clinic" /* RESCHEDULED_BY_CLINIC */) {
+      updateData.rescheduleTime = Timestamp28.now();
+    }
     return this.updateAppointment(appointmentId, updateData);
   }
   /**
-   * Confirms an appointment.
-   *
-   * @param appointmentId ID of the appointment to confirm
-   * @returns The confirmed appointment
+   * Confirms a PENDING appointment by an Admin/Clinic.
    */
-  async confirmAppointment(appointmentId) {
+  async confirmAppointmentAdmin(appointmentId) {
     console.log(
-      `[APPOINTMENT_SERVICE] Confirming appointment: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] Admin confirming appointment: ${appointmentId}`
     );
+    const appointment = await this.getAppointmentById(appointmentId);
+    if (!appointment)
+      throw new Error(`Appointment ${appointmentId} not found.`);
+    if (appointment.status !== "pending" /* PENDING */) {
+      throw new Error(
+        `Appointment ${appointmentId} is not in PENDING state to be confirmed.`
+      );
+    }
     return this.updateAppointmentStatus(
       appointmentId,
       "confirmed" /* CONFIRMED */
     );
   }
   /**
-   * Cancels an appointment from the clinic side.
-   *
-   * @param appointmentId ID of the appointment to cancel
-   * @param reason Reason for cancellation
-   * @returns The canceled appointment
+   * Cancels an appointment by the User (Patient).
    */
-  async cancelAppointmentByClinic(appointmentId, reason) {
+  async cancelAppointmentUser(appointmentId, reason) {
     console.log(
-      `[APPOINTMENT_SERVICE] Canceling appointment by clinic: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] User canceling appointment: ${appointmentId}`
+    );
+    return this.updateAppointmentStatus(
+      appointmentId,
+      "canceled_patient" /* CANCELED_PATIENT */,
+      {
+        cancellationReason: reason,
+        canceledBy: "patient"
+      }
+    );
+  }
+  /**
+   * Cancels an appointment by an Admin/Clinic.
+   */
+  async cancelAppointmentAdmin(appointmentId, reason) {
+    console.log(
+      `[APPOINTMENT_SERVICE] Admin canceling appointment: ${appointmentId}`
     );
     return this.updateAppointmentStatus(
       appointmentId,
       "canceled_clinic" /* CANCELED_CLINIC */,
-      reason,
-      "clinic"
+      {
+        cancellationReason: reason,
+        canceledBy: "clinic"
+      }
     );
   }
   /**
-   * Cancels an appointment from the patient side.
-   *
-   * @param appointmentId ID of the appointment to cancel
-   * @param reason Reason for cancellation
-   * @returns The canceled appointment
+   * Admin proposes to reschedule an appointment.
+   * Sets status to RESCHEDULED_BY_CLINIC and updates times.
    */
-  async cancelAppointmentByPatient(appointmentId, reason) {
+  async rescheduleAppointmentAdmin(appointmentId, newStartTime, newEndTime) {
     console.log(
-      `[APPOINTMENT_SERVICE] Canceling appointment by patient: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] Admin rescheduling appointment: ${appointmentId}`
     );
+    if (newEndTime.toMillis() <= newStartTime.toMillis()) {
+      throw new Error("New end time must be after new start time.");
+    }
+    const updateData = {
+      status: "rescheduled_by_clinic" /* RESCHEDULED_BY_CLINIC */,
+      appointmentStartTime: newStartTime,
+      appointmentEndTime: newEndTime,
+      rescheduleTime: Timestamp28.now(),
+      confirmationTime: null,
+      updatedAt: serverTimestamp24()
+    };
+    return this.updateAppointment(appointmentId, updateData);
+  }
+  /**
+   * User confirms a reschedule proposed by the clinic.
+   * Status changes from RESCHEDULED_BY_CLINIC to CONFIRMED.
+   */
+  async rescheduleAppointmentConfirmUser(appointmentId) {
+    console.log(
+      `[APPOINTMENT_SERVICE] User confirming reschedule for: ${appointmentId}`
+    );
+    const appointment = await this.getAppointmentById(appointmentId);
+    if (!appointment)
+      throw new Error(`Appointment ${appointmentId} not found.`);
+    if (appointment.status !== "rescheduled_by_clinic" /* RESCHEDULED_BY_CLINIC */) {
+      throw new Error(
+        `Appointment ${appointmentId} is not in RESCHEDULED_BY_CLINIC state.`
+      );
+    }
     return this.updateAppointmentStatus(
       appointmentId,
-      "canceled_patient" /* CANCELED_PATIENT */,
-      reason,
-      "patient"
+      "confirmed" /* CONFIRMED */
     );
   }
   /**
-   * Marks an appointment as checked in.
-   *
-   * @param appointmentId ID of the appointment
-   * @returns The updated appointment
+   * User rejects a reschedule proposed by the clinic.
+   * Status changes from RESCHEDULED_BY_CLINIC to CANCELED_PATIENT_RESCHEDULED.
    */
-  async checkInAppointment(appointmentId) {
+  async rescheduleAppointmentRejectUser(appointmentId, reason) {
     console.log(
-      `[APPOINTMENT_SERVICE] Checking in appointment: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] User rejecting reschedule for: ${appointmentId}`
     );
+    const appointment = await this.getAppointmentById(appointmentId);
+    if (!appointment)
+      throw new Error(`Appointment ${appointmentId} not found.`);
+    if (appointment.status !== "rescheduled_by_clinic" /* RESCHEDULED_BY_CLINIC */) {
+      throw new Error(
+        `Appointment ${appointmentId} is not in RESCHEDULED_BY_CLINIC state.`
+      );
+    }
     return this.updateAppointmentStatus(
       appointmentId,
-      "checked_in" /* CHECKED_IN */
+      "canceled_patient_rescheduled" /* CANCELED_PATIENT_RESCHEDULED */,
+      {
+        cancellationReason: reason,
+        canceledBy: "patient"
+      }
     );
   }
   /**
-   * Marks an appointment as in progress.
-   *
-   * @param appointmentId ID of the appointment
-   * @returns The updated appointment
+   * Admin checks in a patient for their appointment.
+   * Requires all pending user forms to be completed.
    */
-  async startAppointment(appointmentId) {
-    console.log(`[APPOINTMENT_SERVICE] Starting appointment: ${appointmentId}`);
+  async checkInPatientAdmin(appointmentId) {
+    console.log(
+      `[APPOINTMENT_SERVICE] Admin checking in patient for: ${appointmentId}`
+    );
+    const appointment = await this.getAppointmentById(appointmentId);
+    if (!appointment)
+      throw new Error(`Appointment ${appointmentId} not found.`);
+    if (appointment.pendingUserFormsIds && appointment.pendingUserFormsIds.length > 0) {
+      throw new Error(
+        `Cannot check in: Patient has ${appointment.pendingUserFormsIds.length} pending required form(s). IDs: ${appointment.pendingUserFormsIds.join(
+          ", "
+        )}`
+      );
+    }
+    if (appointment.status !== "confirmed" /* CONFIRMED */ && appointment.status !== "rescheduled_by_clinic" /* RESCHEDULED_BY_CLINIC */) {
+      console.warn(
+        `Checking in appointment ${appointmentId} with status ${appointment.status}. Ensure this is intended.`
+      );
+    }
     return this.updateAppointmentStatus(
       appointmentId,
-      "in_progress" /* IN_PROGRESS */
+      "checked_in" /* CHECKED_IN */
     );
   }
   /**
-   * Marks an appointment as completed.
-   *
-   * @param appointmentId ID of the appointment
-   * @param actualDurationMinutes Actual duration of the appointment in minutes
-   * @returns The updated appointment
+   * Doctor starts the appointment procedure.
    */
-  async completeAppointment(appointmentId, actualDurationMinutes) {
+  async startAppointmentDoctor(appointmentId) {
     console.log(
-      `[APPOINTMENT_SERVICE] Completing appointment: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] Doctor starting appointment: ${appointmentId}`
     );
+    const appointment = await this.getAppointmentById(appointmentId);
+    if (!appointment)
+      throw new Error(`Appointment ${appointmentId} not found.`);
+    if (appointment.status !== "checked_in" /* CHECKED_IN */) {
+      throw new Error(
+        `Appointment ${appointmentId} must be CHECKED_IN to start.`
+      );
+    }
+    const updateData = {
+      status: "in_progress" /* IN_PROGRESS */,
+      procedureActualStartTime: Timestamp28.now(),
+      // Set actual start time
+      updatedAt: serverTimestamp24()
+    };
+    return this.updateAppointment(appointmentId, updateData);
+  }
+  /**
+   * Doctor completes and finalizes the appointment.
+   */
+  async completeAppointmentDoctor(appointmentId, finalizationNotes, actualDurationMinutesInput) {
+    console.log(
+      `[APPOINTMENT_SERVICE] Doctor completing appointment: ${appointmentId}`
+    );
+    const currentUser = this.auth.currentUser;
+    if (!currentUser)
+      throw new Error("Authentication required to complete appointment.");
+    const appointment = await this.getAppointmentById(appointmentId);
+    if (!appointment)
+      throw new Error(`Appointment ${appointmentId} not found.`);
+    let calculatedDurationMinutes = actualDurationMinutesInput;
+    const procedureCompletionTime = Timestamp28.now();
+    if (calculatedDurationMinutes === void 0 && appointment.procedureActualStartTime) {
+      const startTimeMillis = appointment.procedureActualStartTime.toMillis();
+      const endTimeMillis = procedureCompletionTime.toMillis();
+      if (endTimeMillis > startTimeMillis) {
+        calculatedDurationMinutes = Math.round(
+          (endTimeMillis - startTimeMillis) / 6e4
+        );
+      }
+    }
     const updateData = {
       status: "completed" /* COMPLETED */,
-      actualDurationMinutes
+      actualDurationMinutes: calculatedDurationMinutes,
+      // Use calculated or provided duration
+      finalizedDetails: {
+        by: currentUser.uid,
+        // This is used ID, not practitioner's profile ID (just so we know who completed the appointment)
+        at: procedureCompletionTime,
+        // Use consistent completion timestamp
+        notes: finalizationNotes
+      },
+      // Optionally update appointmentEndTime to the actual completion time
+      // appointmentEndTime: procedureCompletionTime,
+      updatedAt: serverTimestamp24()
     };
     return this.updateAppointment(appointmentId, updateData);
   }
   /**
-   * Marks an appointment as no-show.
-   *
-   * @param appointmentId ID of the appointment
-   * @returns The updated appointment
+   * Admin marks an appointment as No-Show.
    */
-  async markNoShow(appointmentId) {
+  async markNoShowAdmin(appointmentId) {
     console.log(
-      `[APPOINTMENT_SERVICE] Marking appointment as no-show: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] Admin marking no-show for: ${appointmentId}`
     );
+    const appointment = await this.getAppointmentById(appointmentId);
+    if (!appointment)
+      throw new Error(`Appointment ${appointmentId} not found.`);
+    if (Timestamp28.now().toMillis() < appointment.appointmentStartTime.toMillis()) {
+      throw new Error("Cannot mark no-show before appointment start time.");
+    }
     return this.updateAppointmentStatus(
       appointmentId,
-      "no_show" /* NO_SHOW */
+      "no_show" /* NO_SHOW */,
+      {
+        cancellationReason: "Patient did not show up for the appointment.",
+        canceledBy: "clinic"
+      }
     );
   }
   /**
-   * Updates the payment status of an appointment.
-   *
-   * @param appointmentId ID of the appointment
-   * @param paymentStatus New payment status
-   * @param paymentTransactionId Optional transaction ID for the payment
-   * @returns The updated appointment
+   * Adds a media item to an appointment.
    */
-  async updatePaymentStatus(appointmentId, paymentStatus, paymentTransactionId) {
+  async addMediaToAppointment(appointmentId, mediaItemData) {
     console.log(
-      `[APPOINTMENT_SERVICE] Updating payment status of appointment ${appointmentId} to ${paymentStatus}`
+      `[APPOINTMENT_SERVICE] Adding media to appointment ${appointmentId}`
+    );
+    const currentUser = this.auth.currentUser;
+    if (!currentUser) throw new Error("Authentication required.");
+    const newMediaItem = {
+      ...mediaItemData,
+      id: this.generateId(),
+      uploadedAt: Timestamp28.now(),
+      uploadedBy: currentUser.uid
+    };
+    const updateData = {
+      media: arrayUnion8(newMediaItem),
+      updatedAt: serverTimestamp24()
+    };
+    return this.updateAppointment(appointmentId, updateData);
+  }
+  /**
+   * Removes a media item from an appointment.
+   */
+  async removeMediaFromAppointment(appointmentId, mediaItemId) {
+    console.log(
+      `[APPOINTMENT_SERVICE] Removing media ${mediaItemId} from appointment ${appointmentId}`
     );
+    const appointment = await this.getAppointmentById(appointmentId);
+    if (!appointment || !appointment.media) {
+      throw new Error("Appointment or media list not found.");
+    }
+    const mediaToRemove = appointment.media.find((m) => m.id === mediaItemId);
+    if (!mediaToRemove) {
+      throw new Error(`Media item ${mediaItemId} not found in appointment.`);
+    }
     const updateData = {
-      paymentStatus,
-      paymentTransactionId: paymentTransactionId || null
+      media: arrayRemove7(mediaToRemove),
+      updatedAt: serverTimestamp24()
     };
     return this.updateAppointment(appointmentId, updateData);
   }
   /**
-   * Marks pre-procedure requirements as completed.
-   *
-   * @param appointmentId ID of the appointment
-   * @param requirementIds IDs of the requirements to mark as completed
-   * @returns The updated appointment
+   * Adds or updates review information for an appointment.
    */
-  async completePreRequirements(appointmentId, requirementIds) {
+  async addReviewToAppointment(appointmentId, reviewData) {
     console.log(
-      `[APPOINTMENT_SERVICE] Marking pre-requirements as completed for appointment: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] Adding review to appointment ${appointmentId}`
     );
+    const newReviewInfo = {
+      ...reviewData,
+      reviewId: this.generateId(),
+      reviewedAt: Timestamp28.now()
+    };
     const updateData = {
-      completedPreRequirements: requirementIds
+      reviewInfo: newReviewInfo,
+      updatedAt: serverTimestamp24()
     };
     return this.updateAppointment(appointmentId, updateData);
   }
   /**
-   * Marks post-procedure requirements as completed.
-   *
-   * @param appointmentId ID of the appointment
-   * @param requirementIds IDs of the requirements to mark as completed
-   * @returns The updated appointment
+   * Updates the payment status of an appointment.
    */
-  async completePostRequirements(appointmentId, requirementIds) {
+  async updatePaymentStatus(appointmentId, paymentStatus, paymentTransactionId) {
     console.log(
-      `[APPOINTMENT_SERVICE] Marking post-requirements as completed for appointment: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] Updating payment status of appointment ${appointmentId} to ${paymentStatus}`
     );
     const updateData = {
-      completedPostRequirements: requirementIds
+      paymentStatus,
+      paymentTransactionId: paymentTransactionId || null,
+      updatedAt: serverTimestamp24()
     };
     return this.updateAppointment(appointmentId, updateData);
   }
@@ -12937,37 +13159,224 @@ var AppointmentService = class extends BaseService {
     };
     return this.updateAppointment(appointmentId, updateData);
   }
+};
+
+// src/services/patient/patientRequirements.service.ts
+import {
+  collection as collection26,
+  getDocs as getDocs26,
+  query as query26,
+  where as where26,
+  doc as doc27,
+  updateDoc as updateDoc26,
+  Timestamp as Timestamp29,
+  orderBy as orderBy13,
+  limit as limit11,
+  startAfter as startAfter11,
+  getDoc as getDoc29
+} from "firebase/firestore";
+
+// src/types/patient/patient-requirements.ts
+var PatientInstructionStatus = /* @__PURE__ */ ((PatientInstructionStatus2) => {
+  PatientInstructionStatus2["PENDING_NOTIFICATION"] = "pendingNotification";
+  PatientInstructionStatus2["ACTION_DUE"] = "actionDue";
+  PatientInstructionStatus2["ACTION_TAKEN"] = "actionTaken";
+  PatientInstructionStatus2["MISSED"] = "missed";
+  PatientInstructionStatus2["CANCELLED"] = "cancelled";
+  PatientInstructionStatus2["SKIPPED"] = "skipped";
+  return PatientInstructionStatus2;
+})(PatientInstructionStatus || {});
+var PatientRequirementOverallStatus = /* @__PURE__ */ ((PatientRequirementOverallStatus2) => {
+  PatientRequirementOverallStatus2["ACTIVE"] = "active";
+  PatientRequirementOverallStatus2["ALL_INSTRUCTIONS_MET"] = "allInstructionsMet";
+  PatientRequirementOverallStatus2["PARTIALLY_COMPLETED"] = "partiallyCompleted";
+  PatientRequirementOverallStatus2["FAILED"] = "failed";
+  PatientRequirementOverallStatus2["CANCELLED_APPOINTMENT"] = "cancelledAppointment";
+  PatientRequirementOverallStatus2["SUPERSEDED_RESCHEDULE"] = "supersededReschedule";
+  PatientRequirementOverallStatus2["FAILED_TO_PROCESS"] = "failedToProcess";
+  return PatientRequirementOverallStatus2;
+})(PatientRequirementOverallStatus || {});
+var PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME = "patientRequirements";
+
+// src/services/patient/patientRequirements.service.ts
+var PatientRequirementsService = class extends BaseService {
+  constructor(db, auth, app) {
+    super(db, auth, app);
+  }
+  getPatientRequirementsCollectionRef(patientId) {
+    return collection26(
+      this.db,
+      `patients/${patientId}/${PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME}`
+    );
+  }
+  getPatientRequirementDocRef(patientId, instanceId) {
+    return doc27(
+      this.getPatientRequirementsCollectionRef(patientId),
+      instanceId
+    );
+  }
   /**
-   * Debug helper: Get the current user's ID token for testing purposes
-   * Use this token in Postman with Authorization: Bearer TOKEN
+   * Gets a specific patient requirement instance by its ID.
+   * @param patientId - The ID of the patient.
+   * @param instanceId - The ID of the requirement instance.
+   * @returns The patient requirement instance or null if not found.
    */
-  async getDebugToken() {
-    try {
-      const currentUser = this.auth.currentUser;
-      if (!currentUser) {
-        console.log("[APPOINTMENT_SERVICE] No user is signed in");
-        return null;
-      }
-      const idToken = await currentUser.getIdToken();
-      console.log("[APPOINTMENT_SERVICE] Debug token:", idToken);
-      return idToken;
-    } catch (error) {
-      console.error("[APPOINTMENT_SERVICE] Error getting debug token:", error);
+  async getPatientRequirementInstance(patientId, instanceId) {
+    const docRef = this.getPatientRequirementDocRef(patientId, instanceId);
+    const docSnap = await getDoc29(docRef);
+    if (!docSnap.exists()) {
       return null;
     }
+    const data = docSnap.data();
+    return { id: docSnap.id, ...data };
   }
+  /**
+   * Retrieves patient requirement instances based on specified filters.
+   * This is a flexible query method.
+   *
+   * @param patientId - The ID of the patient.
+   * @param filters - Optional filters for appointmentId, overall statuses, instruction statuses, and due timeframes.
+   * @param pageLimit - Optional limit for pagination.
+   * @param lastVisible - Optional last document snapshot for pagination.
+   * @returns A promise resolving to an array of matching patient requirement instances and the last document snapshot.
+   */
+  async getAllPatientRequirementInstances(patientId, filters, pageLimit = 20, lastVisible) {
+    const collRef = this.getPatientRequirementsCollectionRef(patientId);
+    let q = query26(collRef, orderBy13("createdAt", "desc"));
+    const queryConstraints = [];
+    if ((filters == null ? void 0 : filters.appointmentId) && filters.appointmentId !== "all") {
+      queryConstraints.push(
+        where26("appointmentId", "==", filters.appointmentId)
+      );
+    }
+    if ((filters == null ? void 0 : filters.statuses) && filters.statuses.length > 0) {
+      queryConstraints.push(where26("overallStatus", "in", filters.statuses));
+    }
+    if (lastVisible) {
+      queryConstraints.push(startAfter11(lastVisible));
+    }
+    queryConstraints.push(limit11(pageLimit));
+    q = query26(collRef, ...queryConstraints);
+    const snapshot = await getDocs26(q);
+    let requirements = snapshot.docs.map((docSnap) => {
+      const data = docSnap.data();
+      return { id: docSnap.id, ...data };
+    });
+    if ((filters == null ? void 0 : filters.instructionStatuses) && filters.instructionStatuses.length > 0) {
+      requirements = requirements.filter(
+        (req) => req.instructions.some(
+          (instr) => filters.instructionStatuses.includes(instr.status)
+        )
+      );
+    }
+    if (filters == null ? void 0 : filters.dueBefore) {
+      const dueBeforeMillis = filters.dueBefore.toMillis();
+      requirements = requirements.filter(
+        (req) => req.instructions.some(
+          (instr) => instr.dueTime.toMillis() < dueBeforeMillis
+        )
+      );
+    }
+    if (filters == null ? void 0 : filters.dueAfter) {
+      const dueAfterMillis = filters.dueAfter.toMillis();
+      requirements = requirements.filter(
+        (req) => req.instructions.some(
+          (instr) => instr.dueTime.toMillis() > dueAfterMillis
+        )
+      );
+    }
+    const newLastVisible = snapshot.docs[snapshot.docs.length - 1] || null;
+    return { requirements, lastDoc: newLastVisible };
+  }
+  /**
+   * Marks a specific instruction within a PatientRequirementInstance as ACTION_TAKEN.
+   * If all instructions are actioned, updates the overallStatus of the instance.
+   *
+   * @param patientId - The ID of the patient.
+   * @param instanceId - The ID of the PatientRequirementInstance.
+   * @param instructionId - The ID of the instruction to complete.
+   * @returns The updated PatientRequirementInstance.
+   * @throws Error if the instance or instruction is not found, or if the instruction is not in a completable state.
+   */
+  async completeInstruction(patientId, instanceId, instructionId) {
+    const instanceRef = this.getPatientRequirementDocRef(patientId, instanceId);
+    const instanceSnap = await getDoc29(instanceRef);
+    if (!instanceSnap.exists()) {
+      throw new Error(
+        `PatientRequirementInstance ${instanceId} not found for patient ${patientId}.`
+      );
+    }
+    const instanceData = instanceSnap.data();
+    const instance = { id: instanceSnap.id, ...instanceData };
+    const instructionIndex = instance.instructions.findIndex(
+      (instr) => instr.instructionId === instructionId
+    );
+    if (instructionIndex === -1) {
+      throw new Error(
+        `Instruction ${instructionId} not found in instance ${instanceId}.`
+      );
+    }
+    const instructionToUpdate = instance.instructions[instructionIndex];
+    if (instructionToUpdate.status !== "pendingNotification" /* PENDING_NOTIFICATION */ && instructionToUpdate.status !== "actionDue" /* ACTION_DUE */ && instructionToUpdate.status !== "missed" /* MISSED */) {
+      if (instructionToUpdate.status === "actionTaken" /* ACTION_TAKEN */) {
+        console.warn(
+          `Instruction ${instructionId} is already marked as ACTION_TAKEN.`
+        );
+        return instance;
+      }
+      throw new Error(
+        `Instruction ${instructionId} is in status ${instructionToUpdate.status} and cannot be marked as completed.`
+      );
+    }
+    const now = Timestamp29.now();
+    const updatedInstructions = [...instance.instructions];
+    updatedInstructions[instructionIndex] = {
+      ...instructionToUpdate,
+      status: "actionTaken" /* ACTION_TAKEN */,
+      actionTakenAt: now,
+      updatedAt: now
+    };
+    const allActionTaken = updatedInstructions.every(
+      (instr) => instr.status === "actionTaken" /* ACTION_TAKEN */
+    );
+    let newOverallStatus = instance.overallStatus;
+    if (allActionTaken) {
+      newOverallStatus = "allInstructionsMet" /* ALL_INSTRUCTIONS_MET */;
+    } else if (updatedInstructions.some(
+      (instr) => instr.status === "actionTaken" /* ACTION_TAKEN */
+    )) {
+      newOverallStatus = "partiallyCompleted" /* PARTIALLY_COMPLETED */;
+    }
+    const updatePayload = {
+      // Using a general type for updateDoc payload
+      instructions: updatedInstructions,
+      updatedAt: now
+    };
+    if (newOverallStatus !== instance.overallStatus) {
+      updatePayload.overallStatus = newOverallStatus;
+    }
+    await updateDoc26(instanceRef, updatePayload);
+    return {
+      ...instance,
+      instructions: updatedInstructions,
+      updatedAt: now,
+      overallStatus: newOverallStatus
+    };
+  }
+  // Note: As per the request, full CRUD (create, direct update of instance, delete) is not part of this light service,
+  // as those will be handled by Cloud Functions reacting to appointment lifecycle events.
 };
 
 // src/backoffice/services/brand.service.ts
 import {
   addDoc as addDoc3,
-  collection as collection26,
-  doc as doc27,
-  getDoc as getDoc29,
-  getDocs as getDocs26,
-  query as query26,
-  updateDoc as updateDoc26,
-  where as where26
+  collection as collection27,
+  doc as doc28,
+  getDoc as getDoc30,
+  getDocs as getDocs27,
+  query as query27,
+  updateDoc as updateDoc27,
+  where as where27
 } from "firebase/firestore";
 
 // src/backoffice/types/brand.types.ts
@@ -12979,7 +13388,7 @@ var BrandService = class extends BaseService {
    * Gets reference to brands collection
    */
   getBrandsRef() {
-    return collection26(this.db, BRANDS_COLLECTION);
+    return collection27(this.db, BRANDS_COLLECTION);
   }
   /**
    * Creates a new brand
@@ -12999,12 +13408,12 @@ var BrandService = class extends BaseService {
    * Gets all active brands
    */
   async getAll() {
-    const q = query26(this.getBrandsRef(), where26("isActive", "==", true));
-    const snapshot = await getDocs26(q);
+    const q = query27(this.getBrandsRef(), where27("isActive", "==", true));
+    const snapshot = await getDocs27(q);
     return snapshot.docs.map(
-      (doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      (doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       })
     );
   }
@@ -13016,8 +13425,8 @@ var BrandService = class extends BaseService {
       ...brand,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc27(this.getBrandsRef(), brandId);
-    await updateDoc26(docRef, updateData);
+    const docRef = doc28(this.getBrandsRef(), brandId);
+    await updateDoc27(docRef, updateData);
     return this.getById(brandId);
   }
   /**
@@ -13032,8 +13441,8 @@ var BrandService = class extends BaseService {
    * Gets a brand by ID
    */
   async getById(brandId) {
-    const docRef = doc27(this.getBrandsRef(), brandId);
-    const docSnap = await getDoc29(docRef);
+    const docRef = doc28(this.getBrandsRef(), brandId);
+    const docSnap = await getDoc30(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -13045,13 +13454,13 @@ var BrandService = class extends BaseService {
 // src/backoffice/services/category.service.ts
 import {
   addDoc as addDoc4,
-  collection as collection27,
-  doc as doc28,
-  getDoc as getDoc30,
-  getDocs as getDocs27,
-  query as query27,
-  updateDoc as updateDoc27,
-  where as where27
+  collection as collection28,
+  doc as doc29,
+  getDoc as getDoc31,
+  getDocs as getDocs28,
+  query as query28,
+  updateDoc as updateDoc28,
+  where as where28
 } from "firebase/firestore";
 
 // src/backoffice/types/category.types.ts
@@ -13063,7 +13472,7 @@ var CategoryService = class extends BaseService {
    * Referenca na Firestore kolekciju kategorija
    */
   get categoriesRef() {
-    return collection27(this.db, CATEGORIES_COLLECTION);
+    return collection28(this.db, CATEGORIES_COLLECTION);
   }
   /**
    * Kreira novu kategoriju u sistemu
@@ -13086,12 +13495,12 @@ var CategoryService = class extends BaseService {
    * @returns Lista aktivnih kategorija
    */
   async getAll() {
-    const q = query27(this.categoriesRef, where27("isActive", "==", true));
-    const snapshot = await getDocs27(q);
+    const q = query28(this.categoriesRef, where28("isActive", "==", true));
+    const snapshot = await getDocs28(q);
     return snapshot.docs.map(
-      (doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      (doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       })
     );
   }
@@ -13101,16 +13510,16 @@ var CategoryService = class extends BaseService {
    * @returns Lista kategorija koje pripadaju traženoj familiji
    */
   async getAllByFamily(family) {
-    const q = query27(
+    const q = query28(
       this.categoriesRef,
-      where27("family", "==", family),
-      where27("isActive", "==", true)
+      where28("family", "==", family),
+      where28("isActive", "==", true)
     );
-    const snapshot = await getDocs27(q);
+    const snapshot = await getDocs28(q);
     return snapshot.docs.map(
-      (doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      (doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       })
     );
   }
@@ -13125,8 +13534,8 @@ var CategoryService = class extends BaseService {
       ...category,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc28(this.categoriesRef, id);
-    await updateDoc27(docRef, updateData);
+    const docRef = doc29(this.categoriesRef, id);
+    await updateDoc28(docRef, updateData);
     return this.getById(id);
   }
   /**
@@ -13142,8 +13551,8 @@ var CategoryService = class extends BaseService {
    * @returns Kategorija ili null ako ne postoji
    */
   async getById(id) {
-    const docRef = doc28(this.categoriesRef, id);
-    const docSnap = await getDoc30(docRef);
+    const docRef = doc29(this.categoriesRef, id);
+    const docSnap = await getDoc31(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -13155,13 +13564,13 @@ var CategoryService = class extends BaseService {
 // src/backoffice/services/subcategory.service.ts
 import {
   addDoc as addDoc5,
-  collection as collection28,
-  doc as doc29,
-  getDoc as getDoc31,
-  getDocs as getDocs28,
-  query as query28,
-  updateDoc as updateDoc28,
-  where as where28
+  collection as collection29,
+  doc as doc30,
+  getDoc as getDoc32,
+  getDocs as getDocs29,
+  query as query29,
+  updateDoc as updateDoc29,
+  where as where29
 } from "firebase/firestore";
 
 // src/backoffice/types/subcategory.types.ts
@@ -13174,7 +13583,7 @@ var SubcategoryService = class extends BaseService {
    * @param categoryId - ID roditeljske kategorije
    */
   getSubcategoriesRef(categoryId) {
-    return collection28(
+    return collection29(
       this.db,
       CATEGORIES_COLLECTION,
       categoryId,
@@ -13208,15 +13617,15 @@ var SubcategoryService = class extends BaseService {
    * @returns Lista aktivnih podkategorija
    */
   async getAllByCategoryId(categoryId) {
-    const q = query28(
+    const q = query29(
       this.getSubcategoriesRef(categoryId),
-      where28("isActive", "==", true)
+      where29("isActive", "==", true)
     );
-    const snapshot = await getDocs28(q);
+    const snapshot = await getDocs29(q);
     return snapshot.docs.map(
-      (doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      (doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       })
     );
   }
@@ -13232,8 +13641,8 @@ var SubcategoryService = class extends BaseService {
       ...subcategory,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc29(this.getSubcategoriesRef(categoryId), subcategoryId);
-    await updateDoc28(docRef, updateData);
+    const docRef = doc30(this.getSubcategoriesRef(categoryId), subcategoryId);
+    await updateDoc29(docRef, updateData);
     return this.getById(categoryId, subcategoryId);
   }
   /**
@@ -13251,8 +13660,8 @@ var SubcategoryService = class extends BaseService {
    * @returns Podkategorija ili null ako ne postoji
    */
   async getById(categoryId, subcategoryId) {
-    const docRef = doc29(this.getSubcategoriesRef(categoryId), subcategoryId);
-    const docSnap = await getDoc31(docRef);
+    const docRef = doc30(this.getSubcategoriesRef(categoryId), subcategoryId);
+    const docSnap = await getDoc32(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -13264,15 +13673,15 @@ var SubcategoryService = class extends BaseService {
 // src/backoffice/services/technology.service.ts
 import {
   addDoc as addDoc6,
-  collection as collection29,
-  doc as doc30,
-  getDoc as getDoc32,
-  getDocs as getDocs29,
-  query as query29,
-  updateDoc as updateDoc29,
-  where as where29,
-  arrayUnion as arrayUnion8,
-  arrayRemove as arrayRemove7
+  collection as collection30,
+  doc as doc31,
+  getDoc as getDoc33,
+  getDocs as getDocs30,
+  query as query30,
+  updateDoc as updateDoc30,
+  where as where30,
+  arrayUnion as arrayUnion9,
+  arrayRemove as arrayRemove8
 } from "firebase/firestore";
 var DEFAULT_CERTIFICATION_REQUIREMENT = {
   minimumLevel: "aesthetician" /* AESTHETICIAN */,
@@ -13283,7 +13692,7 @@ var TechnologyService = class extends BaseService {
    * Vraća referencu na Firestore kolekciju tehnologija
    */
   getTechnologiesRef() {
-    return collection29(this.db, TECHNOLOGIES_COLLECTION);
+    return collection30(this.db, TECHNOLOGIES_COLLECTION);
   }
   /**
    * Kreira novu tehnologiju
@@ -13314,12 +13723,12 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAll() {
-    const q = query29(this.getTechnologiesRef(), where29("isActive", "==", true));
-    const snapshot = await getDocs29(q);
+    const q = query30(this.getTechnologiesRef(), where30("isActive", "==", true));
+    const snapshot = await getDocs30(q);
     return snapshot.docs.map(
-      (doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      (doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       })
     );
   }
@@ -13329,16 +13738,16 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAllByFamily(family) {
-    const q = query29(
+    const q = query30(
       this.getTechnologiesRef(),
-      where29("isActive", "==", true),
-      where29("family", "==", family)
+      where30("isActive", "==", true),
+      where30("family", "==", family)
     );
-    const snapshot = await getDocs29(q);
+    const snapshot = await getDocs30(q);
     return snapshot.docs.map(
-      (doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      (doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       })
     );
   }
@@ -13348,16 +13757,16 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAllByCategoryId(categoryId) {
-    const q = query29(
+    const q = query30(
       this.getTechnologiesRef(),
-      where29("isActive", "==", true),
-      where29("categoryId", "==", categoryId)
+      where30("isActive", "==", true),
+      where30("categoryId", "==", categoryId)
     );
-    const snapshot = await getDocs29(q);
+    const snapshot = await getDocs30(q);
     return snapshot.docs.map(
-      (doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      (doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       })
     );
   }
@@ -13367,16 +13776,16 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAllBySubcategoryId(subcategoryId) {
-    const q = query29(
+    const q = query30(
       this.getTechnologiesRef(),
-      where29("isActive", "==", true),
-      where29("subcategoryId", "==", subcategoryId)
+      where30("isActive", "==", true),
+      where30("subcategoryId", "==", subcategoryId)
     );
-    const snapshot = await getDocs29(q);
+    const snapshot = await getDocs30(q);
     return snapshot.docs.map(
-      (doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      (doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       })
     );
   }
@@ -13391,8 +13800,8 @@ var TechnologyService = class extends BaseService {
       ...technology,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
-    await updateDoc29(docRef, updateData);
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
+    await updateDoc30(docRef, updateData);
     return this.getById(technologyId);
   }
   /**
@@ -13410,8 +13819,8 @@ var TechnologyService = class extends BaseService {
    * @returns Tehnologija ili null ako ne postoji
    */
   async getById(technologyId) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
-    const docSnap = await getDoc32(docRef);
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
+    const docSnap = await getDoc33(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -13425,10 +13834,10 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija sa novim zahtevom
    */
   async addRequirement(technologyId, requirement) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
     const requirementType = requirement.type === "pre" ? "requirements.pre" : "requirements.post";
-    await updateDoc29(docRef, {
-      [requirementType]: arrayUnion8(requirement),
+    await updateDoc30(docRef, {
+      [requirementType]: arrayUnion9(requirement),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -13440,10 +13849,10 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija bez uklonjenog zahteva
    */
   async removeRequirement(technologyId, requirement) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
     const requirementType = requirement.type === "pre" ? "requirements.pre" : "requirements.post";
-    await updateDoc29(docRef, {
-      [requirementType]: arrayRemove7(requirement),
+    await updateDoc30(docRef, {
+      [requirementType]: arrayRemove8(requirement),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -13480,9 +13889,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async addBlockingCondition(technologyId, condition) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
-    await updateDoc29(docRef, {
-      blockingConditions: arrayUnion8(condition),
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
+    await updateDoc30(docRef, {
+      blockingConditions: arrayUnion9(condition),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -13494,9 +13903,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async removeBlockingCondition(technologyId, condition) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
-    await updateDoc29(docRef, {
-      blockingConditions: arrayRemove7(condition),
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
+    await updateDoc30(docRef, {
+      blockingConditions: arrayRemove8(condition),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -13508,9 +13917,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async addContraindication(technologyId, contraindication) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
-    await updateDoc29(docRef, {
-      contraindications: arrayUnion8(contraindication),
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
+    await updateDoc30(docRef, {
+      contraindications: arrayUnion9(contraindication),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -13522,9 +13931,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async removeContraindication(technologyId, contraindication) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
-    await updateDoc29(docRef, {
-      contraindications: arrayRemove7(contraindication),
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
+    await updateDoc30(docRef, {
+      contraindications: arrayRemove8(contraindication),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -13536,9 +13945,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async addBenefit(technologyId, benefit) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
-    await updateDoc29(docRef, {
-      benefits: arrayUnion8(benefit),
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
+    await updateDoc30(docRef, {
+      benefits: arrayUnion9(benefit),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -13550,9 +13959,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async removeBenefit(technologyId, benefit) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
-    await updateDoc29(docRef, {
-      benefits: arrayRemove7(benefit),
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
+    await updateDoc30(docRef, {
+      benefits: arrayRemove8(benefit),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -13591,8 +14000,8 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async updateCertificationRequirement(technologyId, certificationRequirement) {
-    const docRef = doc30(this.getTechnologiesRef(), technologyId);
-    await updateDoc29(docRef, {
+    const docRef = doc31(this.getTechnologiesRef(), technologyId);
+    await updateDoc30(docRef, {
       certificationRequirement,
       updatedAt: /* @__PURE__ */ new Date()
     });
@@ -13694,13 +14103,13 @@ var TechnologyService = class extends BaseService {
 // src/backoffice/services/product.service.ts
 import {
   addDoc as addDoc7,
-  collection as collection30,
-  doc as doc31,
-  getDoc as getDoc33,
-  getDocs as getDocs30,
-  query as query30,
-  updateDoc as updateDoc30,
-  where as where30
+  collection as collection31,
+  doc as doc32,
+  getDoc as getDoc34,
+  getDocs as getDocs31,
+  query as query31,
+  updateDoc as updateDoc31,
+  where as where31
 } from "firebase/firestore";
 
 // src/backoffice/types/product.types.ts
@@ -13714,7 +14123,7 @@ var ProductService = class extends BaseService {
    * @returns Firestore collection reference
    */
   getProductsRef(technologyId) {
-    return collection30(
+    return collection31(
       this.db,
       TECHNOLOGIES_COLLECTION,
       technologyId,
@@ -13744,15 +14153,15 @@ var ProductService = class extends BaseService {
    * Gets all products for a technology
    */
   async getAllByTechnology(technologyId) {
-    const q = query30(
+    const q = query31(
       this.getProductsRef(technologyId),
-      where30("isActive", "==", true)
+      where31("isActive", "==", true)
     );
-    const snapshot = await getDocs30(q);
+    const snapshot = await getDocs31(q);
     return snapshot.docs.map(
-      (doc32) => ({
-        id: doc32.id,
-        ...doc32.data()
+      (doc33) => ({
+        id: doc33.id,
+        ...doc33.data()
       })
     );
   }
@@ -13760,21 +14169,21 @@ var ProductService = class extends BaseService {
    * Gets all products for a brand by filtering through all technologies
    */
   async getAllByBrand(brandId) {
-    const allTechnologiesRef = collection30(this.db, TECHNOLOGIES_COLLECTION);
-    const technologiesSnapshot = await getDocs30(allTechnologiesRef);
+    const allTechnologiesRef = collection31(this.db, TECHNOLOGIES_COLLECTION);
+    const technologiesSnapshot = await getDocs31(allTechnologiesRef);
     const products = [];
     for (const techDoc of technologiesSnapshot.docs) {
-      const q = query30(
+      const q = query31(
         this.getProductsRef(techDoc.id),
-        where30("brandId", "==", brandId),
-        where30("isActive", "==", true)
+        where31("brandId", "==", brandId),
+        where31("isActive", "==", true)
       );
-      const snapshot = await getDocs30(q);
+      const snapshot = await getDocs31(q);
       products.push(
         ...snapshot.docs.map(
-          (doc32) => ({
-            id: doc32.id,
-            ...doc32.data()
+          (doc33) => ({
+            id: doc33.id,
+            ...doc33.data()
           })
         )
       );
@@ -13789,8 +14198,8 @@ var ProductService = class extends BaseService {
       ...product,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc31(this.getProductsRef(technologyId), productId);
-    await updateDoc30(docRef, updateData);
+    const docRef = doc32(this.getProductsRef(technologyId), productId);
+    await updateDoc31(docRef, updateData);
     return this.getById(technologyId, productId);
   }
   /**
@@ -13805,8 +14214,8 @@ var ProductService = class extends BaseService {
    * Gets a product by ID
    */
   async getById(technologyId, productId) {
-    const docRef = doc31(this.getProductsRef(technologyId), productId);
-    const docSnap = await getDoc33(docRef);
+    const docRef = doc32(this.getProductsRef(technologyId), productId);
+    const docSnap = await getDoc34(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -13835,14 +14244,14 @@ var baseNotificationSchema = z24.object({
   userRole: z24.nativeEnum(UserRole)
 });
 var preRequirementNotificationSchema = baseNotificationSchema.extend({
-  notificationType: z24.literal("preRequirement" /* PRE_REQUIREMENT */),
+  notificationType: z24.literal("requirementInstructionDue" /* REQUIREMENT_INSTRUCTION_DUE */),
   treatmentId: z24.string(),
   requirements: z24.array(z24.string()),
   deadline: z24.any()
   // Timestamp
 });
 var postRequirementNotificationSchema = baseNotificationSchema.extend({
-  notificationType: z24.literal("postRequirement" /* POST_REQUIREMENT */),
+  notificationType: z24.literal("requirementInstructionDue" /* REQUIREMENT_INSTRUCTION_DUE */),
   treatmentId: z24.string(),
   requirements: z24.array(z24.string()),
   deadline: z24.any()
@@ -13857,7 +14266,7 @@ var appointmentReminderNotificationSchema = baseNotificationSchema.extend({
   doctorName: z24.string()
 });
 var appointmentNotificationSchema = baseNotificationSchema.extend({
-  notificationType: z24.literal("appointmentNotification" /* APPOINTMENT_NOTIFICATION */),
+  notificationType: z24.literal("appointmentStatusChange" /* APPOINTMENT_STATUS_CHANGE */),
   appointmentId: z24.string(),
   appointmentStatus: z24.string(),
   previousStatus: z24.string(),
@@ -13953,9 +14362,13 @@ export {
   PATIENT_LOCATION_INFO_COLLECTION,
   PATIENT_MEDICAL_HISTORY_COLLECTION,
   PATIENT_MEDICAL_INFO_COLLECTION,
+  PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME,
   PATIENT_SENSITIVE_INFO_COLLECTION,
   PRACTITIONERS_COLLECTION,
   PROCEDURES_COLLECTION,
+  PatientInstructionStatus,
+  PatientRequirementOverallStatus,
+  PatientRequirementsService,
   PatientService,
   PaymentStatus,
   PracticeType,
@@ -14020,6 +14433,7 @@ export {
   createDefaultClinicGroupSchema,
   createDocumentTemplateSchema,
   createDraftPractitionerSchema,
+  createFilledDocumentDataSchema,
   createPatientLocationInfoSchema,
   createPatientMedicalInfoSchema,
   createPatientProfileSchema,
@@ -14035,6 +14449,8 @@ export {
   documentTemplateSchema,
   emailSchema,
   emergencyContactSchema,
+  filledDocumentSchema,
+  filledDocumentStatusSchema,
   gamificationSchema,
   getFirebaseApp,
   getFirebaseAuth,
@@ -14084,6 +14500,7 @@ export {
   updateClinicSchema,
   updateContraindicationSchema,
   updateDocumentTemplateSchema,
+  updateFilledDocumentDataSchema,
   updateMedicationSchema,
   updatePatientMedicalInfoSchema,
   updateVitalStatsSchema,