fix: badges save/check, year selector for contributions

src/app/api/spark/gamification/calendar/[username]/route.ts

@@ -3,7 +3,7 @@ import { getUserCalendar } from "@/lib/db/queries/gamification";
 import { fetchGitHubContributions, contributionLevelToIntensity } from "@/lib/github-contributions";
 import { db } from "@/db";
 import { users } from "@/db/schema";
-import { eq } from "drizzle-orm";
+import { eq, sql } from "drizzle-orm";
 
 export async function GET(
     request: NextRequest,
@@ -16,18 +16,24 @@ export async function GET(
         const yearParam = searchParams.get('year');
         const year = yearParam ? parseInt(yearParam) : undefined;
 
-        // Try to get user's GitHub token for API access
+        console.log(`[Calendar API] Fetching for username: ${username}, year: ${year || 'current'}`);
+
+        // Try to get user's GitHub token for API access (case-insensitive)
         const user = await db.select()
             .from(users)
-            .where(eq(users.username, username))
+            .where(sql`LOWER(${users.username}) = LOWER(${username})`)
             .limit(1);
 
         const githubToken = user[0]?.githubAccessToken;
 
+        console.log(`[Calendar API] Found user: ${user[0]?.username || 'none'}, has token: ${!!githubToken}`);
+
         // Try fetching from GitHub first (with optional year parameter)
         const githubData = await fetchGitHubContributions(username, githubToken, year);
 
         if (githubData) {
+            console.log(`[Calendar API] GitHub returned ${githubData.totalContributions} contributions for year ${year || 'current'}`);
+
             // Convert GitHub data to calendar format
             const calendar = githubData.weeks.flatMap(week =>
                 week.contributionDays.map(day => ({
@@ -41,11 +47,13 @@ export async function GET(
                 calendar,
                 totalContributions: githubData.totalContributions,
                 year: year || new Date().getFullYear(),
-                source: 'github'
+                source: 'github',
+                hasUserToken: !!githubToken
             });
         }
 
         // Fallback to local database
+        console.log(`[Calendar API] Falling back to local database for ${username}`);
         const calendar = await getUserCalendar(username, days);
         return NextResponse.json({
             calendar,

src/lib/github-contributions.ts

@@ -78,12 +78,15 @@ export async function fetchGitHubContributions(
 
     // Use provided token or fall back to app token for public data
     const token = githubToken || process.env.GITHUB_TOKEN;
+    const tokenSource = githubToken ? 'user token (includes private contributions)' : 'app token (public only)';
 
     if (!token) {
         console.warn('[GitHub] No token available for contributions fetch');
         return null;
     }
 
+    console.log(`[GitHub] Using ${tokenSource} for ${username}, year=${year || 'default'}`);
+
     try {
         // Build variables object, including from/to dates if year is specified
         const variables: { username: string; from?: string; to?: string } = { username };