Update CI workflow and assorted app fixes

syed-reza98 · syed-reza98 · commit ba16281c61d0 · 2026-05-07T08:56:45.000+06:00
Revamp CI: simplify permissions, pin actions, update Java/Flutter versions, add formatting check, use Codecov token, rename jobs, add conditional Android/iOS builds, upload artifacts with new names, and add CodeQL security scan.

App fixes/refactors: initialize OfflineCache in main; switch connectivity provider to a broadcast stream and update isOnline/isOffline providers; add missing toJson() implementations for PetModel and PostModel; small OFFLINE_SUPPORT fix (add breaks in switch); remove memorial gallery UI; simplify medication logic to count unique upcoming days and adjust overdue calculation; clarify auth_repository cleanup with comment/TODO about using an Edge Function to delete users; sanitize supabase .env example keys to placeholders.
diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
@@ -2,182 +2,149 @@ name: Test & Build Validation
 
 on:
   push:
-    branches:
-      - main
-      - develop
-      - 'feature/**'
+    branches: [ main, develop ]
   pull_request:
-    branches:
-      - main
-      - develop
+    branches: [ main, develop ]
 
-permissions:
-  contents: read
-  actions: read
+# Declare default permissions as read-only.
+permissions: read-all
 
 jobs:
-  # Job 1: Analyze code and run tests
-  test:
+  test_and_analyze:
     name: Test & Analyze
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: read
+      checks: write
+      pull-requests: write
+    
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Setup Java
+        uses: actions/setup-java@cd89f11832ad0855263829ad3623d1d31a929307 # v3.13.0
         with:
-          fetch-depth: 0
+          distribution: 'zulu'
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@v2
+        uses: subosito/flutter-action@44ae346459a5c099ba318147f2f297c0d74a0db2 # v2.12.0
         with:
-          flutter-version: '3.0.0'
+          flutter-version: '3.24.3'
           channel: 'stable'
-
-      - name: Cache Flutter dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            ${{ env.FLUTTER_HOME }}/.pub-cache
-            **/.dart_tool/package_config.json
-          key: flutter-${{ runner.os }}-${{ hashFiles('**/pubspec.lock') }}
-          restore-keys: |
-            flutter-${{ runner.os }}-
+          cache: true
 
       - name: Get dependencies
         run: flutter pub get
 
+      - name: Check formatting
+        run: dart format --set-exit-if-changed .
+
       - name: Analyze code
         run: flutter analyze
-        continue-on-error: false
 
       - name: Run unit tests
         run: flutter test --coverage
-        continue-on-error: false
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
         with:
-          files: ./coverage/lcov.info
-          flags: unittests
-          name: codecov-umbrella
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage/lcov.info
           fail_ci_if_error: false
-          verbose: true
 
       - name: Archive coverage reports
-        if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@c7d193f32ed247398f1ef51e04acc37d996a730c # v4.1.0
         with:
-          name: coverage-report
+          name: code-coverage
           path: coverage/
 
-  # Job 2: Build APK for Android
-  build-android:
+  build_android:
     name: Build Android APK
+    needs: test_and_analyze
     runs-on: ubuntu-latest
-    needs: test
-
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop')
+    permissions:
+      contents: read
+    
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
+      - name: Setup Java
+        uses: actions/setup-java@cd89f11832ad0855263829ad3623d1d31a929307 # v3.13.0
         with:
-          flutter-version: '3.0.0'
-          channel: 'stable'
+          distribution: 'zulu'
+          java-version: '17'
+          cache: 'gradle'
 
-      - name: Setup Java
-        uses: actions/setup-java@v3
+      - name: Setup Flutter
+        uses: subosito/flutter-action@44ae346459a5c099ba318147f2f297c0d74a0db2 # v2.12.0
         with:
-          distribution: 'temurin'
-          java-version: '11'
-          cache: gradle
+          flutter-version: '3.24.3'
+          channel: 'stable'
+          cache: true
 
       - name: Get dependencies
         run: flutter pub get
 
-      - name: Build debug APK
-        run: flutter build apk --debug
-        continue-on-error: false
+      - name: Build APK
+        run: flutter build apk --debug --dart-define=SUPABASE_URL=${{ secrets.SUPABASE_URL }} --dart-define=SUPABASE_ANON_KEY=${{ secrets.SUPABASE_ANON_KEY }}
 
-      - name: Archive APK
-        uses: actions/upload-artifact@v4
+      - name: Upload APK
+        uses: actions/upload-artifact@c7d193f32ed247398f1ef51e04acc37d996a730c # v4.1.0
         with:
