WIP - fix events endpoint

Author: rchlfryn

src/app/api/events/route.ts

@@ -1,56 +1,33 @@
-import config from '@/payload.config'
-import { getPayload, Where } from 'payload'
+import { getEvents } from '@/utilities/queries/getEvents'
+import { NextResponse } from 'next/server'
 
 export async function GET(req: Request) {
   try {
     const url = new URL(req.url)
     const searchParams = url.searchParams
-
-    const tenantId = searchParams.get('tenantId')
-    const maxEvents = parseInt(searchParams.get('limit') || '4')
-    const depth = parseInt(searchParams.get('depth') || '1')
-    const types = searchParams.get('types')?.split(',').filter(Boolean)
-    const groups = searchParams.get('groups')?.split(',').filter(Boolean)
-    const tags = searchParams.get('tags')?.split(',').filter(Boolean)
-
-    if (!tenantId) {
-      return Response.json({ error: 'tenantId is required' }, { status: 400 })
+    const params = {
+      center: String(searchParams.get('tenantId')),
+      limit: parseInt(searchParams.get('limit') || '4'),
+      types: searchParams.get('types')?.split(',').filter(Boolean),
+      groups: searchParams.get('groups')?.split(',').filter(Boolean),
+      tags: searchParams.get('tags')?.split(',').filter(Boolean),
     }
 
-    const payload = await getPayload({ config })
-
-    const where: Where = {
-      tenant: { equals: tenantId },
-      startDate: { greater_than: new Date().toISOString() },
+    if (!params.center) {
+      return Response.json({ error: 'tenantId is required' }, { status: 400 })
     }
 
-    if (types?.length) {
-      where.eventType = { in: types }
-    }
+    const { events, error } = await getEvents(params)
 
-    if (groups?.length) {
-      where.eventGroup = { in: groups }
+    if (error) {
+      return NextResponse.json(events, { status: 500 })
     }
 
-    if (tags?.length) {
-      where.eventTags = { in: tags }
-    }
-
-    const data = await payload.find({
-      collection: 'events',
-      where,
-      limit: maxEvents,
-      depth,
-    })
-
-    return Response.json(
-      { docs: data.docs || [] },
-      {
-        headers: {
-          'Cache-Control': 'public, s-maxage=60, stale-while-revalidate=300',
-        },
+    return NextResponse.json(events, {
+      headers: {
+        'Cache-Control': 'public, s-maxage=60, stale-while-revalidate=300',
       },
-    )
+    })
   } catch (error) {
     console.error('[Dynamic Events Endpoint Error]:', error)
     return Response.json(

src/fields/EventQuery/QueriedEventsComponent.tsx

@@ -54,9 +54,9 @@ export const QueriedEventsComponent = ({ path, field }: QueriedEventsComponentPr
         if (!tenantId) return
 
         const params = new URLSearchParams({
+          tenantId: String(tenantId),
           limit: String(maxEvents || 4),
           depth: '1',
-          'where[tenant][equals]': String(tenantId),
         })
 
         if (sortBy) {
@@ -71,7 +71,7 @@ export const QueriedEventsComponent = ({ path, field }: QueriedEventsComponentPr
           const groupIds = filterByEventGroups.filter(Boolean)
 
           if (groupIds.length > 0) {
-            params.append('where[type][in]', groupIds.join(','))
+            params.append('groups', groupIds.join(','))
           }
         }
 
@@ -83,18 +83,18 @@ export const QueriedEventsComponent = ({ path, field }: QueriedEventsComponentPr
           const typeIds = filterByEventTypes.filter(Boolean)
 
           if (typeIds.length > 0) {
-            params.append('where[type][in]', typeIds.join(','))
+            params.append('types', typeIds.join(','))
           }
         }
 
         if (filterByEventTags && Array.isArray(filterByEventTags) && filterByEventTags.length > 0) {
           const tagIds = filterByEventTags.filter(Boolean)
 
           if (tagIds.length > 0) {
-            params.append('where[tags][in]', tagIds.join(','))
+            params.append('tags', tagIds.join(','))
           }
         }
-        params.append('where[startDate][greater_than]', new Date().toISOString())
+        // params.append('startDate', new Date().toISOString())
 
         const response = await fetch(`/api/events?${params.toString()}`)
         if (!response.ok) {