From dcca6520196945cf51e871374c20ff2ac611e6a6 Mon Sep 17 00:00:00 2001
From: Dejan <panovskidejan"yahoo.com>
Date: Sat, 18 Jan 2025 00:31:48 +0100
Subject: [PATCH] - Improved fetching of events for family device - Removed
 fetching events and considering if they're private or not

---
 hooks/firebase/useGetEvents.ts | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/hooks/firebase/useGetEvents.ts b/hooks/firebase/useGetEvents.ts
index 9ee8c74..f40fd1b 100644
--- a/hooks/firebase/useGetEvents.ts
+++ b/hooks/firebase/useGetEvents.ts
@@ -27,17 +27,23 @@ const fetchEvents = async (userId: string, profileData: UserProfile | undefined,
     let constraints;
     let familyId = profileData?.familyId;
 
-    if (isFamilyView || profileData?.userType === ProfileType.FAMILY_DEVICE) {
+    if (profileData?.userType === ProfileType.FAMILY_DEVICE) {
         constraints = [
-            eventsQuery.where("familyId", "==", familyId).where("private", "not-in", [true]),
-            eventsQuery.where("creatorId", "==", userId),
-            eventsQuery.where("attendees", "array-contains", userId)
+            eventsQuery.where("familyId", "==", familyId)
         ];
     } else {
-        constraints = [
-            eventsQuery.where("creatorId", "==", userId),
-            eventsQuery.where("attendees", "array-contains", userId)
-        ];
+        if (isFamilyView) {
+            constraints = [
+                eventsQuery.where("familyId", "==", familyId),
+                eventsQuery.where("creatorId", "==", userId),
+                eventsQuery.where("attendees", "array-contains", userId)
+            ];
+        } else {
+            constraints = [
+                eventsQuery.where("creatorId", "==", userId),
+                eventsQuery.where("attendees", "array-contains", userId)
+            ];
+        }
     }
 
     const snapshots = await Promise.all(constraints.map(query => query.get()));
@@ -49,6 +55,7 @@ const fetchEvents = async (userId: string, profileData: UserProfile | undefined,
     snapshots.forEach(snapshot => {
         snapshot.docs.forEach(doc => {
             const event = doc.data();
+            console.log(event);
             const hash = createEventHash(event);
 
             if (!processedHashes.has(hash)) {
@@ -102,13 +109,13 @@ export const useGetEvents = () => {
             await queryClient.prefetchQuery({
                 queryKey: ["events", user.uid, false], // Personal events
                 queryFn: () => fetchEvents(user.uid, profileData, false),
-                staleTime: 5 * 60 * 1000,
+                staleTime: 1000,
             });
 
             await queryClient.prefetchQuery({
                 queryKey: ["events", user.uid, true], // Family events
                 queryFn: () => fetchEvents(user.uid, profileData, true),
-                staleTime: 5 * 60 * 1000,
+                staleTime:1000,
             });
         };