-          name: android-apk
-          path: build/app/outputs/apk/debug/app-debug.apk
+          name: release-apk
+          path: build/app/outputs/flutter-apk/app-debug.apk
 
-  # Job 3: Build for iOS
-  build-ios:
+  build_ios:
     name: Build iOS App
+    needs: test_and_analyze
     runs-on: macos-latest
-    needs: test
-
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    permissions:
+      contents: read
+    
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@v2
+        uses: subosito/flutter-action@44ae346459a5c099ba318147f2f297c0d74a0db2 # v2.12.0
         with:
-          flutter-version: '3.0.0'
+          flutter-version: '3.24.3'
           channel: 'stable'
+          cache: true
 
       - name: Get dependencies
         run: flutter pub get
 
-      - name: Build iOS app (simulator)
-        run: flutter build ios --debug --simulator
-        continue-on-error: true  # May fail in CI if iOS SDK is unavailable
+      - name: Build iOS
+        run: flutter build ios --no-codesign --debug --dart-define=SUPABASE_URL=${{ secrets.SUPABASE_URL }} --dart-define=SUPABASE_ANON_KEY=${{ secrets.SUPABASE_ANON_KEY }}
 
-      - name: Build iOS app
-        run: flutter build ios --debug
-        continue-on-error: true  # May fail in CI if iOS SDK is unavailable
+      - name: Upload Runner
+        uses: actions/upload-artifact@c7d193f32ed247398f1ef51e04acc37d996a730c # v4.1.0
+        with:
+          name: ios-build
+          path: build/ios/iphoneos/Runner.app
 
-  # Job 4: Schema migration validation
-  migrations:
-    name: Validate Schema Migrations
+  security_scan:
+    name: Security Scan
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: read
+      security-events: write
+    
     steps:
