feat: event settings page and form

Author: AlexanderWangY

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

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 	"time"
 
 	"github.com/go-chi/chi/v5"
@@ -19,6 +18,7 @@ import (
 	"github.com/swamphacks/core/apps/api/internal/db/sqlc"
 	"github.com/swamphacks/core/apps/api/internal/email"
 	"github.com/swamphacks/core/apps/api/internal/parse"
+	. "github.com/swamphacks/core/apps/api/internal/parse"
 	"github.com/swamphacks/core/apps/api/internal/ptr"
 	"github.com/swamphacks/core/apps/api/internal/services"
 	"github.com/swamphacks/core/apps/api/internal/web"
@@ -146,6 +146,22 @@ func (h *EventHandler) GetEventByID(w http.ResponseWriter, r *http.Request) {
 	res.Send(w, http.StatusOK, event)
 }
 
+type UpdateEventFields struct {
+	Name             Optional[string]     `json:"name"`
+	Description      Optional[*string]    `json:"description"`
+	Location         Optional[*string]    `json:"location"`
+	LocationUrl      Optional[*string]    `json:"location_url"`
+	MaxAttendees     Optional[*int32]     `json:"max_attendees"`
+	ApplicationOpen  Optional[time.Time]  `json:"application_open"`
+	ApplicationClose Optional[time.Time]  `json:"application_close"`
+	RsvpDeadline     Optional[*time.Time] `json:"rsvp_deadline"`
+	DecisionRelease  Optional[*time.Time] `json:"decision_release"`
+	StartTime        Optional[time.Time]  `json:"start_time"`
+	EndTime          Optional[time.Time]  `json:"end_time"`
+	WebsiteUrl       Optional[*string]    `json:"website_url"`
+	IsPublished      Optional[bool]       `json:"is_published"`
+}
+
 func (h *EventHandler) UpdateEventById(w http.ResponseWriter, r *http.Request) {
 	eventIdStr := chi.URLParam(r, "eventId")
 	if eventIdStr == "" {
@@ -158,7 +174,7 @@ func (h *EventHandler) UpdateEventById(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var req sqlc.UpdateEventByIdParams
+	var req UpdateEventFields
 
 	decoder := json.NewDecoder(r.Body)
 	decoder.DisallowUnknownFields() // Prevents requests with extraneous fields
@@ -167,25 +183,50 @@ func (h *EventHandler) UpdateEventById(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Refactorme: could be improved by unmarshalling values into a generic that can include nil information
-	// Todo: make sure that non nullable values can't be updated to null
-	// Todo: Time validation
-	req.NameDoUpdate = reflect.ValueOf(req.Name).IsValid()
-	req.DescriptionDoUpdate = reflect.ValueOf(req.Description).IsValid()
-	req.LocationDoUpdate = reflect.ValueOf(req.Location).IsValid()
-	req.LocationUrlDoUpdate = reflect.ValueOf(req.LocationUrl).IsValid()
-	req.MaxAttendeesDoUpdate = reflect.ValueOf(req.MaxAttendees).IsValid()
-	req.ApplicationOpenDoUpdate = reflect.ValueOf(req.ApplicationOpen).IsValid()
-	req.ApplicationCloseDoUpdate = reflect.ValueOf(req.ApplicationClose).IsValid()
-	req.RsvpDeadlineDoUpdate = reflect.ValueOf(req.RsvpDeadline).IsValid()
-	req.DecisionReleaseDoUpdate = reflect.ValueOf(req.DecisionRelease).IsValid()
-	req.StartTimeDoUpdate = reflect.ValueOf(req.StartTime).IsValid()
-	req.EndTimeDoUpdate = reflect.ValueOf(req.EndTime).IsValid()
-	req.WebsiteUrlDoUpdate = reflect.ValueOf(req.WebsiteUrl).IsValid()
-	req.IsPublishedDoUpdate = reflect.ValueOf(req.IsPublished).IsValid()
-	req.ID = eventId
-
-	event, err := h.eventService.UpdateEventById(r.Context(), req)
+	var params = sqlc.UpdateEventByIdParams{
+		NameDoUpdate: req.Name.Present,
+		Name:         req.Name.Value,
+
+		DescriptionDoUpdate: req.Description.Present,
+		Description:         req.Description.Value,
+
+		LocationDoUpdate: req.Location.Present,
+		Location:         req.Location.Value,
+
+		LocationUrlDoUpdate: req.LocationUrl.Present,
+		LocationUrl:         req.LocationUrl.Value,
+
+		MaxAttendeesDoUpdate: req.MaxAttendees.Present,
+		MaxAttendees:         req.MaxAttendees.Value,
+
+		ApplicationOpenDoUpdate: req.ApplicationOpen.Present,
+		ApplicationOpen:         req.ApplicationOpen.Value,
+
+		ApplicationCloseDoUpdate: req.ApplicationClose.Present,
+		ApplicationClose:         req.ApplicationClose.Value,
+
+		RsvpDeadlineDoUpdate: req.RsvpDeadline.Present,
+		RsvpDeadline:         req.RsvpDeadline.Value,
+
+		DecisionReleaseDoUpdate: req.DecisionRelease.Present,
+		DecisionRelease:         req.DecisionRelease.Value,
+
+		StartTimeDoUpdate: req.StartTime.Present,
+		StartTime:         req.StartTime.Value,
+
+		EndTimeDoUpdate: req.EndTime.Present,
+		EndTime:         req.EndTime.Value,
+
+		WebsiteUrlDoUpdate: req.WebsiteUrl.Present,
+		WebsiteUrl:         req.WebsiteUrl.Value,
+
+		IsPublishedDoUpdate: req.IsPublished.Present,
+		IsPublished:         &req.IsPublished.Value,
+
+		ID: eventId,
+	}
+
+	event, err := h.eventService.UpdateEventById(r.Context(), params)
 
 	if err != nil {
 		switch err {

apps/api/internal/db/migrations/20250917044049_add_event_banner.sql

@@ -0,0 +1,11 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TABLE events
+ADD COLUMN banner TEXT;
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+ALTER TABLE events
+DROP COLUMN banner;
+-- +goose StatementEnd

apps/api/internal/parse/optional.go

@@ -0,0 +1,13 @@
+package parse
+
+import "encoding/json"
+
+type Optional[T any] struct {
+	Value   T
+	Present bool
+}
+
+func (o *Optional[T]) UnmarshalJSON(data []byte) error {
+	o.Present = true
+	return json.Unmarshal(data, &o.Value)
+}

apps/web/src/components/ui/DatePicker/DatePicker.tsx

@@ -41,7 +41,7 @@ export function DatePicker<T extends DateValue>({
     >
       {label && <Label isRequired={props.isRequired}>{label}</Label>}
       <FieldGroup className="min-w-[208px] w-auto border-1 rounded-sm items-center bg-input-bg">
-        <DateInput className="flex-1 min-w-[150px] px-2 py-1.5 text-sm" />
+        <DateInput className="flex-1 min-w-[150px] px-2 py-2 text-sm" />
         <Button
           variant="icon"
           className="w-6 mr-1 rounded-sm outline-offset-0 px-0 py-1"

apps/web/src/features/Admin/EventManager/components/AddEventModal.tsx

@@ -6,32 +6,28 @@ import {
   OverlayTriggerStateContext,
   Text,
   type DateRange,
-  type DateValue,
 } from "react-aria-components";
 import z from "zod";
 import { useCreateAdminEvent } from "../hooks/useCreateAdminEvent";
 import { useFormErrors } from "@/components/Form";
 import { Modal } from "@/components/ui/Modal";
 import { DateRangePicker } from "@/components/ui/DateRangePicker";
 import { useContext } from "react";
-
-const calenderDateTimeSchema = z
-  .custom<DateValue>()
-  .transform((val) => val.toDate("UTC"));
+import { DateTimeSchema } from "@/utils/customSchemas";
 
 const addEventSchema = z.object({
   eventName: z.string().min(1, "Event name is required"),
   eventDateRange: z.object(
     {
-      start: calenderDateTimeSchema,
-      end: calenderDateTimeSchema,
+      start: DateTimeSchema,
+      end: DateTimeSchema,
     },
     "Must specify a date range.",
   ),
   applicationDateRange: z.object(
     {
-      start: calenderDateTimeSchema,
-      end: calenderDateTimeSchema,
+      start: DateTimeSchema,
+      end: DateTimeSchema,
     },
     "Must specify a date range.",
   ),

apps/web/src/features/Event/api/getEvent.ts

@@ -0,0 +1,11 @@
+import { api } from "@/lib/ky";
+import type { operations } from "@/lib/openapi/schema";
+
+type Event =
+  operations["get-single-event"]["responses"]["201"]["content"]["application/json"];
+
+export async function getEventById(eventId: string): Promise<Event> {
+  const result = await api.get<Event>(`events/${eventId}`).json();
+
+  return result;
+}