feat: Event card integration

Author: AlexanderWangY

apps/api/internal/api/handlers/events.go

@@ -224,7 +224,7 @@ func (h *EventHandler) DeleteEventById(w http.ResponseWriter, r *http.Request) {
 
 func (h *EventHandler) GetEvents(w http.ResponseWriter, r *http.Request) {
 	// Parse query params
-	// inlcude_unpublished="true,false", default: false
+	// include_unpublished="true,false", default: false
 	queryParams := r.URL.Query()
 	includeUnpublished, err := web.ParseParamBoolean(queryParams, "include_unpublished", ptr.BoolToPtr(false))
 	if err != nil {

apps/api/internal/ctxutils/user.go

@@ -28,6 +28,7 @@ func IsUser(ctx context.Context) bool {
 	return userCtx.Role == sqlc.AuthUserRoleUser
 }
 
+// Takes in the request context and returns the userID or nil if not retrievable
 func GetUserIdFromCtx(ctx context.Context) *uuid.UUID {
 	userCtx, ok := ctx.Value(mw.UserContextKey).(*mw.UserContext)
 	if !ok {

apps/api/internal/db/queries/events.sql

@@ -76,13 +76,17 @@ LEFT JOIN event_roles AS er
     AND er.user_id = $1
 ORDER BY e.start_time ASC;
 
--- name: GetEventsWithRoles :many
+-- name: GetEventsWithUserInfo :many
 SELECT
     e.*,
-    er.role AS event_role
+    er.role AS event_role,
+    a.status AS application_status
 FROM events e
 LEFT JOIN event_roles er
     ON er.event_id = e.id
     AND er.user_id = sqlc.narg(user_id)
+LEFT JOIN applications a
+    ON a.event_id = e.id
+    AND a.user_id = sqlc.narg(user_id)
 WHERE (sqlc.arg(include_unpublished)::boolean IS TRUE OR e.is_published = TRUE)
 ORDER BY e.start_time ASC;

apps/api/internal/db/repository/events.go

@@ -84,8 +84,8 @@ func (r *EventRepository) GetPublishedEvents(ctx context.Context, userId uuid.UU
 	return &events, err
 }
 
-func (r *EventRepository) GetEventsWithRoles(ctx context.Context, userId *uuid.UUID, includeUnpublished bool) (*[]sqlc.GetEventsWithRolesRow, error) {
-	events, err := r.db.Query.GetEventsWithRoles(ctx, sqlc.GetEventsWithRolesParams{
+func (r *EventRepository) GetEventsWithRoles(ctx context.Context, userId *uuid.UUID, includeUnpublished bool) (*[]sqlc.GetEventsWithUserInfoRow, error) {
+	events, err := r.db.Query.GetEventsWithUserInfo(ctx, sqlc.GetEventsWithUserInfoParams{
 		UserID:             userId,
 		IncludeUnpublished: includeUnpublished,
 	})

apps/api/internal/db/sqlc/events.sql.go

@@ -98,7 +98,7 @@ func (s *EventService) DeleteEventById(ctx context.Context, id uuid.UUID) error
 	return err
 }
 
-func (s *EventService) GetEvents(ctx context.Context, includeUnpublished bool) (*[]sqlc.GetEventsWithRolesRow, error) {
+func (s *EventService) GetEvents(ctx context.Context, includeUnpublished bool) (*[]sqlc.GetEventsWithUserInfoRow, error) {
 	isSuperuser := ctxu.IsSuperuser(ctx)
 	userId := ctxu.GetUserIdFromCtx(ctx)
 

apps/api/internal/db/sqlc/querier.go

@@ -8,7 +8,7 @@ type Events =
   operations["get-events"]["responses"]["200"]["content"]["application/json"];
 
 export async function fetchEvents(): Promise<Events> {
-  const result = await api.get<Events>("events").json();
+  const result = await api.get<Events>("events?include_unpublished=true").json();
   console.log(result);
   return result;
 }

apps/api/internal/services/events.go

@@ -10,7 +10,7 @@ import type applicationStatus from "../applicationStatus";
 import { Separator } from "@/components/ui/Seperator";
 import { Card } from "@/components/ui/Card";
 
-interface EventCardProps {
+export interface EventCardProps {
   eventId: string;
   status: keyof typeof applicationStatus;
   title: string;

apps/web/src/features/Admin/EventManager/hooks/useAdminEvents.ts

@@ -0,0 +1,21 @@
+import { api } from "@/lib/ky";
+import type { operations } from "@/lib/openapi/schema";
+import { useQuery } from "@tanstack/react-query";
+
+export const eventsQueryKey = ["events", "published"] as const;
+
+export type EventsWithUserInfo =
+  operations["get-events"]["responses"]["200"]["content"]["application/json"];
+
+export async function fetchEvents(): Promise<EventsWithUserInfo> {
+  const result = await api.get<EventsWithUserInfo>("events?include_unpublished=false").json();
+  return result;
+}
+
+export function useAdminEvents() {
+  return useQuery({
+    queryKey: eventsQueryKey,
+    queryFn: fetchEvents,
+    staleTime: 1000 * 60 * 5, // 5 minutes
+  });
+}