Add type Timestamp to lastItem instead of any, change the field from

calendarEventId to requestedAt and change the order to be descending.

booking-app/components/src/client/routes/admin/hooks/useExistingBooking.tsx

@@ -12,10 +12,10 @@ export default function useExistingBooking() {
     setBookingCalendarInfo,
     setFormData,
   } = useContext(BookingContext);
-  const { bookings, roomSettings } = useContext(DatabaseContext);
+  const { futureBookings, roomSettings } = useContext(DatabaseContext);
 
   const findBooking = (calendarEventId: string) =>
-    bookings.filter(
+    futureBookings.filter(
       (booking) => booking.calendarEventId === calendarEventId
     )[0];
 

booking-app/components/src/client/routes/components/Provider.tsx

@@ -19,6 +19,7 @@ import {
 import { useAuth } from "@/components/src/client/routes/components/AuthProvider";
 import { fetchAllBookings, fetchAllFutureBooking } from "@/components/src/server/db";
 import { clientFetchAllDataFromCollection } from "@/lib/firebase/firebase";
+import { Timestamp } from "firebase-admin/firestore";
 
 export interface DatabaseContextType {
   adminUsers: AdminUser[];
@@ -103,7 +104,7 @@ export const DatabaseProvider = ({
   const [userApiData, setUserApiData] = useState<UserApiData | undefined>(
     undefined
   );
-  const [lastItem, setLastItem] = useState<any>(null);
+  const [lastItem, setLastItem] = useState<Timestamp>(null);
   const LIMIT = 3;
 
   const { user } = useAuth();
@@ -190,7 +191,7 @@ export const DatabaseProvider = ({
   const fetchBookings = async () => {
     try{
       const bookingsResponse : Booking[] = await fetchAllBookings(LIMIT, lastItem);
-      setLastItem(bookingsResponse[bookingsResponse.length - 1].calendarEventId);
+      setLastItem(bookingsResponse[bookingsResponse.length - 1].requestedAt);
       setAllBookings((oldBookings) => [...oldBookings, ...bookingsResponse]);
     } catch (error) {
       console.error("Error fetching data:", error);

booking-app/components/src/server/db.ts

@@ -27,7 +27,7 @@ export const fetchAllFutureBooking = async <Booking>(): Promise<Booking[]> => {
 };
 
 export const fetchAllBookings = async <Booking>(limit:number, last:any) : Promise<Booking[]> =>{
-  return getPaginatedData<Booking>(TableNames.BOOKING, limit, "calendarEventId", last);
+  return getPaginatedData<Booking>(TableNames.BOOKING, limit, "requestedAt", last);
 }
 
 

booking-app/lib/firebase/firebase.ts

@@ -86,7 +86,7 @@ export const clientFetchAllDataFromCollectionWithLimitAndOffset = async <T>(
 export const getPaginatedData = async<T> (
   collectionName,
   itemsPerPage = 10,
-  orderByField = 'calendarEventId',
+  orderByField = 'requestedAt',
   lastVisible = null
  ) : Promise<T[]> => {
   try {
@@ -98,7 +98,7 @@ export const getPaginatedData = async<T> (
     // Build query
     let q = query(
       colRef,
-      orderBy(orderByField),
+      orderBy(orderByField, 'desc'),
       limit(itemsPerPage)
     );
 
@@ -107,7 +107,7 @@ export const getPaginatedData = async<T> (
       console.log(lastVisible);
       q = query(
         colRef,
-        orderBy(orderByField),
+        orderBy(orderByField, 'desc'),
         startAfter(lastVisible),
         limit(itemsPerPage)
       );
@@ -121,7 +121,7 @@ export const getPaginatedData = async<T> (
       id: doc.id,
       ...doc.data() as unknown as T
     }));
-
+    console.log(items)
     return items;
   } catch (error) {
     console.error('Error getting paginated data:', error);

booking-app/test-results/.last-run.json

@@ -0,0 +1,4 @@
+{
+  "status": "passed",
+  "failedTests": []
+}