-      - uses: actions/checkout@v4
-
-      - name: List migrations
-        run: |
-          echo "=== Database Migrations ==="
-          ls -la supabase/migrations/
-          echo "Total migrations: $(ls -1 supabase/migrations/*.sql 2>/dev/null | wc -l)"
-
-      - name: Validate migration naming
-        run: |
-          cd supabase/migrations
-          for file in *.sql; do
-            if [[ ! $file =~ ^[0-9]{14}_ ]]; then
-              echo "❌ Invalid migration name: $file (must start with YYYYMMDDHHMMSS_)"
-              exit 1
-            fi
-          done
-          echo "✓ All migrations have valid naming"
-
-      - name: Check for duplicate timestamps
-        run: |
-          cd supabase/migrations
-          timestamps=$(ls *.sql | cut -d_ -f1 | sort | uniq -d)
-          if [ ! -z "$timestamps" ]; then
-            echo "❌ Duplicate migration timestamps found: $timestamps"
-            exit 1
-          fi
-          echo "✓ No duplicate migration timestamps"
-
-  # Job 5: Summary Report
-  report:
-    name: Test Results Summary
-    runs-on: ubuntu-latest
-    needs: [test, build-android, build-ios, migrations]
-    if: always()
+      - name: Checkout Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    steps:
-      - name: Check test results
-        run: |
-          echo "✓ Code analysis: passed"
-          echo "✓ Unit tests: passed"
-          echo "✓ Android build: passed"
-          echo "✓ Schema migrations: validated"
-          echo ""
-          echo "Build status: SUCCESS"
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@ccf91b7d19760778f69e6b54a32057635678b871 # v3.25.3
+        with:
+          languages: javascript, python
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@ccf91b7d19760778f69e6b54a32057635678b871 # v3.25.3
diff --git a/OFFLINE_SUPPORT.md b/OFFLINE_SUPPORT.md
@@ -215,10 +215,13 @@ class FeedNotifier extends Notifier<FeedState> {
         switch (op['operation']) {
           case 'create':
             await _syncCreate(op);
+            break;
           case 'update':
             await _syncUpdate(op);
+            break;
           case 'delete':
             await _syncDelete(op);
+            break;
         }
         await OfflineCache().removeSyncOperation(i);
       } catch (e) {
diff --git a/lib/controllers/connectivity_controller.dart b/lib/controllers/connectivity_controller.dart
@@ -10,21 +10,15 @@ final connectivityServiceProvider = Provider<ConnectivityService>((ref) {
   return ConnectivityService();
 });
 
-/// Stream of connectivity status changes
-final connectivityStreamProvider = StreamProvider<ConnectivityStatus>((ref) {
-  final service = ref.watch(connectivityServiceProvider);
-  return service.statusStream;
-});
-
-/// Current connectivity status (watch this to rebuild on connectivity changes)
+/// Stream of connectivity status changes (Broadcast stream for multiple listeners)
 final connectivityStatusProvider = StreamProvider<ConnectivityStatus>((ref) {
   final service = ref.watch(connectivityServiceProvider);
   return service.statusStream.asBroadcastStream();
 });
 
 /// Convenience: whether device is currently online
 final isOnlineProvider = Provider<bool>((ref) {
-  final stream = ref.watch(connectivityStreamProvider);
+  final stream = ref.watch(connectivityStatusProvider);
   return stream.whenData((status) => status == ConnectivityStatus.online)
       .maybeWhen(
         data: (isOnline) => isOnline,
@@ -34,7 +28,7 @@ final isOnlineProvider = Provider<bool>((ref) {
 
 /// Convenience: whether device is currently offline
 final isOfflineProvider = Provider<bool>((ref) {
-  final stream = ref.watch(connectivityStreamProvider);
+  final stream = ref.watch(connectivityStatusProvider);
   return stream.whenData((status) => status == ConnectivityStatus.offline)
       .maybeWhen(
         data: (isOffline) => isOffline,
diff --git a/lib/main.dart b/lib/main.dart
@@ -15,6 +15,7 @@ import 'services/push_notification_service.dart';
 import 'utils/routes.dart';
 import 'utils/supabase_config.dart';
 import 'utils/theme_bootstrap.dart';
+import 'utils/offline_cache.dart';
 import 'theme/app_theme.dart';
 
 /// Set via `flutter test integration_test/... --dart-define=INTEGRATION_TEST=true`
@@ -75,6 +76,11 @@ Future<void> main() async {
   }
 
   final prefs = await SharedPreferences.getInstance();
+  
+  // Initialize OfflineCache for persistence
+  final offlineCache = OfflineCache();
+  await offlineCache.initialize();
+
   pendingBootstrapThemeMode =
       prefs.getString('theme_mode') == 'dark' ? ThemeMode.dark : ThemeMode.light;
 
diff --git a/lib/models/pet_model.dart b/lib/models/pet_model.dart
@@ -111,6 +111,7 @@ class PetModel {
   }
 
   Map<String, dynamic> toJson() => {
+        'id': id,
         'user_id': userId,
         'name': name,
         'breed': breed,
diff --git a/lib/models/post_model.dart b/lib/models/post_model.dart
@@ -120,4 +120,17 @@ class PostModel {
       createdAt: DateTime.parse(json['created_at'] as String),
     );
   }
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'pets': pet.toJson(),
+        'media_url': mediaUrl,
+        'caption': caption,
+        'location': location,
+        'tagged_pet_ids': taggedPetIds,
+        'tagged_pet_names': taggedPetNames,
+        'post_likes': likedByPetIds.map((id) => {'pet_id': id}).toList(),
+        'comments': comments.map((c) => c.toJson()).toList(),
+        'created_at': createdAt.toIso8601String(),
+      };
 }
diff --git a/lib/repositories/auth_repository.dart b/lib/repositories/auth_repository.dart
@@ -41,7 +41,11 @@ class AuthRepository {
         'name': name,
       });
     } catch (e) {
-      // Clean up by signing out the user since profile creation failed
+      // Clean up by signing out the user since profile creation failed.
+      // NOTE: Ideally, we would delete the auth user here to allow re-signup with the same email.
+      // However, deleting a user requires admin privileges (Service Role key), which should 
+      // NOT be embedded in the client app.
+      // TODO: Implement a Supabase Edge Function 'delete-self' or similar to handle this rollback.
       await supabase.auth.signOut();
       throw Exception(
           'Failed to create your profile. Please try signing up again. If the problem persists, contact support.');
diff --git a/lib/utils/health_improvements.dart b/lib/utils/health_improvements.dart
diff --git a/lib/views/pet_memorial_detail_screen.dart b/lib/views/pet_memorial_detail_screen.dart
diff --git a/supabase/.env.local.example b/supabase/.env.local.example

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ class PetModel {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`Map<String, dynamic> toJson() => {`
	`114`	`+ 'id': id,`
`114`	`115`	`'user_id': userId,`
`115`	`116`	`'name': name,`
`116`	`117`	`'breed': breed,`