go fmt ./...

KillerX · KillerX · commit d5689672e0ff · 2025-12-03T09:43:39.000+01:00
diff --git a/backend/internal/cache/keys.go b/backend/internal/cache/keys.go
@@ -36,11 +36,11 @@ const (
 	PrefixUserStreakActivity       = "userstreak:"
 
 	// Computed data
-	PrefixLeaderboard             = "leaderboard:"
-	PrefixLeaderboardPosition     = "leaderboard:position:"
-	PrefixLeaderboardCount        = "leaderboard:count:"
-	PrefixTeamLeaderboardTags     = "team:leaderboard:tags:"
-	PrefixScore                   = "score:"
+	PrefixLeaderboard         = "leaderboard:"
+	PrefixLeaderboardPosition = "leaderboard:position:"
+	PrefixLeaderboardCount    = "leaderboard:count:"
+	PrefixTeamLeaderboardTags = "team:leaderboard:tags:"
+	PrefixScore               = "score:"
 
 	// Query results
 	PrefixUsersFilter        = "usersfilter:"
@@ -72,9 +72,9 @@ const (
 	PrefixTranslation = "translation:"
 
 	// Consents
-	PrefixConsent         = "consent:"
-	PrefixUserConsents    = "userconsents:"
-	PrefixLatestConsents  = "latestconsents"
+	PrefixConsent        = "consent:"
+	PrefixUserConsents   = "userconsents:"
+	PrefixLatestConsents = "latestconsents"
 )
 
 // Key builders for different entity types
diff --git a/backend/internal/graph/api/helpers.go b/backend/internal/graph/api/helpers.go
@@ -279,7 +279,7 @@ const MaxPersonLeaderboardEntries = 20
 
 // PersonLeaderboardFilterResult contains the result of filtering person leaderboard entries
 type PersonLeaderboardFilterResult struct {
-	Entries      []services.LeaderboardEntry
+	Entries       []services.LeaderboardEntry
 	AdjustedFirst *int
 }
 
diff --git a/backend/internal/graph/api/helpers_test.go b/backend/internal/graph/api/helpers_test.go
@@ -84,15 +84,15 @@ func TestFilterPersonLeaderboardEntries(t *testing.T) {
 			entries:          createEntries(30),
 			first:            intPtr(10),
 			after:            stringPtr("15"),
-			expectedCount:    20, // All entries with rank <= 20 pass filter
+			expectedCount:    20,        // All entries with rank <= 20 pass filter
 			expectedFirstVal: intPtr(5), // Can only return 5 more (15+5=20)
 		},
 		{
 			name:             "keeps entries when after cursor is within limit",
 			entries:          createEntries(30),
 			first:            intPtr(5),
 			after:            stringPtr("5"),
-			expectedCount:    20, // All entries with rank <= 20 pass filter
+			expectedCount:    20,        // All entries with rank <= 20 pass filter
 			expectedFirstVal: intPtr(5), // 5+5=10, which is within 20
 		},
 		{
diff --git a/backend/internal/loaders/consent.go b/backend/internal/loaders/consent.go
@@ -50,12 +50,12 @@ func consentByIDBatchFunc(db *database.DB, c *cache.CacheWithRegistry) func(cont
 				}
 
 				consent := &model.Consent{
-					ID:          row.ID,
-					Key:         row.Key,
-					Version:     int(row.Version),
-					Title:       row.Title,
+					ID:           row.ID,
+					Key:          row.Key,
+					Version:      int(row.Version),
+					Title:        row.Title,
 					BodyMarkdown: row.Body,
-					PublishedAt: publishedAt,
+					PublishedAt:  publishedAt,
 				}
 
 				consentMap[row.ID] = consent
diff --git a/backend/internal/loaders/loaders.go b/backend/internal/loaders/loaders.go
@@ -14,36 +14,36 @@ import (
 // Loaders holds all dataloader instances for batching database queries
 // These are shared globally across all requests and rely on Ristretto cache for data caching
 type Loaders struct {
-	UserByIDLoader              *dataloader.Loader[string, *model.User]
-	ChurchLoader                *dataloader.Loader[string, *model.Church]
-	ProjectsByUserLoader        *dataloader.Loader[string, []*model.Project]
-	EventsByUserLoader          *dataloader.Loader[string, []*model.Event]
-	EventsByProjectLoader       *dataloader.Loader[string, []*model.Event]
-	TeamsByUserLoader           *dataloader.Loader[string, []*model.Team]
-	TeamsByProjectLoader        *dataloader.Loader[string, []*model.Team]
-	TeamsBySuperTeamLoader      *dataloader.Loader[string, []*model.Team]
-	SuperTeamsByUserLoader      *dataloader.Loader[string, []*model.SuperTeam]
+	UserByIDLoader                 *dataloader.Loader[string, *model.User]
+	ChurchLoader                   *dataloader.Loader[string, *model.Church]
+	ProjectsByUserLoader           *dataloader.Loader[string, []*model.Project]
+	EventsByUserLoader             *dataloader.Loader[string, []*model.Event]
+	EventsByProjectLoader          *dataloader.Loader[string, []*model.Event]
+	TeamsByUserLoader              *dataloader.Loader[string, []*model.Team]
+	TeamsByProjectLoader           *dataloader.Loader[string, []*model.Team]
+	TeamsBySuperTeamLoader         *dataloader.Loader[string, []*model.Team]
+	SuperTeamsByUserLoader         *dataloader.Loader[string, []*model.SuperTeam]
 	RolesByUserLoader              *dataloader.Loader[string, []*model.UserRole]
 	UsersByTeamLoader              *dataloader.Loader[string, []*model.TeamMember]
 	TeamMemberLeaderboardLoader    *dataloader.Loader[string, []model.LeaderboardEntry]
 	ProjectByIDLoader              *dataloader.Loader[string, *model.Project]
-	EventByIDLoader             *dataloader.Loader[string, *model.Event]
-	TeamByIDLoader              *dataloader.Loader[string, *model.Team]
-	SuperTeamByIDLoader         *dataloader.Loader[string, *model.SuperTeam]
-	AchievementByIDLoader       *dataloader.Loader[string, model.Achievement]
-	AchievementsByProjectLoader *dataloader.Loader[string, []model.Achievement]
-	ArticlesByAchievementLoader *dataloader.Loader[string, []model.Article]
-	TracksByAchievementLoader   *dataloader.Loader[string, []model.Track]
-	ChallengeByIDLoader         *dataloader.Loader[string, *model.Challenge]
-	ChallengesByProjectLoader   *dataloader.Loader[string, []*model.Challenge]
-	ChallengesByEventLoader     *dataloader.Loader[string, []*model.Challenge]
-	StreakByIDLoader            *dataloader.Loader[string, *model.Streak]
-	StreaksByProjectLoader      *dataloader.Loader[string, []*model.Streak]
-	RelevantDaysByStreakLoader       *dataloader.Loader[string, []model.DateRange]
-	UserStreakActivityLoader         *dataloader.Loader[UserStreakActivityKey, []*sqlc.UserStreakActivity]
-	UserAchievementTimestampLoader   *dataloader.Loader[UserAchievementKey, *time.Time]
-	TranslationLoader                *dataloader.Loader[TranslationKey, *Translation]
-	ConsentByIDLoader                *dataloader.Loader[string, *model.Consent]
+	EventByIDLoader                *dataloader.Loader[string, *model.Event]
+	TeamByIDLoader                 *dataloader.Loader[string, *model.Team]
+	SuperTeamByIDLoader            *dataloader.Loader[string, *model.SuperTeam]
+	AchievementByIDLoader          *dataloader.Loader[string, model.Achievement]
+	AchievementsByProjectLoader    *dataloader.Loader[string, []model.Achievement]
+	ArticlesByAchievementLoader    *dataloader.Loader[string, []model.Article]
+	TracksByAchievementLoader      *dataloader.Loader[string, []model.Track]
+	ChallengeByIDLoader            *dataloader.Loader[string, *model.Challenge]
+	ChallengesByProjectLoader      *dataloader.Loader[string, []*model.Challenge]
+	ChallengesByEventLoader        *dataloader.Loader[string, []*model.Challenge]
+	StreakByIDLoader               *dataloader.Loader[string, *model.Streak]
+	StreaksByProjectLoader         *dataloader.Loader[string, []*model.Streak]
+	RelevantDaysByStreakLoader     *dataloader.Loader[string, []model.DateRange]
+	UserStreakActivityLoader       *dataloader.Loader[UserStreakActivityKey, []*sqlc.UserStreakActivity]
+	UserAchievementTimestampLoader *dataloader.Loader[UserAchievementKey, *time.Time]
+	TranslationLoader              *dataloader.Loader[TranslationKey, *Translation]
+	ConsentByIDLoader              *dataloader.Loader[string, *model.Consent]
 }
 
 // newBatchedLoader creates a new batched dataloader with standard configuration:
@@ -64,35 +64,35 @@ func newBatchedLoader[K comparable, V any](
 // Should be called once at server startup
 func NewLoaders(db *database.DB, cache *cache.CacheWithRegistry) *Loaders {
 	return &Loaders{
-		UserByIDLoader:              newBatchedLoader(userByIDBatchFunc(db, cache)),
-		ChurchLoader:                newBatchedLoader(churchBatchFunc(db, cache)),
-		ProjectsByUserLoader:        newBatchedLoader(projectsByUserBatchFunc(db, cache)),
-		EventsByUserLoader:          newBatchedLoader(eventsByUserBatchFunc(db, cache)),
-		EventsByProjectLoader:       newBatchedLoader(eventsByProjectBatchFunc(db, cache)),
-		TeamsByUserLoader:           newBatchedLoader(teamsByUserBatchFunc(db, cache)),
-		TeamsByProjectLoader:        newBatchedLoader(teamsByProjectBatchFunc(db, cache)),
-		TeamsBySuperTeamLoader:      newBatchedLoader(teamsBySuperTeamBatchFunc(db, cache)),
-		SuperTeamsByUserLoader:      newBatchedLoader(superTeamsByUserBatchFunc(db, cache)),
+		UserByIDLoader:                 newBatchedLoader(userByIDBatchFunc(db, cache)),
+		ChurchLoader:                   newBatchedLoader(churchBatchFunc(db, cache)),
+		ProjectsByUserLoader:           newBatchedLoader(projectsByUserBatchFunc(db, cache)),
+		EventsByUserLoader:             newBatchedLoader(eventsByUserBatchFunc(db, cache)),
+		EventsByProjectLoader:          newBatchedLoader(eventsByProjectBatchFunc(db, cache)),
+		TeamsByUserLoader:              newBatchedLoader(teamsByUserBatchFunc(db, cache)),
+		TeamsByProjectLoader:           newBatchedLoader(teamsByProjectBatchFunc(db, cache)),
+		TeamsBySuperTeamLoader:         newBatchedLoader(teamsBySuperTeamBatchFunc(db, cache)),
+		SuperTeamsByUserLoader:         newBatchedLoader(superTeamsByUserBatchFunc(db, cache)),
 		RolesByUserLoader:              newBatchedLoader(rolesByUserBatchFunc(db, cache)),
 		UsersByTeamLoader:              newBatchedLoader(usersByTeamBatchFunc(db, cache)),
 		TeamMemberLeaderboardLoader:    newBatchedLoader(teamMemberLeaderboardBatchFunc(db, cache)),
 		ProjectByIDLoader:              newBatchedLoader(projectByIDBatchFunc(db, cache)),
-		EventByIDLoader:             newBatchedLoader(eventByIDBatchFunc(db, cache)),
-		TeamByIDLoader:              newBatchedLoader(teamByIDBatchFunc(db, cache)),
-		SuperTeamByIDLoader:         newBatchedLoader(superTeamByIDBatchFunc(db, cache)),
-		AchievementByIDLoader:       newBatchedLoader(achievementByIDBatchFunc(db, cache)),
-		AchievementsByProjectLoader: newBatchedLoader(achievementsByProjectBatchFunc(db, cache)),
-		ArticlesByAchievementLoader: newBatchedLoader(articlesByAchievementBatchFunc(db, cache)),
-		TracksByAchievementLoader:   newBatchedLoader(tracksByAchievementBatchFunc(db, cache)),
-		ChallengeByIDLoader:         newBatchedLoader(challengeByIDBatchFunc(db, cache)),
-		ChallengesByProjectLoader:   newBatchedLoader(challengesByProjectBatchFunc(db, cache)),
-		ChallengesByEventLoader:     newBatchedLoader(challengesByEventBatchFunc(db, cache)),
-		StreakByIDLoader:            newBatchedLoader(streakByIDBatchFunc(db, cache)),
-		StreaksByProjectLoader:      newBatchedLoader(streaksByProjectBatchFunc(db, cache)),
-		RelevantDaysByStreakLoader:       newBatchedLoader(relevantDaysByStreakBatchFunc(db, cache)),
-		UserStreakActivityLoader:         newBatchedLoader(userStreakActivityBatchFunc(db, cache)),
-		UserAchievementTimestampLoader:   newBatchedLoader(userAchievementTimestampBatchFunc(db, cache)),
-		TranslationLoader:                newBatchedLoader(translationBatchFunc(db, cache)),
-		ConsentByIDLoader:                newBatchedLoader(consentByIDBatchFunc(db, cache)),
+		EventByIDLoader:                newBatchedLoader(eventByIDBatchFunc(db, cache)),
+		TeamByIDLoader:                 newBatchedLoader(teamByIDBatchFunc(db, cache)),
+		SuperTeamByIDLoader:            newBatchedLoader(superTeamByIDBatchFunc(db, cache)),
+		AchievementByIDLoader:          newBatchedLoader(achievementByIDBatchFunc(db, cache)),
+		AchievementsByProjectLoader:    newBatchedLoader(achievementsByProjectBatchFunc(db, cache)),
+		ArticlesByAchievementLoader:    newBatchedLoader(articlesByAchievementBatchFunc(db, cache)),
+		TracksByAchievementLoader:      newBatchedLoader(tracksByAchievementBatchFunc(db, cache)),
+		ChallengeByIDLoader:            newBatchedLoader(challengeByIDBatchFunc(db, cache)),
+		ChallengesByProjectLoader:      newBatchedLoader(challengesByProjectBatchFunc(db, cache)),
+		ChallengesByEventLoader:        newBatchedLoader(challengesByEventBatchFunc(db, cache)),
+		StreakByIDLoader:               newBatchedLoader(streakByIDBatchFunc(db, cache)),
+		StreaksByProjectLoader:         newBatchedLoader(streaksByProjectBatchFunc(db, cache)),
+		RelevantDaysByStreakLoader:     newBatchedLoader(relevantDaysByStreakBatchFunc(db, cache)),
+		UserStreakActivityLoader:       newBatchedLoader(userStreakActivityBatchFunc(db, cache)),
+		UserAchievementTimestampLoader: newBatchedLoader(userAchievementTimestampBatchFunc(db, cache)),
+		TranslationLoader:              newBatchedLoader(translationBatchFunc(db, cache)),
+		ConsentByIDLoader:              newBatchedLoader(consentByIDBatchFunc(db, cache)),
 	}
 }
diff --git a/backend/internal/loaders/user_achievement_timestamp_test.go b/backend/internal/loaders/user_achievement_timestamp_test.go
@@ -109,19 +109,19 @@ func TestMultipleUserAchievementTimestampsInCache(t *testing.T) {
 
 	userID := "US01K8XV6VK9ED2GBZSQ2VDTAT8T"
 	achievements := []struct {
-		id        string
+		id         string
 		achievedAt *time.Time
 	}{
 		{
-			id:        "AC01K8XV6VK9ED2GBZSQ2VDTAT8T",
+			id:         "AC01K8XV6VK9ED2GBZSQ2VDTAT8T",
 			achievedAt: func() *time.Time { t := time.Now().Add(-24 * time.Hour); return &t }(),
 		},
 		{
-			id:        "AC01K8XV6VK9ED2GBZSQ2VDTAT9T",
+			id:         "AC01K8XV6VK9ED2GBZSQ2VDTAT9T",
 			achievedAt: func() *time.Time { t := time.Now().Add(-48 * time.Hour); return &t }(),
 		},
 		{
-			id:        "AC01K8XV6VK9ED2GBZSQ2VDTATZZ",
+			id:         "AC01K8XV6VK9ED2GBZSQ2VDTATZZ",
 			achievedAt: nil, // Not achieved
 		},
 	}
diff --git a/backend/internal/members/models.go b/backend/internal/members/models.go
@@ -42,7 +42,7 @@ type OrganizationAddress struct {
 // Organization contains organizational data
 type Organization struct {
 	OrgID           int
-	Name            string              `json:"districtName"`
+	Name            string `json:"districtName"`
 	Type            string
 	Uid             uuid.UUID
 	VisitingAddress OrganizationAddress `json:"visitingAddress"`

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ const MaxPersonLeaderboardEntries = 20`
`279`	`279`
`280`	`280`	`// PersonLeaderboardFilterResult contains the result of filtering person leaderboard entries`
`281`	`281`	`type PersonLeaderboardFilterResult struct {`
`282`		`- Entries []services.LeaderboardEntry`
	`282`	`+ Entries []services.LeaderboardEntry`
`283`	`283`	`AdjustedFirst *int`
`284`	`284`	`}`
`285`	`285`
Original file line number	Diff line number	Diff line change
`@@ -109,19 +109,19 @@ func TestMultipleUserAchievementTimestampsInCache(t *testing.T) {`
`109`	`109`
`110`	`110`	`userID := "US01K8XV6VK9ED2GBZSQ2VDTAT8T"`
`111`	`111`	`achievements := []struct {`
`112`		`- id string`
	`112`	`+ id string`
`113`	`113`	`achievedAt *time.Time`
`114`	`114`	`}{`
`115`	`115`	`{`
`116`		`- id: "AC01K8XV6VK9ED2GBZSQ2VDTAT8T",`
	`116`	`+ id: "AC01K8XV6VK9ED2GBZSQ2VDTAT8T",`
`117`	`117`	`achievedAt: func() time.Time { t := time.Now().Add(-24 time.Hour); return &t }(),`
`118`	`118`	`},`
`119`	`119`	`{`
`120`		`- id: "AC01K8XV6VK9ED2GBZSQ2VDTAT9T",`
	`120`	`+ id: "AC01K8XV6VK9ED2GBZSQ2VDTAT9T",`
`121`	`121`	`achievedAt: func() time.Time { t := time.Now().Add(-48 time.Hour); return &t }(),`
`122`	`122`	`},`
`123`	`123`	`{`
`124`		`- id: "AC01K8XV6VK9ED2GBZSQ2VDTATZZ",`
	`124`	`+ id: "AC01K8XV6VK9ED2GBZSQ2VDTATZZ",`
`125`	`125`	`achievedAt: nil, // Not achieved`
`126`	`126`	`},`
`127`	`127`	`}`