Challenges +++

Author: KillerX

CLAUDE.md

@@ -124,4 +124,5 @@ Each project can contain multiple events, which usually is some form of in-perso
 - Put notes into notes folder. Before doing a big investigation check if we already have notes on the system.
 - Update the notes if you make changes to schemas and other things that invalidate the notes.
 - Do not EVER automatically run the seed script!
-- NEVER SEED WITHOUT EXPLICIT PERMISSION
+- NEVER SEED WITHOUT EXPLICIT PERMISSION
+- Do not run migration without explicit aproval!

backend/internal/cache/invalidation.go

@@ -81,6 +81,7 @@ func extractPrefixes(key string) []string {
 		PrefixUser, PrefixChurch, PrefixProject, PrefixEvent, PrefixTeam,
 		PrefixSuperTeam, PrefixChallenge, PrefixAchievement, PrefixStreak,
 		PrefixUserProjects, PrefixUserEvents, PrefixTeamMembers, PrefixUserRoles,
+		PrefixUserChallengeEnrollments, PrefixUserChallengeCompletions,
 		PrefixUsersFilter, PrefixUsersCount,
 		PrefixProjectsFilter, PrefixProjectsCount,
 		PrefixEventsFilter, PrefixEventsCount,
@@ -176,6 +177,9 @@ func (c *CacheWithRegistry) InvalidateUser(userID string) {
 	c.Delete(ProjectsByUserKey(userID))
 	c.Delete(UserRolesKey(userID))
 	c.DeletePrefix("user:" + userID)
+	// Invalidate enrollment and completion data
+	c.DeletePrefix(PrefixUserChallengeEnrollments + userID)
+	c.DeletePrefix(PrefixUserChallengeCompletions + userID)
 }
 
 // InvalidateProject invalidates all cache entries related to a project
@@ -239,6 +243,11 @@ func (c *CacheWithRegistry) InvalidateChallenge(challengeID string) {
 	// These are invalidated globally since filter query cache keys are hashed
 	c.DeletePrefix(PrefixChallengesFilter)
 	c.DeletePrefix(PrefixChallengesCount)
+
+	// Invalidate enrollment and completion data for this challenge
+	// This is more aggressive but necessary since we don't track reverse index
+	c.DeletePrefix(PrefixUserChallengeEnrollments)
+	c.DeletePrefix(PrefixUserChallengeCompletions)
 }
 
 // InvalidateAchievement invalidates all cache entries related to an achievement

backend/internal/cache/keys.go

@@ -29,11 +29,12 @@ const (
 	PrefixUserRoles    = "userroles:"
 
 	// Progress tracking
-	PrefixUserAchievements         = "userachievements:"
-	PrefixUserChallengeCompletions = "userchallenges:"
-	PrefixUserReadingProgress      = "userreading:"
-	PrefixUserListeningProgress    = "userlistening:"
-	PrefixUserStreakActivity       = "userstreak:"
+	PrefixUserAchievements           = "userachievements:"
+	PrefixUserChallengeCompletions   = "userchallenges:"
+	PrefixUserChallengeEnrollments   = "userchallengeenrollments:"
+	PrefixUserReadingProgress        = "userreading:"
+	PrefixUserListeningProgress      = "userlistening:"
+	PrefixUserStreakActivity         = "userstreak:"
 
 	// Computed data
 	PrefixLeaderboard         = "leaderboard:"
@@ -226,6 +227,16 @@ func UserAchievementTimestampKey(userID string, achievementID string) string {
 	return fmt.Sprintf("%s%s:%s", PrefixUserAchievements, userID, achievementID)
 }
 
+// UserChallengeEnrollmentKey builds a cache key for user challenge enrollment timestamp
+func UserChallengeEnrollmentKey(userID string, challengeID string) string {
+	return fmt.Sprintf("%s%s:%s", PrefixUserChallengeEnrollments, userID, challengeID)
+}
+
+// UserChallengeCompletionKey builds a cache key for user challenge completion timestamp
+func UserChallengeCompletionKey(userID string, challengeID string) string {
+	return fmt.Sprintf("%s%s:%s", PrefixUserChallengeCompletions, userID, challengeID)
+}
+
 // TeamMembersByTeamKey builds a cache key for team members
 func TeamMembersByTeamKey(teamID string) string {
 	return PrefixTeamMembers + teamID

backend/internal/database/migrations/00033_add_challenge_enrollment.sql

@@ -0,0 +1,44 @@
+-- +goose Up
+-- +goose StatementBegin
+
+-- Add new timestamp columns to challenges table for state management
+ALTER TABLE challenges
+    ADD COLUMN visible_at TIMESTAMPTZ,
+    ADD COLUMN started_at TIMESTAMPTZ,
+    ADD COLUMN requires_team_membership BOOLEAN DEFAULT false NOT NULL,
+    ADD COLUMN requires_super_team_membership BOOLEAN DEFAULT false NOT NULL;
+
+-- Add index on visible_at for filtering queries
+CREATE INDEX idx_challenges_visible ON challenges(visible_at) WHERE visible_at IS NOT NULL;
+
+-- Create enrollment junction table following existing patterns
+CREATE TABLE user_challenge_enrollments (
+    user_id CHAR(28) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    challenge_id CHAR(28) NOT NULL REFERENCES challenges(id) ON DELETE CASCADE,
+    enrolled_at TIMESTAMPTZ DEFAULT now() NOT NULL,
+    PRIMARY KEY (user_id, challenge_id)
+);
+
+CREATE INDEX idx_user_challenge_enrollments_user ON user_challenge_enrollments(user_id);
+CREATE INDEX idx_user_challenge_enrollments_challenge ON user_challenge_enrollments(challenge_id);
+CREATE INDEX idx_user_challenge_enrollments_time ON user_challenge_enrollments(enrolled_at);
+
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+
+-- Drop enrollment table
+DROP TABLE IF EXISTS user_challenge_enrollments;
+
+-- Drop index
+DROP INDEX IF EXISTS idx_challenges_visible;
+
+-- Remove columns from challenges
+ALTER TABLE challenges
+    DROP COLUMN IF EXISTS requires_super_team_membership,
+    DROP COLUMN IF EXISTS requires_team_membership,
+    DROP COLUMN IF EXISTS started_at,
+    DROP COLUMN IF EXISTS visible_at;
+
+-- +goose StatementEnd

backend/internal/database/queries/achievements.sql

@@ -342,3 +342,10 @@ SELECT achievement_id, achieved_at
 FROM user_achievements
 WHERE user_id = @userid::text
   AND achievement_id = ANY(@achievement_ids::text[]);
+
+-- name: GetBulkUserAchievementTimestamps :many
+SELECT user_id, achievement_id, achieved_at
+FROM user_achievements
+WHERE (user_id, achievement_id) IN (
+    SELECT unnest(@user_ids::text[]), unnest(@achievement_ids::text[])
+);

backend/internal/database/queries/challenge_completions.sql

@@ -0,0 +1,34 @@
+-- Challenge Completion Operations
+
+-- name: CompleteUserChallenge :one
+INSERT INTO user_challenge_completions (user_id, challenge_id, completed_at)
+VALUES (@userid::text, @challengeid::text, COALESCE(@completedat, now()))
+ON CONFLICT (user_id, challenge_id) DO UPDATE SET completed_at = COALESCE(@completedat, now())
+RETURNING completed_at;
+
+-- name: UncompleteUserFromChallenge :exec
+DELETE FROM user_challenge_completions
+WHERE user_id = @userid::text AND challenge_id = @challengeid::text;
+
+-- name: IsUserChallengeCompleted :one
+SELECT EXISTS(
+    SELECT 1
+    FROM user_challenge_completions
+    WHERE user_id = @userid::text AND challenge_id = @challengeid::text
+) AS is_completed;
+
+-- name: GetUserCompletionTimestamp :one
+SELECT completed_at
+FROM user_challenge_completions
+WHERE user_id = @userid::text AND challenge_id = @challengeid::text;
+
+-- name: GetCompletedUsersForChallenge :many
+SELECT user_id, completed_at
+FROM user_challenge_completions
+WHERE challenge_id = @challengeid::text
+ORDER BY completed_at ASC;
+
+-- name: BulkCompleteChallenges :exec
+INSERT INTO user_challenge_completions (user_id, challenge_id, completed_at)
+SELECT unnest(@userids::text[]) as user_id, @challengeid::text as challenge_id, COALESCE(@completedat, now()) as completed_at
+ON CONFLICT (user_id, challenge_id) DO NOTHING;

backend/internal/database/queries/challenge_enrollments.sql

@@ -0,0 +1,56 @@
+-- Enrollment Operations (idempotent with ON CONFLICT DO NOTHING)
+
+-- name: EnrollUserInChallenge :one
+INSERT INTO user_challenge_enrollments (user_id, challenge_id)
+VALUES (@userid::text, @challengeid::text)
+ON CONFLICT (user_id, challenge_id) DO UPDATE SET user_id = EXCLUDED.user_id
+RETURNING enrolled_at;
+
+-- name: UnenrollUserFromChallenge :exec
+DELETE FROM user_challenge_enrollments
+WHERE user_id = @userid::text AND challenge_id = @challengeid::text;
+
+-- name: IsUserEnrolledInChallenge :one
+SELECT EXISTS(
+    SELECT 1
+    FROM user_challenge_enrollments
+    WHERE user_id = @userid::text AND challenge_id = @challengeid::text
+) AS is_enrolled;
+
+-- name: GetUserEnrollmentTimestamp :one
+SELECT enrolled_at
+FROM user_challenge_enrollments
+WHERE user_id = @userid::text AND challenge_id = @challengeid::text;
+
+-- name: GetEnrolledUsersForChallenge :many
+SELECT user_id, enrolled_at
+FROM user_challenge_enrollments
+WHERE challenge_id = @challengeid::text
+ORDER BY enrolled_at ASC;
+
+-- Batch operations for dataloader
+
+-- name: GetUserEnrollmentTimestamps :many
+SELECT challenge_id, enrolled_at
+FROM user_challenge_enrollments
+WHERE user_id = @userid::text
+  AND challenge_id = ANY(@challengeids::text[]);
+
+-- name: GetBulkUserEnrollmentTimestamps :many
+SELECT user_id, challenge_id, enrolled_at
+FROM user_challenge_enrollments
+WHERE (user_id, challenge_id) IN (
+    SELECT unnest(@userids::text[]), unnest(@challengeids::text[])
+);
+
+-- Bulk enrollment for admin/M2M
+
+-- name: BulkEnrollUsersInChallenge :exec
+INSERT INTO user_challenge_enrollments (user_id, challenge_id)
+SELECT unnest(@userids::text[]), @challengeid::text
+ON CONFLICT (user_id, challenge_id) DO NOTHING;
+
+-- name: BulkUnenrollUsersFromChallenge :exec
+DELETE FROM user_challenge_enrollments
+WHERE challenge_id = @challengeid::text
+  AND user_id = ANY(@userids::text[]);

backend/internal/database/queries/challenges.sql

@@ -1,26 +1,26 @@
 -- name: GetChallengesByIDs :many
-SELECT id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at
+SELECT id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at
 FROM challenges
 WHERE id = ANY(@ids::text[]);
 
 -- name: GetChallengesByProjectIDs :many
-SELECT id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at
+SELECT id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at
 FROM challenges
 WHERE project_id = ANY(@project_ids::text[])
     AND published_at IS NOT NULL
     AND published_at <= NOW()
 ORDER BY project_id, published_at DESC;
 
 -- name: GetChallengesByEventIDs :many
-SELECT id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at
+SELECT id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at
 FROM challenges
 WHERE event_id = ANY(@event_ids::text[])
     AND published_at IS NOT NULL
     AND published_at <= NOW()
 ORDER BY event_id, published_at DESC;
 
 -- name: GetChallengesFilteredCursor :many
-SELECT id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at
+SELECT id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at
 FROM challenges
 WHERE
     (@ids::text[] IS NULL OR id = ANY(@ids::text[]))
@@ -56,7 +56,10 @@ INSERT INTO challenges (
     url,
     button_text,
     published_at,
-    end_time
+    visible_at,
+    end_time,
+    requires_team_membership,
+    requires_super_team_membership
 )
 VALUES (
     @id::text,
@@ -68,9 +71,12 @@ VALUES (
     sqlc.narg('url')::text,
     @buttontext::text,
     @publishedat::timestamptz,
-    @endtime::timestamptz
+    sqlc.narg('visibleat')::timestamptz,
+    @endtime::timestamptz,
+    COALESCE(sqlc.narg('requiresteammembership')::bool, false),
+    COALESCE(sqlc.narg('requiressuperteammembership')::bool, false)
 )
-RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at;
+RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at;
 
 -- name: UpdateChallenge :one
 UPDATE challenges
@@ -81,10 +87,14 @@ SET
     url = COALESCE(sqlc.narg('url')::text, url),
     button_text = COALESCE(sqlc.narg('buttontext')::text, button_text),
     event_id = COALESCE(sqlc.narg('eventid')::text, event_id),
+    visible_at = COALESCE(sqlc.narg('visibleat')::timestamptz, visible_at),
+    started_at = COALESCE(sqlc.narg('startedat')::timestamptz, started_at),
     end_time = COALESCE(sqlc.narg('endtime')::timestamptz, end_time),
+    requires_team_membership = COALESCE(sqlc.narg('requiresteammembership')::bool, requires_team_membership),
+    requires_super_team_membership = COALESCE(sqlc.narg('requiressuperteammembership')::bool, requires_super_team_membership),
     updated_at = now()
 WHERE id = @id::text
-RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at;
+RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at;
 
 -- name: DeleteChallenge :exec
 DELETE FROM challenges
@@ -96,23 +106,23 @@ SET
     published_at = @publishedat::timestamptz,
     updated_at = now()
 WHERE id = @id::text
-RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at;
+RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at;
 
 -- name: AssignChallengeToEvent :one
 UPDATE challenges
 SET
     event_id = @eventid::text,
     updated_at = now()
 WHERE id = @id::text
-RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at;
+RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at;
 
 -- name: BulkPublishChallenges :many
 UPDATE challenges
 SET
     published_at = @publishedat::timestamptz,
     updated_at = now()
 WHERE id = ANY(@ids::text[])
-RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at;
+RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at;
 
 -- name: BulkCreateChallenges :many
 INSERT INTO challenges (
@@ -125,7 +135,10 @@ INSERT INTO challenges (
     url,
     button_text,
     published_at,
-    end_time
+    visible_at,
+    end_time,
+    requires_team_membership,
+    requires_super_team_membership
 )
 SELECT
     unnest(@ids::text[]),
@@ -137,5 +150,26 @@ SELECT
     unnest(@urls::text[]),
     unnest(@buttontexts::text[]),
     unnest(@publishedats::timestamptz[]),
-    unnest(@endtimes::timestamptz[])
-RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, end_time, created_at, updated_at;
+    unnest(@visibleats::timestamptz[]),
+    unnest(@endtimes::timestamptz[]),
+    unnest(@requiresteammemberships::bool[]),
+    unnest(@requiressuperteammemberships::bool[])
+RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at;
+
+-- name: UpdateChallengeTimestamps :one
+UPDATE challenges
+SET
+    visible_at = COALESCE(sqlc.narg('visibleat')::timestamptz, visible_at),
+    started_at = COALESCE(sqlc.narg('startedat')::timestamptz, started_at),
+    updated_at = now()
+WHERE id = @id::text
+RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at;
+
+-- name: UpdateChallengeRequirements :one
+UPDATE challenges
+SET
+    requires_team_membership = COALESCE(sqlc.narg('requiresteammembership')::bool, requires_team_membership),
+    requires_super_team_membership = COALESCE(sqlc.narg('requiressuperteammembership')::bool, requires_super_team_membership),
+    updated_at = now()
+WHERE id = @id::text
+RETURNING id, project_id, event_id, name, description, image_url, url, button_text, published_at, visible_at, started_at, end_time, requires_team_membership, requires_super_team_membership, created_at, updated_at;

backend/internal/database/queries/teams.sql

@@ -191,3 +191,33 @@ GROUP BY
     u.email,
     u.avatar_url
 ORDER BY score DESC, u.name ASC;
+
+-- name: IsUserInAnyTeamInProject :one
+SELECT EXISTS(
+    SELECT 1
+    FROM team_members tm
+    INNER JOIN teams t ON tm.team_id = t.id
+    WHERE tm.user_id = @userid::text
+      AND t.project_id = @projectid::text
+) AS is_member;
+
+-- name: IsUserInAnySuperTeamInProject :one
+SELECT EXISTS(
+    SELECT 1
+    FROM team_members tm
+    INNER JOIN teams t ON tm.team_id = t.id
+    INNER JOIN super_teams st ON t.super_team_id = st.id
+    WHERE tm.user_id = @userid::text
+      AND st.project_id = @projectid::text
+) AS is_member;
+
+-- name: GetUserIDsInTeams :many
+SELECT DISTINCT user_id
+FROM team_members
+WHERE team_id = ANY(@teamids::text[]);
+
+-- name: GetUserIDsInSuperTeams :many
+SELECT DISTINCT tm.user_id
+FROM team_members tm
+JOIN teams t ON t.id = tm.team_id
+WHERE t.super_team_id = ANY(@superteamids::text[]);