diff --git a/backend/database/store/storer.go b/backend/database/store/storer.go index e16dd116..683732a7 100644 --- a/backend/database/store/storer.go +++ b/backend/database/store/storer.go @@ -2,7 +2,6 @@ package store import ( "context" - "log/slog" "time" "github.com/GenerateNU/sac/backend/config" @@ -29,12 +28,10 @@ func NewRedisClient(settings config.RedisSettings) *RedisClient { } func (r *RedisClient) Get(key string) ([]byte, error) { - slog.Info("getting", "key", key) return r.client.Get(context.Background(), key).Bytes() } func (r *RedisClient) Set(key string, val []byte, exp time.Duration) error { - slog.Info("setting", "key", key, "val", string(val), "exp", exp) return r.client.Set(context.Background(), key, val, exp).Err() } diff --git a/backend/entities/events/base/routes.go b/backend/entities/events/base/routes.go index 874ce72a..c50fd75e 100644 --- a/backend/entities/events/base/routes.go +++ b/backend/entities/events/base/routes.go @@ -4,39 +4,37 @@ import ( "github.com/GenerateNU/sac/backend/entities/events/previews" "github.com/GenerateNU/sac/backend/entities/events/series" "github.com/GenerateNU/sac/backend/entities/events/tags" - "github.com/gofiber/fiber/v2" authMiddleware "github.com/GenerateNU/sac/backend/middleware/auth" "github.com/GenerateNU/sac/backend/types" ) func EventRoutes(eventParams types.RouteParams) { - eventParams.Router = EventRouter(eventParams) + // api/v1/events/* + events := eventParams.Router.Group("/events") + eventParams.Router = events + // MARK: must be called first to avoid conflict between api/v1/events/preview and api/v1/events/:eventID previews.EventPreviews(eventParams) + EventRouter(eventParams) series.EventSeries(eventParams) tags.EventTags(eventParams) } -func EventRouter(eventParams types.RouteParams) fiber.Router { +func EventRouter(eventParams types.RouteParams) { eventController := NewEventController(NewEventService(eventParams.ServiceParams)) - // api/v1/events/* - events := eventParams.Router.Group("/events") - - events.Get("/", eventParams.UtilityMiddleware.Paginator, eventController.GetEvents) - events.Post( + eventParams.Router.Get("/", eventParams.UtilityMiddleware.Paginator, eventController.GetEvents) + eventParams.Router.Post( "/", authMiddleware.AttachExtractor(eventParams.AuthMiddleware.ClubAuthorizeById, authMiddleware.ExtractFromParams("clubID")), eventController.CreateEvent, ) // api/v1/events/:eventID/* - eventID := events.Group("/:eventID") + eventID := eventParams.Router.Group("/:eventID") eventID.Get("/", eventController.GetEvent) eventID.Patch("/", eventController.UpdateEvent) eventID.Delete("/", eventController.DeleteEvent) - - return events } diff --git a/backend/entities/events/previews/controller.go b/backend/entities/events/previews/controller.go index 810d1057..b49cae98 100644 --- a/backend/entities/events/previews/controller.go +++ b/backend/entities/events/previews/controller.go @@ -8,15 +8,15 @@ import ( "github.com/gofiber/fiber/v2" ) -type EventPreviewController struct { +type Controller struct { service Service } -func NewEventController(service Service) *EventPreviewController { - return &EventPreviewController{service: service} +func NewController(service Service) *Controller { + return &Controller{service: service} } -func (e *EventPreviewController) GetEventPreviews(c *fiber.Ctx) error { +func (e *Controller) GetEventPreviews(c *fiber.Ctx) error { pageInfo, ok := fiberpaginate.FromContext(c) if !ok { return utilities.ErrExpectedPageInfo @@ -27,9 +27,9 @@ func (e *EventPreviewController) GetEventPreviews(c *fiber.Ctx) error { pageInfo = nil } - events, err := e.service.GetEventPreviews(pageInfo, c.Query("start"), c.Query("end")) + previews, err := e.service.GetEventPreviews(pageInfo, c.Query("start"), c.Query("end")) if err != nil { return err } - return c.Status(http.StatusOK).JSON(events) + return c.Status(http.StatusOK).JSON(previews) } diff --git a/backend/entities/events/previews/routes.go b/backend/entities/events/previews/routes.go index 9c7912ac..7f6ffd78 100644 --- a/backend/entities/events/previews/routes.go +++ b/backend/entities/events/previews/routes.go @@ -7,10 +7,10 @@ import ( ) func EventPreviews(eventParams types.RouteParams) { - eventController := NewEventController(NewService(eventParams.ServiceParams)) + controller := NewController(NewService(eventParams.ServiceParams)) - // api/v1/events/previews/ - eventParams.Router.Route("/previews", func(events fiber.Router) { - events.Get("/", eventParams.UtilityMiddleware.Paginator, eventController.GetEventPreviews) + // api/v1/events/previews/* + eventParams.Router.Route("/previews", func(r fiber.Router) { + r.Get("/", eventParams.UtilityMiddleware.Paginator, controller.GetEventPreviews) }) } diff --git a/backend/integrations/oauth/soth/sothic/sothic.go b/backend/integrations/oauth/soth/sothic/sothic.go index 1cb34090..92a03d21 100644 --- a/backend/integrations/oauth/soth/sothic/sothic.go +++ b/backend/integrations/oauth/soth/sothic/sothic.go @@ -290,7 +290,7 @@ func SetProvider(c *fiber.Ctx, provider string) { func StoreInSession(key string, value string, c *fiber.Ctx) error { session, err := SessionStore.Get(c) if err != nil { - slog.Info("error getting session", "error", err) + slog.Error("error getting session", "error", err) return err }