diff --git a/server/utils/nocodb-events.ts b/server/utils/nocodb-events.ts index 8b71bfa..cdf443d 100644 --- a/server/utils/nocodb-events.ts +++ b/server/utils/nocodb-events.ts @@ -62,54 +62,25 @@ export function createNocoDBEventsClient() { if (filters?.limit) queryParams.set('limit', filters.limit.toString()); if (filters?.offset) queryParams.set('offset', filters.offset.toString()); - // Build where clause for filtering using correct field names from NocoDB - const whereConditions: string[] = []; + // TEMPORARILY: Try different query approach to isolate the issue + // Remove complex filtering until we can identify what works - if (filters?.start_date && filters?.end_date) { - // Date range filtering using gte and lte (btw didn't work) - whereConditions.push(`(start_datetime,gte,${filters.start_date})`); - whereConditions.push(`(start_datetime,lte,${filters.end_date})`); - } - - if (filters?.event_type) { - whereConditions.push(`(event_type,eq,${filters.event_type})`); - } - - if (filters?.visibility) { - whereConditions.push(`(visibility,eq,${filters.visibility})`); - } else if (filters?.user_role) { - // Role-based visibility filtering - if (filters.user_role === 'user') { - whereConditions.push(`(visibility,eq,public)`); - } else if (filters.user_role === 'board') { - // Board members can see public and board-only events - whereConditions.push(`~or((visibility,eq,public),(visibility,eq,board-only))`); - } - // Admin sees all events (no filter) - } + console.log('[nocodb-events] 🔍 DEBUG: Filters received:', JSON.stringify(filters, null, 2)); + // Try only status filter first (simplest case) if (filters?.status) { - whereConditions.push(`(status,eq,${filters.status})`); + console.log('[nocodb-events] 🔍 Adding status filter:', filters.status); + queryParams.set('where', `(status,eq,${filters.status})`); } else { - // Default to active events only - whereConditions.push(`(status,eq,active)`); + // Try no status filter at all to see if that works + console.log('[nocodb-events] 🔍 No status filter - fetching all records'); } - if (filters?.search) { - // Search in title or description - whereConditions.push(`~or((title,like,%${filters.search}%),(description,like,%${filters.search}%))`); - } + // Skip date filtering completely for now + console.log('[nocodb-events] ⚠️ Temporarily skipping date/role/search filtering to isolate issue'); - // Combine conditions with ~and if multiple conditions exist - if (whereConditions.length > 0) { - const whereClause = whereConditions.length === 1 - ? whereConditions[0] - : `~and(${whereConditions.join(',')})`; - queryParams.set('where', whereClause); - } - - // Sort by start date - queryParams.set('sort', 'start_datetime'); + // ALSO temporarily skip sorting to see if that's the issue + console.log('[nocodb-events] ⚠️ Also temporarily skipping sorting to isolate issue'); const url = `${baseUrl}/api/v2/tables/${eventsTableId}/records?${queryParams.toString()}`;