From 33ada3505bc02064381628c5ef7b083698579bd2 Mon Sep 17 00:00:00 2001
From: Milan Paunovic <milan.paunovic@visit.com>
Date: Sun, 8 Dec 2024 12:22:24 +0100
Subject: [PATCH] bugfixes

---
 hooks/firebase/useCreateEvent.ts | 2 +-
 hooks/firebase/useGetEvents.ts   | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/hooks/firebase/useCreateEvent.ts b/hooks/firebase/useCreateEvent.ts
index 615d543..ae89f1f 100644
--- a/hooks/firebase/useCreateEvent.ts
+++ b/hooks/firebase/useCreateEvent.ts
@@ -24,7 +24,7 @@ export const useCreateEvent = () => {
                             .doc(docId)
                             .set({
                                 ...eventData,
-                                attendees: (eventData.attendees?.length ?? 0) === 0 ?? [currentUser?.uid],
+                                attendees: (eventData.attendees?.length ?? 0),
                                 creatorId: currentUser?.uid,
                                 familyId: profileData?.familyId
                             }, {merge: true});
diff --git a/hooks/firebase/useGetEvents.ts b/hooks/firebase/useGetEvents.ts
index b32cdf4..a5666f7 100644
--- a/hooks/firebase/useGetEvents.ts
+++ b/hooks/firebase/useGetEvents.ts
@@ -112,7 +112,7 @@ export const useGetEvents = () => {
             let allEvents = [];
 
             if (isFamilyView) {
-                const [publicFamilyEvents, privateCreatorEvents, privateAttendeeEvents, userAttendeeEvents, userCreatorEvents] = await Promise.all([
+                const [publicFamilyEvents, privateCreatorEvents, privateAttendeeEvents, userAttendeeEvents] = await Promise.all([
                     // Public family events
                     db.collection("Events")
                         .where("familyId", "==", familyId)
@@ -136,11 +136,6 @@ export const useGetEvents = () => {
                     db.collection("Events")
                         .where("attendees", "array-contains", userId)
                         .get(),
-
-                    // ALL events where user is creator (regardless of attendees)
-                    db.collection("Events")
-                        .where("creatorId", "==", userId)
-                        .get()
                 ]);
 
                 console.log(`Found ${publicFamilyEvents.size} public events, ${privateCreatorEvents.size} private creator events, ${privateAttendeeEvents.size} private attendee events, ${userAttendeeEvents.size} user attendee events, ${userCreatorEvents.size} user creator events`);
@@ -150,7 +145,6 @@ export const useGetEvents = () => {
                     ...privateCreatorEvents.docs.map(doc => ({...doc.data(), id: doc.id})),
                     ...privateAttendeeEvents.docs.map(doc => ({...doc.data(), id: doc.id})),
                     ...userAttendeeEvents.docs.map(doc => ({...doc.data(), id: doc.id})),
-                    ...userCreatorEvents.docs.map(doc => ({...doc.data(), id: doc.id}))
                 ];
             } else {
                 const [creatorEvents, attendeeEvents] = await Promise.all([