@blackcode_sa/metaestetics-api 1.6.16 → 1.6.17

package/dist/index.d.mts

@@ -7389,6 +7389,43 @@ declare class AppointmentService extends BaseService {
      * @returns The updated appointment
      */
     updateInternalNotes(appointmentId: string, notes: string | null): Promise<Appointment>;
+    /**
+     * Gets upcoming appointments for a specific patient.
+     * These include appointments with statuses: PENDING, CONFIRMED, CHECKED_IN, IN_PROGRESS
+     *
+     * @param patientId ID of the patient
+     * @param options Optional parameters for filtering and pagination
+     * @returns Found appointments and the last document for pagination
+     */
+    getUpcomingPatientAppointments(patientId: string, options?: {
+        startDate?: Date;
+        endDate?: Date;
+        limit?: number;
+        startAfter?: DocumentSnapshot;
+    }): Promise<{
+        appointments: Appointment[];
+        lastDoc: DocumentSnapshot | null;
+    }>;
+    /**
+     * Gets past appointments for a specific patient.
+     * These include appointments with statuses: COMPLETED, CANCELED_PATIENT,
+     * CANCELED_PATIENT_RESCHEDULED, CANCELED_CLINIC, NO_SHOW
+     *
+     * @param patientId ID of the patient
+     * @param options Optional parameters for filtering and pagination
+     * @returns Found appointments and the last document for pagination
+     */
+    getPastPatientAppointments(patientId: string, options?: {
+        startDate?: Date;
+        endDate?: Date;
+        showCanceled?: boolean;
+        showNoShow?: boolean;
+        limit?: number;
+        startAfter?: DocumentSnapshot;
+    }): Promise<{
+        appointments: Appointment[];
+        lastDoc: DocumentSnapshot | null;
+    }>;
 }
 
 /**

package/dist/index.d.ts

@@ -7389,6 +7389,43 @@ declare class AppointmentService extends BaseService {
      * @returns The updated appointment
      */
     updateInternalNotes(appointmentId: string, notes: string | null): Promise<Appointment>;
