ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2025-11-26 08:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes

Browse Source
This commit is contained in:
Milan Paunovic
2024-12-08 12:22:24 +01:00
parent 94784b3706
commit 33ada3505b
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/firebase/useCreateEvent.ts
View File

@ -24,7 +24,7 @@ export const useCreateEvent = () => {
.doc(docId) .doc(docId)
.set({ .set({
...eventData, ...eventData,
attendees: (eventData.attendees?.length ?? 0) === 0 ?? [currentUser?.uid], attendees: (eventData.attendees?.length ?? 0),
creatorId: currentUser?.uid, creatorId: currentUser?.uid,
familyId: profileData?.familyId familyId: profileData?.familyId
}, {merge: true}); }, {merge: true});

8
hooks/firebase/useGetEvents.ts
View File

@ -112,7 +112,7 @@ export const useGetEvents = () => {
let allEvents = []; let allEvents = [];
if (isFamilyView) { if (isFamilyView) {
const [publicFamilyEvents, privateCreatorEvents, privateAttendeeEvents, userAttendeeEvents, userCreatorEvents] = await Promise.all([ const [publicFamilyEvents, privateCreatorEvents, privateAttendeeEvents, userAttendeeEvents] = await Promise.all([
// Public family events // Public family events
db.collection("Events") db.collection("Events")
.where("familyId", "==", familyId) .where("familyId", "==", familyId)
@ -136,11 +136,6 @@ export const useGetEvents = () => {
db.collection("Events") db.collection("Events")
.where("attendees", "array-contains", userId) .where("attendees", "array-contains", userId)
.get(), .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`); 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})), ...privateCreatorEvents.docs.map(doc => ({...doc.data(), id: doc.id})),
...privateAttendeeEvents.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})), ...userAttendeeEvents.docs.map(doc => ({...doc.data(), id: doc.id})),
...userCreatorEvents.docs.map(doc => ({...doc.data(), id: doc.id}))
]; ];
} else { } else {
const [creatorEvents, attendeeEvents] = await Promise.all([ const [creatorEvents, attendeeEvents] = await Promise.all([