fix: events overhaul

backend/config/calendar.go

@@ -0,0 +1,24 @@
+package config
+
+import (
+	"time"
+)
+
+type CalendarSettings struct {
+	MaxTerminationDate time.Time
+}
+
+type intermediateCalendarSettings struct {
+	MaxTerminationDate string `yaml:"maxterminationdate"`
+}
+
+func (int *intermediateCalendarSettings) into() (*CalendarSettings, error) {
+	t, err := time.Parse("01-02-2006", int.MaxTerminationDate)
+	if err != nil {
+		return nil, err
+	}
+
+	return &CalendarSettings{
+		MaxTerminationDate: t,
+	}, nil
+}

backend/config/config.go

@@ -8,21 +8,23 @@ import (
 )
 
 type Settings struct {
-	Application      ApplicationSettings
-	Database         DatabaseSettings
-	SuperUser        SuperUserSettings
-	Auth             AuthSettings
-	AWS              AWSSettings
-	PineconeSettings PineconeSettings
-	OpenAISettings   OpenAISettings
-	ResendSettings   ResendSettings
+	Application ApplicationSettings
+	Database    DatabaseSettings
+	SuperUser   SuperUserSettings
+	Auth        AuthSettings
+	AWS         AWSSettings
+	Pinecone    PineconeSettings
+	OpenAI      OpenAISettings
+	Resend      ResendSettings
+	Calendar    CalendarSettings
 }
 
 type intermediateSettings struct {
 	Application ApplicationSettings           `yaml:"application"`
 	Database    intermediateDatabaseSettings  `yaml:"database"`
 	SuperUser   intermediateSuperUserSettings `yaml:"superuser"`
 	Auth        intermediateAuthSettings      `yaml:"authsecret"`
+	Calendar    intermediateCalendarSettings  `yaml:"calendar"`
 }
 
 func (int *intermediateSettings) into() (*Settings, error) {
@@ -41,11 +43,17 @@ func (int *intermediateSettings) into() (*Settings, error) {
 		return nil, err
 	}
 
+	calendarSettings, err := int.Calendar.into()
+	if err != nil {
+		return nil, err
+	}
+
 	return &Settings{
 		Application: int.Application,
 		Database:    *databaseSettings,
 		SuperUser:   *superUserSettings,
 		Auth:        *authSettings,
+		Calendar:    *calendarSettings,
 	}, nil
 }
 

backend/config/local.go

@@ -42,14 +42,14 @@ func readLocal(v *viper.Viper, path string, useDevDotEnv bool) (*Settings, error
 		return nil, fmt.Errorf("failed to read Pinecone settings: %w", err)
 	}
 
-	settings.PineconeSettings = *pineconeSettings
+	settings.Pinecone = *pineconeSettings
 
 	openAISettings, err := readOpenAISettings()
 	if err != nil {
 		return nil, fmt.Errorf("failed to read OpenAI settings: %w", err)
 	}
 
-	settings.OpenAISettings = *openAISettings
+	settings.OpenAI = *openAISettings
 
 	awsSettings, err := readAWSSettings()
 	if err != nil {
@@ -63,7 +63,7 @@ func readLocal(v *viper.Viper, path string, useDevDotEnv bool) (*Settings, error
 		return nil, fmt.Errorf("failed to read Resend settings: %w", err)
 	}
 
-	settings.ResendSettings = *resendSettings
+	settings.Resend = *resendSettings
 
 	return settings, nil
 }

backend/config/production.go

@@ -14,6 +14,7 @@ import (
 type ProductionSettings struct {
 	Database    ProductionDatabaseSettings    `yaml:"database"`
 	Application ProductionApplicationSettings `yaml:"application"`
+	Calendar    CalendarSettings              `yaml:"calendar"`
 }
 
 type ProductionDatabaseSettings struct {
@@ -118,9 +119,10 @@ func readProd(v *viper.Viper) (*Settings, error) {
 			AccessKey:  authAccessKey,
 			RefreshKey: authRefreshKey,
 		},
-		PineconeSettings: *pineconeSettings,
-		OpenAISettings:   *openAISettings,
-		AWS:              *awsSettings,
-		ResendSettings:   *resendSettings,
+		Pinecone: *pineconeSettings,
+		OpenAI:   *openAISettings,
+		AWS:      *awsSettings,
+		Resend:   *resendSettings,
+		Calendar: prodSettings.Calendar,
 	}, nil
 }