+    /**
+     * Gets upcoming appointments for a specific patient.
+     * These include appointments with statuses: PENDING, CONFIRMED, CHECKED_IN, IN_PROGRESS
+     *
+     * @param patientId ID of the patient
+     * @param options Optional parameters for filtering and pagination
+     * @returns Found appointments and the last document for pagination
+     */
+    getUpcomingPatientAppointments(patientId: string, options?: {
+        startDate?: Date;
+        endDate?: Date;
+        limit?: number;
+        startAfter?: DocumentSnapshot;
+    }): Promise<{
+        appointments: Appointment[];
+        lastDoc: DocumentSnapshot | null;
+    }>;
+    /**
+     * Gets past appointments for a specific patient.
+     * These include appointments with statuses: COMPLETED, CANCELED_PATIENT,
+     * CANCELED_PATIENT_RESCHEDULED, CANCELED_CLINIC, NO_SHOW
+     *
+     * @param patientId ID of the patient
+     * @param options Optional parameters for filtering and pagination
+     * @returns Found appointments and the last document for pagination
+     */
+    getPastPatientAppointments(patientId: string, options?: {
+        startDate?: Date;
+        endDate?: Date;
+        showCanceled?: boolean;
+        showNoShow?: boolean;
+        limit?: number;
+        startAfter?: DocumentSnapshot;
+    }): Promise<{
+        appointments: Appointment[];
+        lastDoc: DocumentSnapshot | null;
+    }>;
 }
 
 /**

package/dist/index.js

@@ -8108,20 +8108,20 @@ var ProcedureService = class extends BaseService {
       const proceduresCollection = (0, import_firestore24.collection)(this.db, PROCEDURES_COLLECTION);
       let proceduresQuery = (0, import_firestore24.query)(proceduresCollection);
       if (pagination && pagination > 0) {
-        const { limit: limit12, startAfter: startAfter12 } = await import("firebase/firestore");
+        const { limit: limit13, startAfter: startAfter13 } = await import("firebase/firestore");
         if (lastDoc) {
           proceduresQuery = (0, import_firestore24.query)(
             proceduresCollection,
             (0, import_firestore24.orderBy)("name"),
             // Use imported orderBy
-            startAfter12(lastDoc),
-            limit12(pagination)
+            startAfter13(lastDoc),
+            limit13(pagination)
           );
         } else {
           proceduresQuery = (0, import_firestore24.query)(
             proceduresCollection,
             (0, import_firestore24.orderBy)("name"),
-            limit12(pagination)
+            limit13(pagination)
           );
         }
       } else {
@@ -13060,6 +13060,147 @@ var AppointmentService = class extends BaseService {
     };
     return this.updateAppointment(appointmentId, updateData);
   }
+  /**
+   * Gets upcoming appointments for a specific patient.
+   * These include appointments with statuses: PENDING, CONFIRMED, CHECKED_IN, IN_PROGRESS
+   *
+   * @param patientId ID of the patient
+   * @param options Optional parameters for filtering and pagination
+   * @returns Found appointments and the last document for pagination
+   */
+  async getUpcomingPatientAppointments(patientId, options) {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting upcoming appointments for patient: ${patientId}`
+      );
+      const effectiveStartDate = (options == null ? void 0 : options.startDate) || /* @__PURE__ */ new Date();
+      const upcomingStatuses = [
+        "pending" /* PENDING */,
+        "confirmed" /* CONFIRMED */,
+        "checked_in" /* CHECKED_IN */,
+        "in_progress" /* IN_PROGRESS */,
+        "rescheduled_by_clinic" /* RESCHEDULED_BY_CLINIC */
+      ];
+      const constraints = [];
+      constraints.push((0, import_firestore40.where)("patientId", "==", patientId));
+      constraints.push((0, import_firestore40.where)("status", "in", upcomingStatuses));
+      constraints.push(
+        (0, import_firestore40.where)(
+          "appointmentStartTime",
+          ">=",
+          import_firestore40.Timestamp.fromDate(effectiveStartDate)
+        )
+      );
+      if (options == null ? void 0 : options.endDate) {
+        constraints.push(
+          (0, import_firestore40.where)(
+            "appointmentStartTime",
+            "<=",
+            import_firestore40.Timestamp.fromDate(options.endDate)
+          )
+        );
+      }
+      constraints.push((0, import_firestore40.orderBy)("appointmentStartTime", "asc"));
+      if (options == null ? void 0 : options.limit) {
+        constraints.push((0, import_firestore40.limit)(options.limit));
+      }
+      if (options == null ? void 0 : options.startAfter) {
+        constraints.push((0, import_firestore40.startAfter)(options.startAfter));
+      }
+      const q = (0, import_firestore40.query)(
+        (0, import_firestore40.collection)(this.db, APPOINTMENTS_COLLECTION),
+        ...constraints
+      );
+      const querySnapshot = await (0, import_firestore40.getDocs)(q);
+      const appointments = querySnapshot.docs.map(
+        (doc33) => doc33.data()
+      );
+      const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+      console.log(
+        `[APPOINTMENT_SERVICE] Found ${appointments.length} upcoming appointments for patient ${patientId}`
+      );
+      return { appointments, lastDoc };
+    } catch (error) {
+      console.error(
+        `[APPOINTMENT_SERVICE] Error getting upcoming appointments for patient ${patientId}:`,
+        error
+      );
+      throw error;
+    }
+  }
+  /**
+   * Gets past appointments for a specific patient.
+   * These include appointments with statuses: COMPLETED, CANCELED_PATIENT,
+   * CANCELED_PATIENT_RESCHEDULED, CANCELED_CLINIC, NO_SHOW
+   *
+   * @param patientId ID of the patient
+   * @param options Optional parameters for filtering and pagination
+   * @returns Found appointments and the last document for pagination
+   */
+  async getPastPatientAppointments(patientId, options) {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting past appointments for patient: ${patientId}`
+      );
+      const effectiveEndDate = (options == null ? void 0 : options.endDate) || /* @__PURE__ */ new Date();
+      const pastStatuses = ["completed" /* COMPLETED */];
+      if (options == null ? void 0 : options.showCanceled) {
+        pastStatuses.push(
+          "canceled_patient" /* CANCELED_PATIENT */,
+          "canceled_patient_rescheduled" /* CANCELED_PATIENT_RESCHEDULED */,
+          "canceled_clinic" /* CANCELED_CLINIC */
+        );
+      }
+      if (options == null ? void 0 : options.showNoShow) {
+        pastStatuses.push("no_show" /* NO_SHOW */);
+      }
+      const constraints = [];
+      constraints.push((0, import_firestore40.where)("patientId", "==", patientId));
+      constraints.push((0, import_firestore40.where)("status", "in", pastStatuses));
+      if (options == null ? void 0 : options.startDate) {
+        constraints.push(
+          (0, import_firestore40.where)(
+            "appointmentStartTime",
+            ">=",
+            import_firestore40.Timestamp.fromDate(options.startDate)
+          )
+        );
+      }
+      constraints.push(
+        (0, import_firestore40.where)(
+          "appointmentStartTime",
+          "<=",
+          import_firestore40.Timestamp.fromDate(effectiveEndDate)
+        )
+      );
+      constraints.push((0, import_firestore40.orderBy)("appointmentStartTime", "desc"));
+      if (options == null ? void 0 : options.limit) {
+        constraints.push((0, import_firestore40.limit)(options.limit));
+      }
+      if (options == null ? void 0 : options.startAfter) {
+        constraints.push((0, import_firestore40.startAfter)(options.startAfter));
+      }
+      const q = (0, import_firestore40.query)(
+        (0, import_firestore40.collection)(this.db, APPOINTMENTS_COLLECTION),
+        ...constraints
+      );
+      const querySnapshot = await (0, import_firestore40.getDocs)(q);
+      const appointments = querySnapshot.docs.map(
+        (doc33) => doc33.data()
+      );
+      const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+      console.log(
+        `[APPOINTMENT_SERVICE] Found ${appointments.length} past appointments for patient ${patientId}`
+      );
+      return { appointments, lastDoc };
+    } catch (error) {
+      console.error(
+        `[APPOINTMENT_SERVICE] Error getting past appointments for patient ${patientId}:`,
+        error
+      );
+      throw error;
+    }
+  }
 };
 
 // src/services/patient/patientRequirements.service.ts

