@@ -1715,14 +1715,13 @@ class CalDAV extends API {
17151715
17161716 async getEventsForCalendar (
17171717 ctx ,
1718- { calendarId, principalId, user, fullData, showDeleted, limit }
1718+ { calendarId, principalId, user, fullData, showDeleted }
17191719 ) {
17201720 ctx . logger . debug ( 'getEventsForCalendar' , {
17211721 calendarId,
17221722 principalId,
17231723 user,
1724- fullData,
1725- limit
1724+ fullData
17261725 } ) ;
17271726
17281727 const calendar = await this . getCalendar ( ctx , {
@@ -1736,28 +1735,14 @@ class CalDAV extends API {
17361735 ctx . translateError ( 'CALENDAR_DOES_NOT_EXIST' )
17371736 ) ;
17381737
1739- // Build query to filter deleted events at database level
1740- const query = {
1738+ let events = await CalendarEvents . find ( this , ctx . state . session , {
17411739 calendar : calendar . _id
1742- } ;
1743-
1744- // Filter out deleted events at DB level for performance
1745- if ( ! showDeleted ) {
1746- query . deleted_at = null ;
1747- }
1748-
1749- // Apply limit if specified (default to 10000 to prevent massive queries)
1750- const maxLimit = limit || 10000 ;
1740+ } ) ;
17511741
1752- const events = await CalendarEvents . find (
1753- this ,
1754- ctx . state . session ,
1755- query ,
1756- { } ,
1757- { sort : { eventId : 1 } , limit : maxLimit }
1758- ) ;
1742+ // TODO: improve this with search directly on sql
1743+ if ( ! showDeleted ) events = events . filter ( ( e ) => ! _ . isDate ( e . deleted_at ) ) ;
17591744
1760- ctx . logger . debug ( 'events' , { count : events . length , limit : maxLimit } ) ;
1745+ ctx . logger . debug ( 'events' , { events } ) ;
17611746
17621747 return events ;
17631748 }
0 commit comments