backend/entities/clubs/base/routes.go

@@ -8,16 +8,14 @@ import (
 	"github.com/GenerateNU/sac/backend/entities/clubs/member"
 	"github.com/GenerateNU/sac/backend/entities/clubs/poc"
 	"github.com/GenerateNU/sac/backend/entities/clubs/tag"
+	"github.com/GenerateNU/sac/backend/middleware"
 
 	"github.com/GenerateNU/sac/backend/types"
 	"github.com/gofiber/fiber/v2"
 )
 
 func ClubRoutes(clubParams types.RouteParams) {
-	clubIDRouter := ClubRouter(clubParams)
-
-	// update the router in params
-	clubParams.Router = clubIDRouter
+	clubParams.Router = ClubRouter(clubParams)
 
 	tag.ClubTag(clubParams)
 	follower.ClubFollower(clubParams)
@@ -40,7 +38,10 @@ func ClubRouter(clubParams types.RouteParams) fiber.Router {
 	clubID := clubs.Group("/:clubID")
 
 	clubID.Get("/", clubController.GetClub)
-	clubID.Patch("/", clubParams.AuthMiddleware.ClubAuthorizeById, clubController.UpdateClub)
+	clubID.Patch(
+		"/",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubController.UpdateClub)
 	clubID.Delete("/", clubParams.AuthMiddleware.Authorize(p.DeleteAll), clubController.DeleteClub)
 
 	return clubID

backend/entities/clubs/contact/routes.go

@@ -1,6 +1,7 @@
 package contact
 
 import (
+	"github.com/GenerateNU/sac/backend/middleware"
 	"github.com/GenerateNU/sac/backend/types"
 )
 
@@ -11,5 +12,9 @@ func ClubContact(clubParams types.RouteParams) {
 
 	// api/v1/clubs/:clubID/contacts/*
 	clubContacts.Get("/", clubContactController.GetClubContacts)
-	clubContacts.Put("/", clubParams.AuthMiddleware.ClubAuthorizeById, clubContactController.PutContact)
+	clubContacts.Put(
+		"/",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubContactController.PutContact,
+	)
 }

backend/entities/clubs/member/routes.go

@@ -1,6 +1,7 @@
 package member
 
 import (
+	"github.com/GenerateNU/sac/backend/middleware"
 	"github.com/GenerateNU/sac/backend/types"
 )
 
@@ -11,6 +12,14 @@ func ClubMember(clubParams types.RouteParams) {
 
 	// api/v1/clubs/:clubID/members/*
 	clubMembers.Get("/", clubMemberController.GetClubMembers)
-	clubMembers.Post("/:userID", clubParams.AuthMiddleware.ClubAuthorizeById, clubMemberController.CreateClubMember)
-	clubMembers.Delete("/:userID", clubParams.AuthMiddleware.ClubAuthorizeById, clubMemberController.DeleteClubMember)
+	clubMembers.Post(
+		"/:userID",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubMemberController.CreateClubMember,
+	)
+	clubMembers.Delete(
+		"/:userID",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubMemberController.DeleteClubMember,
+	)
 }

backend/entities/clubs/poc/routes.go

@@ -1,6 +1,7 @@
 package poc
 
 import (
+	"github.com/GenerateNU/sac/backend/middleware"
 	"github.com/GenerateNU/sac/backend/types"
 )
 
@@ -12,8 +13,24 @@ func ClubPointOfContact(clubParams types.RouteParams) {
 	// api/v1/clubs/:clubID/pocs/*
 	clubPointOfContacts.Get("/", clubPointOfContactController.GetClubPointOfContacts)
 	clubPointOfContacts.Get("/:pocID", clubPointOfContactController.GetClubPointOfContact)
-	clubPointOfContacts.Post("/", clubParams.AuthMiddleware.ClubAuthorizeById, clubPointOfContactController.CreateClubPointOfContact)
-	clubPointOfContacts.Patch("/:pocID", clubParams.AuthMiddleware.ClubAuthorizeById, clubPointOfContactController.UpdateClubPointOfContact)
-	clubPointOfContacts.Patch("/:pocID/photo", clubParams.AuthMiddleware.ClubAuthorizeById, clubPointOfContactController.UpdateClubPointOfContactPhoto)
-	clubPointOfContacts.Delete("/:pocID", clubParams.AuthMiddleware.ClubAuthorizeById, clubPointOfContactController.DeleteClubPointOfContact)
+	clubPointOfContacts.Post(
+		"/",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubPointOfContactController.CreateClubPointOfContact,
+	)
+	clubPointOfContacts.Patch(
+		"/:pocID",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubPointOfContactController.UpdateClubPointOfContact,
+	)
+	clubPointOfContacts.Patch(
+		"/:pocID/photo",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubPointOfContactController.UpdateClubPointOfContactPhoto,
+	)
+	clubPointOfContacts.Delete(
+		"/:pocID",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubPointOfContactController.DeleteClubPointOfContact,
+	)
 }

backend/entities/clubs/tag/routes.go

@@ -1,6 +1,7 @@
 package tag
 
 import (
+	"github.com/GenerateNU/sac/backend/middleware"
 	"github.com/GenerateNU/sac/backend/types"
 )
 
@@ -11,6 +12,14 @@ func ClubTag(clubParams types.RouteParams) {
 
 	// api/v1/clubs/:clubID/tags/*
 	clubTags.Get("/", clubTagController.GetClubTags)
-	clubTags.Post("/", clubParams.AuthMiddleware.ClubAuthorizeById, clubTagController.CreateClubTags)
-	clubTags.Delete("/:tagID", clubParams.AuthMiddleware.ClubAuthorizeById, clubTagController.DeleteClubTag)
+	clubTags.Post(
+		"/",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubTagController.CreateClubTags,
+	)
+	clubTags.Delete(
+		"/:tagID",
+		middleware.AttachExtractor(clubParams.AuthMiddleware.ClubAuthorizeById, middleware.ExtractFromParams("clubID")),
+		clubTagController.DeleteClubTag,
+	)
 }

backend/entities/clubs/tag/transactions.go

@@ -11,12 +11,12 @@ import (
 )
 
 func CreateClubTags(db *gorm.DB, id uuid.UUID, tags []models.Tag) ([]models.Tag, error) {
-	user, err := clubs.GetClub(db, id, transactions.PreloadTag())
+	club, err := clubs.GetClub(db, id, transactions.PreloadTag())
 	if err != nil {
 		return nil, err
 	}
 
-	if err := db.Model(&user).Association("Tag").Append(tags); err != nil {
+	if err := db.Model(&club).Association("Tag").Append(tags); err != nil {
 		return nil, err
 	}
 
@@ -26,7 +26,7 @@ func CreateClubTags(db *gorm.DB, id uuid.UUID, tags []models.Tag) ([]models.Tag,
 func GetClubTags(db *gorm.DB, id uuid.UUID) ([]models.Tag, error) {
 	var tags []models.Tag
 
-	club, err := clubs.GetClub(db, id)
+	club, err := clubs.GetClub(db, id, transactions.PreloadTag())
 	if err != nil {
 		return nil, err
 	}
@@ -38,7 +38,7 @@ func GetClubTags(db *gorm.DB, id uuid.UUID) ([]models.Tag, error) {
 }
 
 func DeleteClubTag(db *gorm.DB, id uuid.UUID, tagID uuid.UUID) error {
-	club, err := clubs.GetClub(db, id)
+	club, err := clubs.GetClub(db, id, transactions.PreloadTag())
 	if err != nil {
 		return err
 	}