package/dist/index.mjs

@@ -8085,20 +8085,20 @@ var ProcedureService = class extends BaseService {
       const proceduresCollection = collection15(this.db, PROCEDURES_COLLECTION);
       let proceduresQuery = query15(proceduresCollection);
       if (pagination && pagination > 0) {
-        const { limit: limit12, startAfter: startAfter12 } = await import("firebase/firestore");
+        const { limit: limit13, startAfter: startAfter13 } = await import("firebase/firestore");
         if (lastDoc) {
           proceduresQuery = query15(
             proceduresCollection,
             orderBy4("name"),
             // Use imported orderBy
-            startAfter12(lastDoc),
-            limit12(pagination)
+            startAfter13(lastDoc),
+            limit13(pagination)
           );
         } else {
           proceduresQuery = query15(
             proceduresCollection,
             orderBy4("name"),
-            limit12(pagination)
+            limit13(pagination)
           );
         }
       } else {
@@ -12249,7 +12249,14 @@ import {
   Timestamp as Timestamp28,
   serverTimestamp as serverTimestamp24,
   arrayUnion as arrayUnion8,
-  arrayRemove as arrayRemove7
+  arrayRemove as arrayRemove7,
+  where as where26,
+  orderBy as orderBy13,
+  collection as collection26,
+  query as query26,
+  limit as limit11,
+  startAfter as startAfter11,
+  getDocs as getDocs26
 } from "firebase/firestore";
 import { getFunctions } from "firebase/functions";
 
@@ -13162,20 +13169,161 @@ var AppointmentService = class extends BaseService {
     };
     return this.updateAppointment(appointmentId, updateData);
   }
+  /**
+   * Gets upcoming appointments for a specific patient.
+   * These include appointments with statuses: PENDING, CONFIRMED, CHECKED_IN, IN_PROGRESS
+   *
+   * @param patientId ID of the patient
+   * @param options Optional parameters for filtering and pagination
+   * @returns Found appointments and the last document for pagination
+   */
+  async getUpcomingPatientAppointments(patientId, options) {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting upcoming appointments for patient: ${patientId}`
+      );
+      const effectiveStartDate = (options == null ? void 0 : options.startDate) || /* @__PURE__ */ new Date();
+      const upcomingStatuses = [
+        "pending" /* PENDING */,
+        "confirmed" /* CONFIRMED */,
+        "checked_in" /* CHECKED_IN */,
+        "in_progress" /* IN_PROGRESS */,
+        "rescheduled_by_clinic" /* RESCHEDULED_BY_CLINIC */
+      ];
+      const constraints = [];
+      constraints.push(where26("patientId", "==", patientId));
+      constraints.push(where26("status", "in", upcomingStatuses));
+      constraints.push(
+        where26(
+          "appointmentStartTime",
+          ">=",
+          Timestamp28.fromDate(effectiveStartDate)
+        )
+      );
+      if (options == null ? void 0 : options.endDate) {
+        constraints.push(
+          where26(
+            "appointmentStartTime",
+            "<=",
+            Timestamp28.fromDate(options.endDate)
+          )
+        );
+      }
+      constraints.push(orderBy13("appointmentStartTime", "asc"));
+      if (options == null ? void 0 : options.limit) {
+        constraints.push(limit11(options.limit));
+      }
+      if (options == null ? void 0 : options.startAfter) {
+        constraints.push(startAfter11(options.startAfter));
+      }
+      const q = query26(
+        collection26(this.db, APPOINTMENTS_COLLECTION),
+        ...constraints
+      );
+      const querySnapshot = await getDocs26(q);
+      const appointments = querySnapshot.docs.map(
+        (doc33) => doc33.data()
+      );
+      const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+      console.log(
+        `[APPOINTMENT_SERVICE] Found ${appointments.length} upcoming appointments for patient ${patientId}`
+      );
+      return { appointments, lastDoc };
+    } catch (error) {
+      console.error(
+        `[APPOINTMENT_SERVICE] Error getting upcoming appointments for patient ${patientId}:`,
+        error
+      );
+      throw error;
+    }
+  }
+  /**
+   * Gets past appointments for a specific patient.
+   * These include appointments with statuses: COMPLETED, CANCELED_PATIENT,
+   * CANCELED_PATIENT_RESCHEDULED, CANCELED_CLINIC, NO_SHOW
+   *
+   * @param patientId ID of the patient
+   * @param options Optional parameters for filtering and pagination
+   * @returns Found appointments and the last document for pagination
+   */
+  async getPastPatientAppointments(patientId, options) {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting past appointments for patient: ${patientId}`
+      );
+      const effectiveEndDate = (options == null ? void 0 : options.endDate) || /* @__PURE__ */ new Date();
+      const pastStatuses = ["completed" /* COMPLETED */];
+      if (options == null ? void 0 : options.showCanceled) {
+        pastStatuses.push(
+          "canceled_patient" /* CANCELED_PATIENT */,
+          "canceled_patient_rescheduled" /* CANCELED_PATIENT_RESCHEDULED */,
+          "canceled_clinic" /* CANCELED_CLINIC */
+        );
+      }
+      if (options == null ? void 0 : options.showNoShow) {
+        pastStatuses.push("no_show" /* NO_SHOW */);
+      }
+      const constraints = [];
+      constraints.push(where26("patientId", "==", patientId));
+      constraints.push(where26("status", "in", pastStatuses));
+      if (options == null ? void 0 : options.startDate) {
+        constraints.push(
+          where26(
+            "appointmentStartTime",
+            ">=",
+            Timestamp28.fromDate(options.startDate)
+          )
+        );
+      }
+      constraints.push(
+        where26(
+          "appointmentStartTime",
+          "<=",
+          Timestamp28.fromDate(effectiveEndDate)
+        )
+      );
+      constraints.push(orderBy13("appointmentStartTime", "desc"));
+      if (options == null ? void 0 : options.limit) {
+        constraints.push(limit11(options.limit));
+      }
+      if (options == null ? void 0 : options.startAfter) {
+        constraints.push(startAfter11(options.startAfter));
+      }
+      const q = query26(
+        collection26(this.db, APPOINTMENTS_COLLECTION),
+        ...constraints
+      );
+      const querySnapshot = await getDocs26(q);
+      const appointments = querySnapshot.docs.map(
+        (doc33) => doc33.data()
+      );
+      const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+      console.log(
+        `[APPOINTMENT_SERVICE] Found ${appointments.length} past appointments for patient ${patientId}`
+      );
+      return { appointments, lastDoc };
+    } catch (error) {
+      console.error(
+        `[APPOINTMENT_SERVICE] Error getting past appointments for patient ${patientId}:`,
+        error
+      );
+      throw error;
+    }
+  }
 };
 
 // src/services/patient/patientRequirements.service.ts
 import {
-  collection as collection26,
-  getDocs as getDocs26,
-  query as query26,
-  where as where26,
+  collection as collection27,
+  getDocs as getDocs27,
+  query as query27,
+  where as where27,
   doc as doc27,
   updateDoc as updateDoc26,
   Timestamp as Timestamp29,
-  orderBy as orderBy13,
-  limit as limit11,
-  startAfter as startAfter11,
+  orderBy as orderBy14,
+  limit as limit12,
+  startAfter as startAfter12,
   getDoc as getDoc29
 } from "firebase/firestore";
 
