...

lib/features/gamification/models/gamification_models.dart

@@ -1,6 +1,8 @@
 // lib/features/gamification/models/gamification_models.dart
 // Data models matching TechDocs v2 DB schema for the Contributor Module.
 
+import 'package:flutter/foundation.dart';
+
 // ---------------------------------------------------------------------------
 // Tier enum — matches PRD v3 §4.4 thresholds (based on Lifetime EP)
 // ---------------------------------------------------------------------------
@@ -68,13 +70,21 @@ int tierStartEp(ContributorTier tier) {
 // ---------------------------------------------------------------------------
 class UserGamificationProfile {
   final String userId;
-  final int lifetimeEp;  // Never resets. Used for tiers + leaderboard.
-  final int currentEp;   // Liquid EP accumulated this month.
-  final int currentRp;   // Spendable Reward Points.
+  final String username;
+  final String? avatarUrl;
+  final String? district;
+  final String? eventifyId;
+  final int lifetimeEp; // Never resets. Used for tiers + leaderboard.
+  final int currentEp; // Liquid EP accumulated this month.
+  final int currentRp; // Spendable Reward Points.
   final ContributorTier tier;
 
   const UserGamificationProfile({
     required this.userId,
+    required this.username,
+    this.avatarUrl,
+    this.district,
+    this.eventifyId,
     required this.lifetimeEp,
     required this.currentEp,
     required this.currentRp,
@@ -82,12 +92,17 @@ class UserGamificationProfile {
   });
 
   factory UserGamificationProfile.fromJson(Map<String, dynamic> json) {
-    final ep = (json['lifetime_ep'] as int?) ?? 0;
+    debugPrint('Mapping UserGamificationProfile from JSON: $json');
+    final ep = (json['lifetime_ep'] as int?) ?? (json['points'] as int?) ?? (json['total_points'] as int?) ?? 0;
     return UserGamificationProfile(
-      userId: json['user_id'] as String? ?? '',
+      userId: (json['user_id'] ?? json['email'] ?? json['userId'] ?? '').toString(),
+      username: (json['username'] ?? json['name'] ?? json['full_name'] ?? json['display_name'] ?? '').toString(),
+      avatarUrl: json['profile_image'] as String? ?? json['avatar_url'] as String? ?? json['profile_pic'] as String?,
+      district: json['district'] as String? ?? json['location'] as String?,
+      eventifyId: (json['eventify_id'] ?? json['eventifyId'] ?? json['id'] ?? '').toString(),
       lifetimeEp: ep,
-      currentEp: (json['current_ep'] as int?) ?? 0,
-      currentRp: (json['current_rp'] as int?) ?? 0,
+      currentEp: (json['current_ep'] as int?) ?? (json['monthly_points'] as int?) ?? (json['points_this_month'] as int?) ?? 0,
+      currentRp: (json['current_rp'] as int?) ?? (json['reward_points'] as int?) ?? (json['rp'] as int?) ?? 0,
       tier: tierFromEp(ep),
     );
   }

lib/features/gamification/providers/gamification_provider.dart

@@ -36,8 +36,10 @@ class GamificationProvider extends ChangeNotifier {
   // Load everything at once (called when ContributeScreen or ProfileScreen mounts)
   // ---------------------------------------------------------------------------
   Future<void> loadAll({bool force = false}) async {
-    // Skip if recently loaded (within 2 minutes) unless forced
-    if (!force && _lastLoadTime != null && DateTime.now().difference(_lastLoadTime!) < _loadTtl) {
+    debugPrint('GamificationProvider.loadAll(force: $force) called');
+    // Skip if recently loaded (within 2 minutes) unless forced or profile is null
+    if (!force && profile != null && _lastLoadTime != null && DateTime.now().difference(_lastLoadTime!) < _loadTtl) {
+      debugPrint('GamificationProvider.loadAll skipped due to TTL');
       return;
     }
 
@@ -46,10 +48,20 @@ class GamificationProvider extends ChangeNotifier {
     notifyListeners();
 
     try {
+      debugPrint('GamificationProvider: Requesting dashboard, leaderboard, etc...');
       final results = await Future.wait([
         _service.getDashboard().catchError((e) {
           debugPrint('Dashboard error: $e');
-          return const DashboardResponse(profile: UserGamificationProfile(userId: '', lifetimeEp: 0, currentEp: 0, currentRp: 0, tier: ContributorTier.BRONZE));
+          return const DashboardResponse(
+            profile: UserGamificationProfile(
+              userId: '',
+              username: '',
+              lifetimeEp: 0,
+              currentEp: 0,
+              currentRp: 0,
+              tier: ContributorTier.BRONZE,
+            ),
+          );
         }),
         _service.getLeaderboard(district: leaderboardDistrict, timePeriod: leaderboardTimePeriod).catchError((e) {
           debugPrint('Leaderboard error: $e');
@@ -179,6 +191,10 @@ class GamificationProvider extends ChangeNotifier {
     if (profile != null) {
       profile = UserGamificationProfile(
         userId: profile!.userId,
+        username: profile!.username,
+        avatarUrl: profile!.avatarUrl,
+        district: profile!.district,
+        eventifyId: profile!.eventifyId,
         lifetimeEp: profile!.lifetimeEp,
         currentEp: profile!.currentEp,
         currentRp: profile!.currentRp - item.rpCost,
@@ -195,6 +211,10 @@ class GamificationProvider extends ChangeNotifier {
       if (profile != null) {
         profile = UserGamificationProfile(
           userId: profile!.userId,
+          username: profile!.username,
+          avatarUrl: profile!.avatarUrl,
+          district: profile!.district,
+          eventifyId: profile!.eventifyId,
           lifetimeEp: profile!.lifetimeEp,
           currentEp: profile!.currentEp,
           currentRp: profile!.currentRp + item.rpCost,