merge confict resolution

Author: AlexanderWangY

apps/api/cmd/api/main.go

@@ -79,7 +79,7 @@ func main() {
 	authService := services.NewAuthService(userRepo, accountRepo, sessionRepo, txm, client, logger, &cfg.Auth)
 	userService := services.NewUserService(userRepo, logger)
 	eventInterestService := services.NewEventInterestService(eventInterestRepo, logger)
-	eventService := services.NewEventService(eventRepo, userRepo, logger)
+	eventService := services.NewEventService(eventRepo, userRepo, r2Client, &cfg.CoreBuckets, logger)
 	emailService := services.NewEmailService(taskQueueClient, logger)
 	applicationService := services.NewApplicationService(applicationRepo, eventService, txm, r2Client, &cfg.CoreBuckets, logger)
 

apps/api/internal/api/api.go

@@ -126,6 +126,8 @@ func (api *API) setupRoutes(mw *mw.Middleware) {
 
 			// Admin-only
 			r.With(ensureEventAdmin).Patch("/", api.Handlers.Event.UpdateEventById)
+			r.With(ensureEventAdmin).Post("/banner", api.Handlers.Event.UploadEventBanner)
+			r.With(ensureEventAdmin).Delete("/banner", api.Handlers.Event.DeleteBanner)
 			r.With(ensureEventAdmin).Get("/staff", api.Handlers.Event.GetEventStaffUsers)
 			r.With(ensureEventAdmin).Post("/roles", api.Handlers.Event.AssignEventRole)
 

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

@@ -4,21 +4,23 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net/http"
-	"reflect"
 	"time"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-playground/validator/v10"
 	"github.com/google/uuid"
 	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
 	res "github.com/swamphacks/core/apps/api/internal/api/response"
 	"github.com/swamphacks/core/apps/api/internal/config"
 	"github.com/swamphacks/core/apps/api/internal/ctxutils"
 	"github.com/swamphacks/core/apps/api/internal/db/repository"
 	"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"
@@ -170,6 +172,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"`
+}
+
 // Update an event
 //
 //	@Summary		Update an event
@@ -193,7 +211,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
@@ -202,25 +220,53 @@ 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
+	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,
 
-	event, err := h.eventService.UpdateEventById(r.Context(), req)
+		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,
+
+		BannerDoUpdate: false, // Banners are uploaded using a separate endpoint
+		Banner:         nil,
+
+		ID: eventId,
+	}
+
+	event, err := h.eventService.UpdateEventById(r.Context(), params)
 
 	if err != nil {
 		switch err {
@@ -484,3 +530,83 @@ func (h *EventHandler) AssignEventRole(w http.ResponseWriter, r *http.Request) {
 
 	w.WriteHeader(http.StatusOK)
 }
+
+func deferredCloser(c io.Closer, name string) func() {
+	return func() {
+		if err := c.Close(); err != nil {
+			log.Err(err).Msg("Failed to close " + name)
+		}
+	}
+}
+
+const maxBannerUploadSize = 5 << 20 // 5 Mb
+
+type EventBannerUploadResponse struct {
+	BannerUrl string `json:"banner_url"`
+}
+
+func (h *EventHandler) UploadEventBanner(w http.ResponseWriter, r *http.Request) {
+	eventIdStr := chi.URLParam(r, "eventId")
+	if eventIdStr == "" {
+		res.SendError(w, http.StatusBadRequest, res.NewError("missing_event_id", "The event ID is missing from the URL!"))
+		return
+	}
+	eventId, err := uuid.Parse(eventIdStr)
+	if err != nil {
+		res.SendError(w, http.StatusBadRequest, res.NewError("invalid_event_id", "The event ID is not a valid UUID"))
+		return
+	}
+
+	if err := r.ParseMultipartForm(maxBannerUploadSize); err != nil {
+		res.SendError(w, http.StatusBadRequest, res.NewError("invalid_request", "could not parse multipart form"))
+		return
+	}
+
+	bannerFile, header, err := r.FormFile("image")
+	if err != nil {
+		res.SendError(w, http.StatusBadRequest, res.NewError("invalid_request", "invalid resume file"))
+		return
+	}
+	defer deferredCloser(bannerFile, "banner file")
+
+	url, err := h.eventService.UploadBanner(r.Context(), eventId, bannerFile, header)
+	switch err {
+	case services.ErrFailedToUploadBanner:
+		res.SendError(w, http.StatusInternalServerError, res.NewError("internal_err", "Something went wrong on our end"))
+		return
+	case services.ErrUnexpectedFileType:
+		res.SendError(w, http.StatusBadRequest, res.NewError("file_error", err.Error()))
+		return
+	case nil:
+		// Continue
+	default:
+		res.SendError(w, http.StatusInternalServerError, res.NewError("internal_err", "Something went wrong on our end"))
+		return
+	}
+
+	res.Send(w, http.StatusOK, EventBannerUploadResponse{
+		BannerUrl: *url,
+	})
+
+}
+
+func (h *EventHandler) DeleteBanner(w http.ResponseWriter, r *http.Request) {
+	eventIdStr := chi.URLParam(r, "eventId")
+	if eventIdStr == "" {
+		res.SendError(w, http.StatusBadRequest, res.NewError("missing_event_id", "The event ID is missing from the URL!"))
+		return
+	}
+	eventId, err := uuid.Parse(eventIdStr)
+	if err != nil {
+		res.SendError(w, http.StatusBadRequest, res.NewError("invalid_event_id", "The event ID is not a valid UUID"))
+		return
+	}
+
+	err = h.eventService.DeleteBanner(r.Context(), eventId)
+	if err != nil {
+		res.SendError(w, http.StatusInternalServerError, res.NewError("internal_err", "Something went wrong on our end"))
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}

apps/api/internal/api/response/response.go

@@ -31,7 +31,7 @@ func SendError(w http.ResponseWriter, status int, errorResponse ErrorResponse) {
 
 // Send marshals any successful payload struct to JSON, sets the status code,
 // and writes the response.
-func Send(w http.ResponseWriter, status int, payload interface{}) {
+func Send(w http.ResponseWriter, status int, payload any) {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(status)
 

apps/api/internal/config/config.go

@@ -35,6 +35,8 @@ type CoreBuckets struct {
 	Avatars            string `env:"USER_AVATARS" envDefault:"core-user-avatars-dev"`
 	ApplicationResumes string `env:"APPLICATION_RESUMES" envDefault:"core-application-resumes-dev"`
 	EventAssets        string `env:"EVENT_ASSETS" envDefault:"core-event-assets-dev"`
+	AvatarsBaseUrl     string `env:"USER_AVATARS_BASE_URL"`
+	EventAssetsBaseUrl string `env:"EVENT_ASSETS_BASE_URL"`
 }
 
 type Config struct {

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/db/queries/events.sql

@@ -41,7 +41,8 @@ SET
     start_time = CASE WHEN @start_time_do_update::boolean THEN @start_time ELSE start_time END,
     end_time = CASE WHEN @end_time_do_update::boolean THEN @end_time ELSE end_time END,
     website_url = CASE WHEN @website_url_do_update::boolean THEN @website_url ELSE website_url END,
-    is_published = CASE WHEN @is_published_do_update::boolean THEN @is_published ELSE is_published END
+    is_published = CASE WHEN @is_published_do_update::boolean THEN @is_published ELSE is_published END,
+    banner = CASE WHEN @banner_do_update::boolean THEN @banner ELSE banner END
 WHERE
     id = @id::uuid
 RETURNING *;