@@ -13207,7 +13355,7 @@ var PatientRequirementsService = class extends BaseService {
     super(db, auth, app);
   }
   getPatientRequirementsCollectionRef(patientId) {
-    return collection26(
+    return collection27(
       this.db,
       `patients/${patientId}/${PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME}`
     );
@@ -13245,22 +13393,22 @@ var PatientRequirementsService = class extends BaseService {
    */
   async getAllPatientRequirementInstances(patientId, filters, pageLimit = 20, lastVisible) {
     const collRef = this.getPatientRequirementsCollectionRef(patientId);
-    let q = query26(collRef, orderBy13("createdAt", "desc"));
+    let q = query27(collRef, orderBy14("createdAt", "desc"));
     const queryConstraints = [];
     if ((filters == null ? void 0 : filters.appointmentId) && filters.appointmentId !== "all") {
       queryConstraints.push(
-        where26("appointmentId", "==", filters.appointmentId)
+        where27("appointmentId", "==", filters.appointmentId)
       );
     }
     if ((filters == null ? void 0 : filters.statuses) && filters.statuses.length > 0) {
-      queryConstraints.push(where26("overallStatus", "in", filters.statuses));
+      queryConstraints.push(where27("overallStatus", "in", filters.statuses));
     }
     if (lastVisible) {
-      queryConstraints.push(startAfter11(lastVisible));
+      queryConstraints.push(startAfter12(lastVisible));
     }
-    queryConstraints.push(limit11(pageLimit));
-    q = query26(collRef, ...queryConstraints);
-    const snapshot = await getDocs26(q);
+    queryConstraints.push(limit12(pageLimit));
+    q = query27(collRef, ...queryConstraints);
+    const snapshot = await getDocs27(q);
     let requirements = snapshot.docs.map((docSnap) => {
       const data = docSnap.data();
       return { id: docSnap.id, ...data };
@@ -13373,13 +13521,13 @@ var PatientRequirementsService = class extends BaseService {
 // src/backoffice/services/brand.service.ts
 import {
   addDoc as addDoc3,
-  collection as collection27,
+  collection as collection28,
   doc as doc28,
   getDoc as getDoc30,
-  getDocs as getDocs27,
-  query as query27,
+  getDocs as getDocs28,
+  query as query28,
   updateDoc as updateDoc27,
-  where as where27
+  where as where28
 } from "firebase/firestore";
 
 // src/backoffice/types/brand.types.ts
@@ -13391,7 +13539,7 @@ var BrandService = class extends BaseService {
    * Gets reference to brands collection
    */
   getBrandsRef() {
-    return collection27(this.db, BRANDS_COLLECTION);
+    return collection28(this.db, BRANDS_COLLECTION);
   }
   /**
    * Creates a new brand
@@ -13411,8 +13559,8 @@ var BrandService = class extends BaseService {
    * Gets all active brands
    */
   async getAll() {
-    const q = query27(this.getBrandsRef(), where27("isActive", "==", true));
-    const snapshot = await getDocs27(q);
+    const q = query28(this.getBrandsRef(), where28("isActive", "==", true));
+    const snapshot = await getDocs28(q);
     return snapshot.docs.map(
       (doc33) => ({
         id: doc33.id,
@@ -13457,13 +13605,13 @@ var BrandService = class extends BaseService {
 // src/backoffice/services/category.service.ts
 import {
   addDoc as addDoc4,
-  collection as collection28,
+  collection as collection29,
   doc as doc29,
   getDoc as getDoc31,
-  getDocs as getDocs28,
-  query as query28,
+  getDocs as getDocs29,
+  query as query29,
   updateDoc as updateDoc28,
-  where as where28
+  where as where29
 } from "firebase/firestore";
 
 // src/backoffice/types/category.types.ts
@@ -13475,7 +13623,7 @@ var CategoryService = class extends BaseService {
    * Referenca na Firestore kolekciju kategorija
    */
   get categoriesRef() {
-    return collection28(this.db, CATEGORIES_COLLECTION);
+    return collection29(this.db, CATEGORIES_COLLECTION);
   }
   /**
    * Kreira novu kategoriju u sistemu
@@ -13498,8 +13646,8 @@ var CategoryService = class extends BaseService {
    * @returns Lista aktivnih kategorija
    */
   async getAll() {
-    const q = query28(this.categoriesRef, where28("isActive", "==", true));
-    const snapshot = await getDocs28(q);
+    const q = query29(this.categoriesRef, where29("isActive", "==", true));
+    const snapshot = await getDocs29(q);
     return snapshot.docs.map(
       (doc33) => ({
         id: doc33.id,
@@ -13513,12 +13661,12 @@ var CategoryService = class extends BaseService {
    * @returns Lista kategorija koje pripadaju traženoj familiji
    */
   async getAllByFamily(family) {
-    const q = query28(
+    const q = query29(
       this.categoriesRef,
-      where28("family", "==", family),
-      where28("isActive", "==", true)
+      where29("family", "==", family),
+      where29("isActive", "==", true)
     );
-    const snapshot = await getDocs28(q);
+    const snapshot = await getDocs29(q);
     return snapshot.docs.map(
       (doc33) => ({
         id: doc33.id,
@@ -13567,13 +13715,13 @@ var CategoryService = class extends BaseService {
 // src/backoffice/services/subcategory.service.ts
 import {
   addDoc as addDoc5,
-  collection as collection29,
+  collection as collection30,
   doc as doc30,
   getDoc as getDoc32,
-  getDocs as getDocs29,
-  query as query29,
+  getDocs as getDocs30,
+  query as query30,
   updateDoc as updateDoc29,
-  where as where29
+  where as where30
 } from "firebase/firestore";
 
 // src/backoffice/types/subcategory.types.ts
@@ -13586,7 +13734,7 @@ var SubcategoryService = class extends BaseService {
    * @param categoryId - ID roditeljske kategorije
    */
   getSubcategoriesRef(categoryId) {
-    return collection29(
+    return collection30(
       this.db,
       CATEGORIES_COLLECTION,
       categoryId,
@@ -13620,11 +13768,11 @@ var SubcategoryService = class extends BaseService {
    * @returns Lista aktivnih podkategorija
    */
   async getAllByCategoryId(categoryId) {
-    const q = query29(
+    const q = query30(
       this.getSubcategoriesRef(categoryId),
-      where29("isActive", "==", true)
+      where30("isActive", "==", true)
     );
-    const snapshot = await getDocs29(q);
+    const snapshot = await getDocs30(q);
     return snapshot.docs.map(
       (doc33) => ({
         id: doc33.id,
@@ -13676,13 +13824,13 @@ var SubcategoryService = class extends BaseService {
 // src/backoffice/services/technology.service.ts
 import {
   addDoc as addDoc6,
-  collection as collection30,
+  collection as collection31,
   doc as doc31,
   getDoc as getDoc33,
-  getDocs as getDocs30,
-  query as query30,
+  getDocs as getDocs31,
+  query as query31,
   updateDoc as updateDoc30,
-  where as where30,
+  where as where31,
   arrayUnion as arrayUnion9,
   arrayRemove as arrayRemove8
 } from "firebase/firestore";
@@ -13695,7 +13843,7 @@ var TechnologyService = class extends BaseService {
    * Vraća referencu na Firestore kolekciju tehnologija
    */
   getTechnologiesRef() {
-    return collection30(this.db, TECHNOLOGIES_COLLECTION);
+    return collection31(this.db, TECHNOLOGIES_COLLECTION);
   }
   /**
    * Kreira novu tehnologiju
@@ -13726,8 +13874,8 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAll() {
-    const q = query30(this.getTechnologiesRef(), where30("isActive", "==", true));
-    const snapshot = await getDocs30(q);
+    const q = query31(this.getTechnologiesRef(), where31("isActive", "==", true));
+    const snapshot = await getDocs31(q);
     return snapshot.docs.map(
       (doc33) => ({
         id: doc33.id,
@@ -13741,12 +13889,12 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAllByFamily(family) {
-    const q = query30(
+    const q = query31(
       this.getTechnologiesRef(),
-      where30("isActive", "==", true),
-      where30("family", "==", family)
+      where31("isActive", "==", true),
+      where31("family", "==", family)
     );
-    const snapshot = await getDocs30(q);
+    const snapshot = await getDocs31(q);
     return snapshot.docs.map(
       (doc33) => ({
         id: doc33.id,
@@ -13760,12 +13908,12 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAllByCategoryId(categoryId) {
-    const q = query30(
+    const q = query31(
       this.getTechnologiesRef(),
-      where30("isActive", "==", true),
-      where30("categoryId", "==", categoryId)
+      where31("isActive", "==", true),
+      where31("categoryId", "==", categoryId)
     );
-    const snapshot = await getDocs30(q);
+    const snapshot = await getDocs31(q);
     return snapshot.docs.map(
       (doc33) => ({
         id: doc33.id,
@@ -13779,12 +13927,12 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAllBySubcategoryId(subcategoryId) {
-    const q = query30(
+    const q = query31(
       this.getTechnologiesRef(),
-      where30("isActive", "==", true),
-      where30("subcategoryId", "==", subcategoryId)
+      where31("isActive", "==", true),
+      where31("subcategoryId", "==", subcategoryId)
     );
-    const snapshot = await getDocs30(q);
+    const snapshot = await getDocs31(q);
     return snapshot.docs.map(
       (doc33) => ({
         id: doc33.id,
@@ -14106,13 +14254,13 @@ var TechnologyService = class extends BaseService {
 // src/backoffice/services/product.service.ts
 import {
   addDoc as addDoc7,
-  collection as collection31,
+  collection as collection32,
   doc as doc32,
   getDoc as getDoc34,
-  getDocs as getDocs31,
-  query as query31,
+  getDocs as getDocs32,
+  query as query32,
   updateDoc as updateDoc31,
-  where as where31
+  where as where32
 } from "firebase/firestore";
 
 // src/backoffice/types/product.types.ts
@@ -14126,7 +14274,7 @@ var ProductService = class extends BaseService {
    * @returns Firestore collection reference
    */
   getProductsRef(technologyId) {
-    return collection31(
+    return collection32(
       this.db,
       TECHNOLOGIES_COLLECTION,
       technologyId,
@@ -14156,11 +14304,11 @@ var ProductService = class extends BaseService {
    * Gets all products for a technology
    */
   async getAllByTechnology(technologyId) {
-    const q = query31(
+    const q = query32(
       this.getProductsRef(technologyId),
-      where31("isActive", "==", true)
+      where32("isActive", "==", true)
     );
-    const snapshot = await getDocs31(q);
+    const snapshot = await getDocs32(q);
     return snapshot.docs.map(
       (doc33) => ({
         id: doc33.id,
@@ -14172,16 +14320,16 @@ var ProductService = class extends BaseService {
    * Gets all products for a brand by filtering through all technologies
    */
   async getAllByBrand(brandId) {
-    const allTechnologiesRef = collection31(this.db, TECHNOLOGIES_COLLECTION);
-    const technologiesSnapshot = await getDocs31(allTechnologiesRef);
+    const allTechnologiesRef = collection32(this.db, TECHNOLOGIES_COLLECTION);
+    const technologiesSnapshot = await getDocs32(allTechnologiesRef);
     const products = [];
     for (const techDoc of technologiesSnapshot.docs) {
-      const q = query31(
+      const q = query32(
         this.getProductsRef(techDoc.id),
-        where31("brandId", "==", brandId),
-        where31("isActive", "==", true)
+        where32("brandId", "==", brandId),
+        where32("isActive", "==", true)
       );
-      const snapshot = await getDocs31(q);
+      const snapshot = await getDocs32(q);
       products.push(
         ...snapshot.docs.map(
           (doc33) => ({

package/package.json

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

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

@@ -5,6 +5,14 @@ import {
   serverTimestamp,
   arrayUnion,
   arrayRemove,
+  QueryConstraint,
+  where,
+  orderBy,
+  collection,
+  query,
+  limit,
+  startAfter,
+  getDocs,
 } from "firebase/firestore";
 import { Auth } from "firebase/auth";
 import { FirebaseApp } from "firebase/app";
@@ -21,6 +29,7 @@ import {
   PatientReviewInfo,
   LinkedFormInfo,
   type CreateAppointmentHttpData,
+  APPOINTMENTS_COLLECTION,
 } from "../../types/appointment";
 import {
   createAppointmentSchema,
@@ -1002,4 +1011,233 @@ export class AppointmentService extends BaseService {
 
     return this.updateAppointment(appointmentId, updateData);
   }
+
+  /**
+   * Gets upcoming appointments for a specific patient.
+   * These include appointments with statuses: PENDING, CONFIRMED, CHECKED_IN, IN_PROGRESS
+   *
+   * @param patientId ID of the patient
+   * @param options Optional parameters for filtering and pagination
+   * @returns Found appointments and the last document for pagination
+   */
+  async getUpcomingPatientAppointments(
+    patientId: string,
+    options?: {
+      startDate?: Date; // Optional starting date (defaults to now)
+      endDate?: Date;
+      limit?: number;
+      startAfter?: DocumentSnapshot;
+    }
+  ): Promise<{
+    appointments: Appointment[];
+    lastDoc: DocumentSnapshot | null;
+  }> {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting upcoming appointments for patient: ${patientId}`
+      );
+
+      // Default to current date/time if no startDate provided
+      const effectiveStartDate = options?.startDate || new Date();
+
+      // Define the statuses considered as "upcoming"
+      const upcomingStatuses = [
+        AppointmentStatus.PENDING,
+        AppointmentStatus.CONFIRMED,
+        AppointmentStatus.CHECKED_IN,
+        AppointmentStatus.IN_PROGRESS,
+        AppointmentStatus.RESCHEDULED_BY_CLINIC,
+      ];
+
+      // Build query constraints
+      const constraints: QueryConstraint[] = [];
+
+      // Patient ID filter
+      constraints.push(where("patientId", "==", patientId));
+
+      // Status filter - multiple statuses
+      constraints.push(where("status", "in", upcomingStatuses));
+
+      // Date range filters
+      constraints.push(
+        where(
+          "appointmentStartTime",
+          ">=",
+          Timestamp.fromDate(effectiveStartDate)
+        )
+      );
+
+      if (options?.endDate) {
+        constraints.push(
+          where(
+            "appointmentStartTime",
+            "<=",
+            Timestamp.fromDate(options.endDate)
+          )
+        );
+      }
+
+      // Order by appointment start time (ascending for upcoming - closest first)
+      constraints.push(orderBy("appointmentStartTime", "asc"));
+
+      // Add pagination if specified
+      if (options?.limit) {
+        constraints.push(limit(options.limit));
+      }
+
+      if (options?.startAfter) {
+        constraints.push(startAfter(options.startAfter));
+      }
+
+      // Execute query
+      const q = query(
+        collection(this.db, APPOINTMENTS_COLLECTION),
+        ...constraints
+      );
+      const querySnapshot = await getDocs(q);
+
+      // Extract results
+      const appointments = querySnapshot.docs.map(
+        (doc) => doc.data() as Appointment
+      );
+
+      // Get last document for pagination
+      const lastDoc =
+        querySnapshot.docs.length > 0
+          ? querySnapshot.docs[querySnapshot.docs.length - 1]
+          : null;
+
+      console.log(
+        `[APPOINTMENT_SERVICE] Found ${appointments.length} upcoming appointments for patient ${patientId}`
+      );
+
+      return { appointments, lastDoc };
+    } catch (error) {
+      console.error(
+        `[APPOINTMENT_SERVICE] Error getting upcoming appointments for patient ${patientId}:`,
+        error
+      );
+      throw error;
+    }
+  }
+
+  /**
+   * Gets past appointments for a specific patient.
+   * These include appointments with statuses: COMPLETED, CANCELED_PATIENT,
+   * CANCELED_PATIENT_RESCHEDULED, CANCELED_CLINIC, NO_SHOW
+   *
+   * @param patientId ID of the patient
+   * @param options Optional parameters for filtering and pagination
+   * @returns Found appointments and the last document for pagination
+   */
+  async getPastPatientAppointments(
+    patientId: string,
+    options?: {
+      startDate?: Date;
+      endDate?: Date; // Optional end date (defaults to now)
+      showCanceled?: boolean; // Whether to include canceled appointments
+      showNoShow?: boolean; // Whether to include no-show appointments
+      limit?: number;
+      startAfter?: DocumentSnapshot;
+    }
+  ): Promise<{
+    appointments: Appointment[];
+    lastDoc: DocumentSnapshot | null;
+  }> {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting past appointments for patient: ${patientId}`
+      );
+
+      // Default to current date/time if no endDate provided
+      const effectiveEndDate = options?.endDate || new Date();
+
+      // Define the base status for past appointments
+      const pastStatuses: AppointmentStatus[] = [AppointmentStatus.COMPLETED];
+
+      // Add canceled statuses if requested
+      if (options?.showCanceled) {
+        pastStatuses.push(
+          AppointmentStatus.CANCELED_PATIENT,
+          AppointmentStatus.CANCELED_PATIENT_RESCHEDULED,
+          AppointmentStatus.CANCELED_CLINIC
+        );
+      }
+
+      // Add no-show status if requested
+      if (options?.showNoShow) {
+        pastStatuses.push(AppointmentStatus.NO_SHOW);
+      }
+
+      // Build query constraints
+      const constraints: QueryConstraint[] = [];
+
+      // Patient ID filter
+      constraints.push(where("patientId", "==", patientId));
+
+      // Status filter - multiple statuses
+      constraints.push(where("status", "in", pastStatuses));
+
+      // Date range filters
+      if (options?.startDate) {
+        constraints.push(
+          where(
+            "appointmentStartTime",
+            ">=",
+            Timestamp.fromDate(options.startDate)
+          )
+        );
+      }
+
+      constraints.push(
+        where(
+          "appointmentStartTime",
+          "<=",
+          Timestamp.fromDate(effectiveEndDate)
+        )
+      );
+
+      // Order by appointment start time (descending for past - most recent first)
+      constraints.push(orderBy("appointmentStartTime", "desc"));
+
+      // Add pagination if specified
+      if (options?.limit) {
+        constraints.push(limit(options.limit));
+      }
+
+      if (options?.startAfter) {
+        constraints.push(startAfter(options.startAfter));
+      }
+
+      // Execute query
+      const q = query(
+        collection(this.db, APPOINTMENTS_COLLECTION),
+        ...constraints
+      );
+      const querySnapshot = await getDocs(q);
+
+      // Extract results
+      const appointments = querySnapshot.docs.map(
+        (doc) => doc.data() as Appointment
+      );
+
+      // Get last document for pagination
+      const lastDoc =
+        querySnapshot.docs.length > 0
+          ? querySnapshot.docs[querySnapshot.docs.length - 1]
+          : null;
+
+      console.log(
+        `[APPOINTMENT_SERVICE] Found ${appointments.length} past appointments for patient ${patientId}`
+      );
+
+      return { appointments, lastDoc };
+    } catch (error) {
+      console.error(
+        `[APPOINTMENT_SERVICE] Error getting past appointments for patient ${patientId}:`,
+        error
+      );
+      throw error;
+    }
+  }
 }