Minor Fixes

GenerateNU · Mar 5, 2024 · 93ba58f · 93ba58f
1 parent 6714fab
commit 93ba58f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 131 deletions.
diff --git a/backend/src/controllers/event.go b/backend/src/controllers/event.go
@@ -139,7 +139,7 @@ func (e *EventController) CreateEvent(c *fiber.Ctx) error {
 	return c.Status(fiber.StatusCreated).JSON(event)
 }
 
-// CreateSeries godoc
+// UpdateEvent godoc
 //
 // @Summary		Create a series
 // @Description	Creates a series
@@ -148,7 +148,7 @@ func (e *EventController) CreateEvent(c *fiber.Ctx) error {
 // @Accept		json
 // @Produce		json
 // @Param		eventID	path	string	true	"Event ID"
-// @Param		seriesBody	body	models.CreateSeriesRequestBody	true	"Series Body"
+// @Param		seriesBody	body	models.UpdateEventRequestBody	true	"Series Body"
 // @Success		201	  {object}	  models.Series
 // @Failure     400   {object}    errors.Error
 // @Failure     401   {object}    errors.Error

diff --git a/backend/src/errors/auth.go b/backend/src/errors/auth.go
@@ -11,4 +11,8 @@ var (
 		StatusCode: fiber.StatusInternalServerError,
 		Message:    "failed to cast to custom claims",
 	}
+	FailedToValidateUpdatePasswordBody = Error {
+		StatusCode: fiber.StatusBadRequest,
+		Message:    "failed to validate update password body",
+	}
 )
diff --git a/backend/src/models/event.go b/backend/src/models/event.go
@@ -100,19 +100,13 @@ type CreateEventRequestBody struct {
 }
 
 type UpdateEventRequestBody struct {
-	Name      string    `json:"name" validate:"required,max=255"`
-	Preview   string    `json:"preview" validate:"required,max=255"`
-	Content   string    `json:"content" validate:"required,max=255"`
-	StartTime time.Time `json:"start_time" validate:"required,datetime,ltecsfield=EndTime"`
-	EndTime   time.Time `json:"end_time" validate:"required,datetime,gtecsfield=StartTime"`
-	Location  string    `json:"location" validate:"required,max=255"`
-	EventType EventType `gorm:"type:varchar(255);default:open" json:"event_type" validate:"required,max=255"`
-
-	RSVP         []User         `json:"-" validate:"-"`
-	Waitlist     []User         `json:"-" validate:"-"`
-	Club         []Club         `json:"-" validate:"-"`
-	Tag          []Tag          `json:"-" validate:"-"`
-	Notification []Notification `json:"-" validate:"-"`
+	Name      string    `json:"name" validate:"max=255"`
+	Preview   string    `json:"preview" validate:"max=255"`
+	Content   string    `json:"content" validate:"max=255"`
+	StartTime time.Time `json:"start_time" validate:"ltecsfield=EndTime"`
+	EndTime   time.Time `json:"end_time" validate:"gtecsfield=StartTime"`
+	Location  string    `json:"location" validate:"max=255"`
+	EventType EventType `gorm:"type:varchar(255);default:open" json:"event_type" validate:"max=255"`
 }
 
 type UpdateSeriesRequestBody struct {

diff --git a/backend/src/server/routes/event.go b/backend/src/server/routes/event.go
@@ -20,19 +20,14 @@ func Event(router fiber.Router, eventService services.EventServiceInterface, aut
 	eventID := events.Group("/:eventID")
 
 	eventID.Get("/", eventController.GetEvent)
-	eventID.Get("/series", eventController.GetSeriesByEventID)
-	events.Patch("/", authMiddleware.ClubAuthorizeById, eventController.UpdateEvent)
+	eventID.Patch("/", authMiddleware.ClubAuthorizeById, eventController.UpdateEvent)
 	eventID.Delete("/", authMiddleware.ClubAuthorizeById, eventController.DeleteEvent)
-	eventID.Delete("/series", authMiddleware.ClubAuthorizeById, eventController.DeleteSeriesByEventID)
 
 	// api/v1/events/:eventID/series/*
 	series := events.Group("/series")
 
 	series.Get("/", eventController.GetSeriesByEventID)
-	series.Delete("/", eventController.DeleteSeriesByEventID)
-
-	series.Get("/", eventController.GetSeriesByEventID)
-	series.Delete("/", eventController.DeleteSeriesByEventID)
+	series.Delete("/", authMiddleware.ClubAuthorizeById, eventController.DeleteSeriesByEventID)
 
 	// api/v1/events/:eventID/series/:seriesID/*
 	seriesID := series.Group("/:seriesID")

diff --git a/backend/src/server/routes/tag.go b/backend/src/server/routes/tag.go
@@ -14,8 +14,11 @@ func Tag(router fiber.Router, tagService services.TagServiceInterface, authMiddl
 	tags := router.Group("/tags")
 
 	tags.Get("/", tagController.GetTags)
-	tags.Get("/:tagID", tagController.GetTag)
 	tags.Post("/", authMiddleware.Authorize(p.CreateAll), tagController.CreateTag)
-	tags.Patch("/:tagID", authMiddleware.Authorize(p.WriteAll), tagController.UpdateTag)
-	tags.Delete("/:tagID", authMiddleware.Authorize(p.DeleteAll), tagController.DeleteTag)
+
+	tagID := tags.Group("/:tagID");
+
+	tagID.Get("/", tagController.GetTag)
+	tagID.Patch("/", authMiddleware.Authorize(p.WriteAll), tagController.UpdateTag)
+	tagID.Delete("/", authMiddleware.Authorize(p.DeleteAll), tagController.DeleteTag)
 }
diff --git a/backend/src/services/auth.go b/backend/src/services/auth.go
@@ -85,7 +85,7 @@ func (a *AuthService) UpdatePassword(id string, passwordBody models.UpdatePasswo
 
 	// TODO: Validate password
 	if err := a.Validate.Struct(passwordBody); err != nil {
-		return &errors.FailedToValidateUser
+		return &errors.FailedToValidateUpdatePasswordBody
 	}
 
 	passwordHash, err := transactions.GetUserPasswordHash(a.DB, *idAsUint)

diff --git a/backend/src/transactions/club_event.go b/backend/src/transactions/club_event.go
@@ -8,10 +8,15 @@ import (
 )
 
 func GetClubEvents(db *gorm.DB, clubID uuid.UUID, limit int, offset int) ([]models.Event, *errors.Error) {
+	club, err := GetClub(db, clubID)
+	if err != nil {
+		return nil, err
+	}
+
 	var events []models.Event
 
-	if err := db.Where("club_id = ?", clubID).Limit(limit).Offset(offset).Find(&events).Error; err != nil {
-		return nil, &errors.FailedToGetEvents
+	if err := db.Model(&club).Association("Event").Find(&events); err != nil {
+		return nil, &errors.FailedToGetClubMembers
 	}
 
 	return events, nil