feat: add featured events route

Author: brage-andreas

apps/rpc/package.json

@@ -38,7 +38,7 @@
     "@dotkomonline/utils": "workspace:*",
     "@fastify/cors": "^11.0.0",
     "@opentelemetry/api": "^1.9.0",
-    "@prisma/client": "^6.8.2",
+    "@prisma/client": "^6.19.0",
     "@sentry/node": "^9.24.0",
     "@trpc/server": "11.4.4",
     "auth0": "^4.23.1",

apps/rpc/src/modules/event/event-repository.ts

@@ -1,6 +1,9 @@
 import type { DBHandle } from "@dotkomonline/db"
+import { findFeaturedEvents } from "@dotkomonline/db"
 import {
   type AttendanceId,
+  type BaseEvent,
+  BaseEventSchema,
   type CompanyId,
   type DeregisterReason,
   DeregisterReasonSchema,
@@ -41,6 +44,8 @@ const INCLUDE_COMPANY_AND_GROUPS = {
 export interface EventRepository {
   create(handle: DBHandle, data: EventWrite): Promise<Event>
   update(handle: DBHandle, eventId: EventId, data: Partial<EventWrite>): Promise<Event>
+  updateEventAttendance(handle: DBHandle, eventId: EventId, attendanceId: AttendanceId): Promise<Event>
+  updateEventParent(handle: DBHandle, eventId: EventId, parentEventId: EventId | null): Promise<Event>
   /**
    * Soft-delete an event by setting its status to "DELETED".
    */
@@ -81,15 +86,17 @@ export interface EventRepository {
     page: Pageable
   ): Promise<Event[]>
   findByParentEventId(handle: DBHandle, parentEventId: EventId): Promise<Event[]>
+  findEventsWithUnansweredFeedbackFormByUserId(handle: DBHandle, userId: UserId): Promise<Event[]>
+  findManyDeregisterReasonsWithEvent(handle: DBHandle, page: Pageable): Promise<DeregisterReasonWithEvent[]>
+  // This cannot use `Pageable` due to raw query needing numerical offset and not cursor based pagination
+  findFeaturedEvents(handle: DBHandle, offset: number, limit: number): Promise<BaseEvent[]>
+
   addEventHostingGroups(handle: DBHandle, eventId: EventId, hostingGroupIds: Set<GroupId>): Promise<void>
-  addEventCompanies(handle: DBHandle, eventId: EventId, companyIds: Set<CompanyId>): Promise<void>
   deleteEventHostingGroups(handle: DBHandle, eventId: EventId, hostingGroupIds: Set<GroupId>): Promise<void>
+  addEventCompanies(handle: DBHandle, eventId: EventId, companyIds: Set<CompanyId>): Promise<void>
   deleteEventCompanies(handle: DBHandle, eventId: EventId, companyIds: Set<CompanyId>): Promise<void>
-  updateEventAttendance(handle: DBHandle, eventId: EventId, attendanceId: AttendanceId): Promise<Event>
-  updateEventParent(handle: DBHandle, eventId: EventId, parentEventId: EventId | null): Promise<Event>
-  findEventsWithUnansweredFeedbackFormByUserId(handle: DBHandle, userId: UserId): Promise<Event[]>
+
   createDeregisterReason(handle: DBHandle, data: DeregisterReasonWrite): Promise<DeregisterReason>
-  findManyDeregisterReasonsWithEvent(handle: DBHandle, page: Pageable): Promise<DeregisterReasonWithEvent[]>
 }
 
 export function getEventRepository(): EventRepository {
@@ -310,6 +317,25 @@ export function getEventRepository(): EventRepository {
       )
     },
 
+    async findFeaturedEvents(handle, offset, limit) {
+      // Events will primarily be ranked by their type in the following order (lower number is higher ranking):
+      // 1. GENERAL_ASSEMBLY
+      // 2. COMPANY, ACADEMIC
+      // 3. SOCIAL, INTERNAL, OTHER, WELCOME
+      //
+      // Within each bucket they will be ranked like this:
+      // 1. Event in future, registration open and not full AND attendance capacity is limited (>0)
+      // 2. Event in future, registration not started yet (attendance capacity does not matter)
+      // 3. Event in future, no attendance registration OR attendance capacity is unlimited (=0)
+      // 4. Event in future, registration full (registration status does not matter)
+      //
+      // Past events are not featured. We would rather have no featured events than "stale" events.
+      
+      const events = await handle.$queryRawTyped(findFeaturedEvents(offset, limit))
+
+      return parseOrReport(BaseEventSchema.array(), events)
+    },
+
     async addEventHostingGroups(handle, eventId, hostingGroupIds) {
       await handle.eventHostingGroup.createMany({
         data: hostingGroupIds

apps/rpc/src/modules/event/event-router.ts

@@ -1,6 +1,8 @@
 import type { PresignedPost } from "@aws-sdk/s3-presigned-post"
 import {
+  AttendanceSchema,
   AttendanceWriteSchema,
+  BaseEventSchema,
   CompanySchema,
   EventFilterQuerySchema,
   EventSchema,
@@ -153,7 +155,12 @@ const allEventsProcedure = procedure
 export type AllByAttendingUserIdInput = inferProcedureInput<typeof allByAttendingUserIdProcedure>
 export type AllByAttendingUserIdOutput = inferProcedureOutput<typeof allByAttendingUserIdProcedure>
 const allByAttendingUserIdProcedure = procedure
-  .input(BasePaginateInputSchema.extend({ filter: EventFilterQuerySchema.optional(), id: UserSchema.shape.id }))
+  .input(
+    BasePaginateInputSchema.extend({
+      filter: EventFilterQuerySchema.optional(),
+      id: UserSchema.shape.id,
+    })
+  )
   .output(
     z.object({
       items: EventWithAttendanceSchema.array(),
@@ -172,7 +179,7 @@ const allByAttendingUserIdProcedure = procedure
 
     const eventsWithAttendance = events.map((event) => ({
       event,
-      attendance: attendances.find((attendance) => attendance.id === event.attendanceId) || null,
+      attendance: attendances.find((attendance) => attendance.id === event.attendanceId) ?? null,
     }))
 
     return {
@@ -244,7 +251,7 @@ const findChildEventsProcedure = procedure
     )
     return events.map((event) => ({
       event,
-      attendance: attendances.find((attendance) => attendance.id === event.attendanceId) || null,
+      attendance: attendances.find((attendance) => attendance.id === event.attendanceId) ?? null,
     }))
   })
 
@@ -290,6 +297,33 @@ const findManyDeregisterReasonsWithEventProcedure = procedure
     }
   })
 
+export type FindFeaturedEventsInput = inferProcedureInput<typeof findFeaturedEventsProcedure>
+export type FindFeaturedEventsOutput = inferProcedureOutput<typeof findFeaturedEventsProcedure>
+const findFeaturedEventsProcedure = procedure
+  .input(
+    z.object({
+      offset: z.number().min(0).default(0),
+      limit: z.number().min(1).max(100).default(10),
+    })
+  )
+  .output(z.object({ event: BaseEventSchema, attendance: AttendanceSchema.nullable() }).array())
+  .use(withDatabaseTransaction())
+  .query(async ({ input, ctx }) => {
+    const events = await ctx.eventService.findFeaturedEvents(ctx.handle, input.offset, input.limit)
+
+    const attendances = await ctx.attendanceService.getAttendancesByIds(
+      ctx.handle,
+      events.map((item) => item.attendanceId).filter((id) => id !== null)
+    )
+
+    const eventsWithAttendance = events.map((event) => ({
+      event,
+      attendance: attendances.find((attendance) => attendance.id === event.attendanceId) ?? null,
+    }))
+
+    return eventsWithAttendance
+  })
+
 export type CreateFileUploadInput = inferProcedureInput<typeof createFileUploadProcedure>
 export type CreateFileUploadOutput = inferProcedureOutput<typeof createFileUploadProcedure>
 const createFileUploadProcedure = procedure

apps/rpc/src/modules/event/event-service.ts

@@ -4,6 +4,7 @@ import type { DBHandle } from "@dotkomonline/db"
 import { getLogger } from "@dotkomonline/logger"
 import type {
   AttendanceId,
+  BaseEvent,
   CompanyId,
   DeregisterReason,
   DeregisterReasonWithEvent,
@@ -45,6 +46,7 @@ export interface EventService {
   findByParentEventId(handle: DBHandle, parentEventId: EventId): Promise<Event[]>
   findEventById(handle: DBHandle, eventId: EventId): Promise<Event | null>
   findEventsWithUnansweredFeedbackFormByUserId(handle: DBHandle, userId: UserId): Promise<Event[]>
+  findFeaturedEvents(handle: DBHandle, offset: number, limit: number): Promise<BaseEvent[]>
   /**
    * Get an event by its id
    *
@@ -98,6 +100,10 @@ export function getEventService(
       return await eventRepository.findEventsWithUnansweredFeedbackFormByUserId(handle, userId)
     },
 
+    async findFeaturedEvents(handle, offset, limit) {
+      return await eventRepository.findFeaturedEvents(handle, offset, limit)
+    },
+
     async getEventById(handle, eventId) {
       const event = await eventRepository.findById(handle, eventId)
       if (!event) {

apps/web/src/app/page.tsx

@@ -10,7 +10,7 @@ import type { Attendance, Event, EventWithAttendance, UserId } from "@dotkomonli
 import { RichText, cn } from "@dotkomonline/ui"
 import { Text, Tilt, Title } from "@dotkomonline/ui"
 import { Button } from "@dotkomonline/ui"
-import { getCurrentUTC, slugify } from "@dotkomonline/utils"
+import { slugify } from "@dotkomonline/utils"
 import { IconArrowRight, IconCalendarEvent } from "@tabler/icons-react"
 import { formatDate } from "date-fns"
 import { nb } from "date-fns/locale"
@@ -20,17 +20,8 @@ import type { FC } from "react"
 export default async function App() {
   const [session, isStaff] = await Promise.all([auth.getServerSession(), server.user.isStaff.query()])
 
-  const { items: events } = await server.event.all.query({
-    take: 3,
-    filter: {
-      byEndDate: {
-        max: null,
-        min: getCurrentUTC(),
-      },
-      excludingOrganizingGroup: ["velkom"],
-      excludingType: isStaff ? [] : undefined,
-      orderBy: "asc",
-    },
+  const events = await server.event.findFeaturedEvents.query({
+    limit: 3,
   })
 
   const featuredEvent = events[0] ?? null

package.json

@@ -20,12 +20,12 @@
     "test:it": "pnpm run -r test:it",
     "dev": "pnpm -rc --parallel -F @dotkomonline/ui -F @dotkomonline/web -F @dotkomonline/dashboard -F @dotkomonline/rpc -F @dotkomonline/invoicification -F @dotkomonline/rif exec doppler run --preserve-env pnpm run dev",
     "dev:web": "pnpm -rc --parallel -F @dotkomonline/ui -F @dotkomonline/web -F @dotkomonline/dashboard -F @dotkomonline/rpc exec doppler run --preserve-env pnpm run dev",
-    "prisma": "pnpm -F @dotkomonline/db prisma",
-    "generate": "pnpm -F @dotkomonline/db generate",
-    "migrate:dev": "pnpm -F @dotkomonline/db migrate",
-    "migrate:dev-with-fixtures": "pnpm -F @dotkomonline/db prisma migrate dev && pnpm -F @dotkomonline/db apply-fixtures",
-    "migrate:deploy": "pnpm -F @dotkomonline/db prisma migrate deploy",
-    "migrate:deploy-with-fixtures": "pnpm -F @dotkomonline/db prisma migrate deploy && pnpm -F @dotkomonline/db apply-fixtures",
+    "prisma": "doppler run --project monoweb-rpc -- pnpm -F @dotkomonline/db prisma",
+    "generate": "doppler run --project monoweb-rpc -- pnpm -F @dotkomonline/db generate",
+    "migrate:dev": "doppler run --project monoweb-rpc -- pnpm -F @dotkomonline/db migrate",
+    "migrate:dev-with-fixtures": "doppler run --project monoweb-rpc -- pnpm -F @dotkomonline/db prisma migrate dev && pnpm -F @dotkomonline/db apply-fixtures",
+    "migrate:deploy": "doppler run --project monoweb-rpc -- pnpm -F @dotkomonline/db prisma migrate deploy",
+    "migrate:deploy-with-fixtures": "doppler run --project monoweb-rpc -- pnpm -F @dotkomonline/db prisma migrate deploy && pnpm -F @dotkomonline/db apply-fixtures",
     "migrate:staging": "doppler run --config stg --project monoweb-rpc -- pnpm migrate:deploy",
     "migrate:prod": "doppler run --config prd --project monoweb-rpc -- pnpm migrate:deploy",
     "storybook": "pnpm run -r --filter=storybook storybook",

packages/db/package.json

@@ -23,14 +23,14 @@
     "type-check": "tsc --noEmit",
     "prisma": "prisma",
     "migrate": "prisma migrate dev",
-    "generate": "prisma generate",
-    "postinstall": "prisma generate",
+    "generate": "prisma generate --sql",
+    "postinstall": "prisma generate --sql",
     "apply-fixtures": "tsx src/fixtures.ts"
   },
   "dependencies": {
     "@dotkomonline/logger": "workspace:*",
     "@dotkomonline/utils": "workspace:*",
-    "@prisma/client": "^6.8.2",
+    "@prisma/client": "^6.19.0",
     "@testcontainers/postgresql": "^11.5.1",
     "date-fns": "^4.1.0",
     "pg": "^8.16.0",
@@ -44,7 +44,7 @@
     "@types/node": "22.18.6",
     "@types/pg": "8.15.6",
     "common-tags": "1.8.2",
-    "prisma": "6.8.2",
+    "prisma": "6.19.0",
     "tsx": "4.20.6",
     "typescript": "5.9.3"
   }

packages/db/prisma.config.ts

@@ -0,0 +1,12 @@
+import { defineConfig } from "prisma/config"
+
+if (process.env.DATABASE_URL === undefined) {
+  throw new Error("Missing database url")
+}
+
+export default defineConfig({
+  schema: "./prisma/schema.prisma",
+  typedSql: {
+    path: "./prisma/sql",
+  },
+})

packages/db/prisma/schema.prisma

@@ -1,6 +1,6 @@
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["relationJoins"]
+  previewFeatures = ["relationJoins", "typedSql"]
 }
 
 generator zod {
@@ -223,13 +223,20 @@ enum EventStatus {
 }
 
 enum EventType {
-  SOCIAL           @map("SOCIAL")
-  ACADEMIC         @map("ACADEMIC")
-  COMPANY          @map("COMPANY")
-  // This is called "Generalforsamling" in Norwegian and happens twice a year.
+  /// Generalforsamling
   GENERAL_ASSEMBLY @map("GENERAL_ASSEMBLY")
+  /// Bedriftspresentasjon
+  COMPANY          @map("COMPANY")
+  /// Kurs
+  ACADEMIC         @map("ACADEMIC")
+  SOCIAL           @map("SOCIAL")
+  // These are for the rare occations we have events that are only open to committee members
   INTERNAL         @map("INTERNAL")
   OTHER            @map("OTHER")
+  // These are for a committe called "velkom" and are special social events for new students.
+  // These have a separate type because we have historically hid these from event lists to not
+  // spam students that are not new with these events. In older versions of OnlineWeb these
+  // were even treated as a completely separate event entity.
   WELCOME          @map("WELCOME")
 
   @@map("event_type")