Integrate Stripe checkout and cart persistence

Add Stripe-based checkout and per-user cart persistence plus push-deeplink handling.

Highlights:
- Stripe: add flutter_stripe dependency, initialize publishable key in main, and switch Android activity to FlutterFragmentActivity to support Stripe PaymentSheet.
- Server: add a Supabase Edge Function (create-payment-intent) to create Stripe PaymentIntents and a DB migration to add payment fields to orders (payment_provider, payment_intent_id, payment_status).
- Marketplace repo: new CreatePaymentIntentResult, createStripePaymentIntent() to call the edge function, and payment-aware placeOrder() plus stock validation and out-of-stock errors.
- Cart: CartController persists cart per authenticated user to SharedPreferences (debounced), loads/clears on auth changes, and integrates Stripe PaymentSheet into the checkout flow; CartItemModel and ProductModel gains JSON serialization helpers.
- Push notifications: add push_deeplink_routes helper, wire notification-opened handler in PushNotificationCoordinator, and implement registerOnNotificationOpenedHandler in PushNotificationService to route users into the app on notification taps.
- Build/config: update pubspec.yaml/lock for flutter_stripe, tweak android/gradle.properties for JDK/tooling and Kotlin incremental compile, and adjust Supabase CLI config and functions config for the new edge function.

These changes enable on-device checkout with server-side PaymentIntent creation, persist carts across sessions per user, and deep-link users from notifications into the appropriate screens.

Author: syed-reza98

android/app/src/main/kotlin/com/example/pet_dating_app/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.example.pet_dating_app
 
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity : FlutterActivity()
+// [FlutterFragmentActivity] is required by flutter_stripe (PaymentSheet embeds Fragments).
+class MainActivity : FlutterFragmentActivity()

android/gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 # Android Gradle Plugin / Gradle do not run on JDK 26; without a JDK 17–21 toolchain the build fails with "26.0.2" as the only message.
-# org.gradle.java.home=C:\\Program Files\\Android\\Android Studio\\jbr
+org.gradle.java.home=C:\\Program Files\\Android\\Android Studio\\jbr
 # Enable parallel build to speed up the build process
 org.gradle.parallel=true
 # Enable the Gradle build cache to reuse outputs from previous builds
@@ -10,6 +10,8 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 # Enable the Gradle daemon to keep it running in the background for faster builds
 org.gradle.daemon=true
+# Kotlin incremental compile can fail when project (e.g. G:\\) and pub-cache (e.g. C:\\) are on different drive roots.
+kotlin.incremental=false
 # Enable Gradle's build scan plugin for better insights into build performance
 # org.gradle.scan=true
 # org.gradle.java.home=/usr/lib/jvm/java-21-openjdk

lib/controllers/cart_controller.dart

@@ -1,4 +1,8 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'dart:async';
+import 'dart:convert';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter_stripe/flutter_stripe.dart';
 import '../models/cart_item_model.dart';
 import '../models/product_model.dart';
 import '../repositories/marketplace_repository.dart';
@@ -42,8 +46,40 @@ class CartState {
 }
 
 class CartController extends Notifier<CartState> {
+  SharedPreferences? _prefs;
+  Timer? _persistDebounce;
+  String? _loadedForUserId;
+
+  static const _cartKeyPrefix = 'cart_items_v1_';
+
   @override
   CartState build() {
+    ref.listen<AuthState>(authProvider, (prev, next) {
+      final prevUserId = prev?.user?.id;
+      final nextUserId = next.user?.id;
+
+      if (next.status == AuthStatus.authenticated && nextUserId != null) {
+        if (_loadedForUserId != nextUserId) {
+          _loadedForUserId = nextUserId;
+          Future.microtask(_loadPersistedCartForActiveUser);
+        }
+        return;
+      }
+
+      // On logout / unauthenticated: clear memory + persisted cart for prior user.
+      if (prevUserId != null) {
+        Future.microtask(() => _clearPersistedCart(prevUserId));
+      }
+      _loadedForUserId = null;
+      state = CartState(items: []);
+    });
+
+    Future.microtask(_loadPersistedCartForActiveUser);
+    ref.onDispose(() {
+      _persistDebounce?.cancel();
+      _persistDebounce = null;
+    });
+
     return CartState(items: []);
   }
 
@@ -65,11 +101,13 @@ class CartController extends Notifier<CartState> {
       );
       state = state.copyWith(items: [...state.items, newItem]);
     }
+    _schedulePersist();
   }
 
   void removeCartItem(String itemId) {
     final newItems = state.items.where((i) => i.id != itemId).toList();
     state = state.copyWith(items: newItems);
+    _schedulePersist();
   }
 
   void updateQuantity(String itemId, int newQuantity) {
@@ -86,10 +124,12 @@ class CartController extends Notifier<CartState> {
     }).toList();
 
     state = state.copyWith(items: newItems);
+    _schedulePersist();
   }
 
   void clearCart() {
     state = CartState();
+    _schedulePersist();
   }
 
   // -------------------------------------------------------------------------
@@ -102,13 +142,49 @@ class CartController extends Notifier<CartState> {
     state = state.copyWith(
         isCheckingOut: true, clearError: true, orderSuccess: false);
     try {
+      // 1) Create Stripe PaymentIntent (server-side via Edge Function)
+      final amountCents = (state.totalPrice * 100).round();
+      final intent = await marketplaceRepository.createStripePaymentIntent(
+        amountCents: amountCents,
+        currency: 'usd',
+        metadata: {
+          'user_id': userId,
+          'cart_items_count': state.items.length.toString(),
+        },
+      );
+
+      // 2) Confirm payment on-device
+      await Stripe.instance.initPaymentSheet(
+        paymentSheetParameters: SetupPaymentSheetParameters(
+          paymentIntentClientSecret: intent.clientSecret,
+          merchantDisplayName: 'PetFolio',
+        ),
+      );
+      await Stripe.instance.presentPaymentSheet();
+
+      // 3) Create order only after successful payment
       await marketplaceRepository.placeOrder(
         userId: userId,
         items: state.items,
+        paymentProvider: 'stripe',
+        paymentIntentId: intent.paymentIntentId,
       );
       // Clear cart after successful order
       state = CartState(orderSuccess: true);
+      await _clearPersistedCart(userId);
       return true;
+    } on StripeException catch (e) {
+      state = state.copyWith(
+        isCheckingOut: false,
+        error: e.error.localizedMessage ?? 'Payment failed',
+      );
+      return false;
+    } on MarketplaceOutOfStockException catch (e) {
+      state = state.copyWith(
+        isCheckingOut: false,
+        error: e.toString(),
+      );
+      return false;
     } catch (e) {
       state = state.copyWith(
         isCheckingOut: false,
@@ -117,6 +193,61 @@ class CartController extends Notifier<CartState> {
       return false;
     }
   }
+
+  String _cartStorageKey(String userId) => '$_cartKeyPrefix$userId';
+
+  Future<void> _ensurePrefs() async {
+    _prefs ??= await SharedPreferences.getInstance();
+  }
+
+  Future<void> _loadPersistedCartForActiveUser() async {
+    final auth = ref.read(authProvider);
+    final userId = auth.user?.id;
+    if (auth.status != AuthStatus.authenticated || userId == null) return;
+
+    await _ensurePrefs();
+    final key = _cartStorageKey(userId);
+    final raw = _prefs?.getString(key);
+    if (raw == null || raw.isEmpty) return;
+
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! List) return;
+      final items = decoded
+          .whereType<Map>()
+          .map((e) => CartItemModel.fromJson(
+                e.map((k, v) => MapEntry(k.toString(), v)),
+              ))
+          .toList();
+      state = state.copyWith(items: items);
+    } catch (_) {
+      // Corrupt JSON => fail-safe to empty cart.
+      await _prefs?.remove(key);
+      state = state.copyWith(items: []);
+    }
+  }
+
+  void _schedulePersist() {
+    _persistDebounce?.cancel();
+    _persistDebounce = Timer(const Duration(milliseconds: 250), () async {
+      final auth = ref.read(authProvider);
+      final userId = auth.user?.id;
+      if (auth.status != AuthStatus.authenticated || userId == null) return;
+      await _ensurePrefs();
+      final key = _cartStorageKey(userId);
+      try {
+        final json = jsonEncode(state.items.map((e) => e.toJson()).toList());
+        await _prefs?.setString(key, json);
+      } catch (_) {
+        // Ignore persistence failure; cart remains in-memory.
+      }
+    });
+  }
+
+  Future<void> _clearPersistedCart(String userId) async {
+    await _ensurePrefs();
+    await _prefs?.remove(_cartStorageKey(userId));
+  }
 }
 
 final cartProvider = NotifierProvider<CartController, CartState>(() {

lib/controllers/feed_controller.dart

@@ -39,6 +39,11 @@ class FeedState {
       error: clearError ? null : (error ?? this.error),
     );
   }
+
+  /// Defensive expiry filter so long-lived sessions don’t show 24h stories past [StoryModel.expiresAt].
+  /// Network fetch already uses `expires_at > now()`; this trims stale in-memory rows.
+  List<StoryModel> get visibleStories =>
+      stories.where((s) => !s.isExpired).toList();
 }
 
 // ---------------------------------------------------------------------------

lib/controllers/health_controller.dart

@@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../models/pet_health_extended_models.dart';
 import '../models/pet_health_models.dart';
 import '../repositories/health_repository.dart';
+import 'pet_care_controller.dart';
 import 'pet_controller.dart';
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -307,8 +308,7 @@ class HealthNotifier extends Notifier<HealthState> {
   Future<void> upsertAppointment(PetVetAppointment appt) async {
     try {
       await _repo.upsertAppointment(appt);
-      // Refresh care state (appointments are owned by petCareProvider)
-      // This triggers a reload of appointments in PetCareNotifier.
+      _syncCareAppointments(appt.petId);
     } catch (e) {
       state = state.copyWith(error: e.toString());
     }
@@ -317,11 +317,22 @@ class HealthNotifier extends Notifier<HealthState> {
   Future<void> cancelAppointment(String id) async {
     try {
       await _repo.cancelAppointment(id);
+      final petId = ref.read(activePetProvider)?.id;
+      if (petId != null) _syncCareAppointments(petId);
     } catch (e) {
       state = state.copyWith(error: e.toString());
     }
   }
 
+  void _syncCareAppointments(String appointmentPetId) {
+    final activeId = ref.read(activePetProvider)?.id;
+    if (activeId != appointmentPetId) return;
+    Future.microtask(() {
+      if (!ref.mounted) return;
+      ref.read(petCareProvider.notifier).refresh();
+    });
+  }
+
   // ── Vaccination mutations ────────────────────────────────────────────────
 
   Future<void> upsertVaccination(PetVaccination vax) async {

lib/controllers/push_notification_coordinator.dart

@@ -4,6 +4,8 @@ import 'package:flutter/scheduler.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../services/push_notification_service.dart';
+import '../utils/push_deeplink_routes.dart';
+import '../utils/routes.dart';
 import 'auth_controller.dart';
 
 class PushNotificationCoordinator extends Notifier<void> {
@@ -16,6 +18,14 @@ class PushNotificationCoordinator extends Notifier<void> {
         final userChanged = prev?.user?.id != uid;
         if (becameAuthenticated || userChanged) {
           _schedule(() => PushNotificationService.registerTokenForUser(uid));
+          _schedule(() async {
+            await PushNotificationService.registerOnNotificationOpenedHandler(
+              (message) {
+                final route = routeForPushPayload(message.data);
+                ref.read(routerProvider).go(route);
+              },
+            );
+          });
         }
       } else if (next.status == AuthStatus.unauthenticated) {
         final prevUserId = prev?.user?.id;
@@ -28,6 +38,14 @@ class PushNotificationCoordinator extends Notifier<void> {
     final auth = ref.read(authProvider);
     if (auth.status == AuthStatus.authenticated && auth.user != null) {
       _schedule(() => PushNotificationService.registerTokenForUser(auth.user!.id));
+      _schedule(() async {
+        await PushNotificationService.registerOnNotificationOpenedHandler(
+          (message) {
+            final route = routeForPushPayload(message.data);
+            ref.read(routerProvider).go(route);
+          },
+        );
+      });
     }
   }
 

lib/main.dart

@@ -1,9 +1,12 @@
+import 'dart:developer' as developer;
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:marionette_flutter/marionette_flutter.dart';
+import 'package:flutter_stripe/flutter_stripe.dart';
 import 'controllers/auth_controller.dart';
 import 'controllers/bootstrap_controller.dart';
 import 'controllers/push_notification_coordinator.dart';
@@ -32,6 +35,11 @@ const bool _kFcmLogToken = bool.fromEnvironment(
   defaultValue: false,
 );
 
+const String _kStripePublishableKey = String.fromEnvironment(
+  'STRIPE_PUBLISHABLE_KEY',
+  defaultValue: '',
+);
+
 Future<void> main() async {
   if (!_kIntegrationTest) {
     if (kDebugMode && !_kFlutterDriverTest) {
@@ -48,6 +56,20 @@ Future<void> main() async {
     anonKey: supabaseInitAnonKey,
   );
 
+  if (_kStripePublishableKey.isNotEmpty) {
+    try {
+      Stripe.publishableKey = _kStripePublishableKey;
+      await Stripe.instance.applySettings();
+    } catch (e, st) {
+      developer.log(
+        'Stripe init failed (checkout disabled): $e',
+        name: 'main',
+        error: e,
+        stackTrace: st,
+      );
+    }
+  }
+
   if (_kFcmLogToken) {
     await PushNotificationService.debugEmitFcmTokenForConsoleTest();
   }

lib/models/cart_item_model.dart

@@ -13,6 +13,20 @@ class CartItemModel {
 
   double get subtotal => product.price * quantity;
 
+  factory CartItemModel.fromJson(Map<String, dynamic> json) {
+    return CartItemModel(
+      id: json['id'] as String,
+      product: ProductModel.fromJson(json['product'] as Map<String, dynamic>),
+      quantity: (json['quantity'] as num?)?.toInt() ?? 1,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'product': product.toJson(),
+        'quantity': quantity,
+      };
+
   CartItemModel copyWith({
     String? id,
     ProductModel? product,

lib/models/post_model.dart

@@ -4,13 +4,16 @@ class CommentModel {
   final String id;
   final String petId;
   final String petName;
+  /// From joined `pets.profile_image_url` when present (empty if unknown).
+  final String petProfileImageUrl;
   final String text;
   final DateTime createdAt;
 
   CommentModel({
     required this.id,
     required this.petId,
     required this.petName,
+    this.petProfileImageUrl = '',
     required this.text,
     required this.createdAt,
   });
@@ -22,6 +25,7 @@ class CommentModel {
       id: json['id'] as String,
       petId: json['pet_id'] as String,
       petName: petJson?['name'] as String? ?? 'Unknown',
+      petProfileImageUrl: petJson?['profile_image_url'] as String? ?? '',
       text: json['text'] as String,
       createdAt: DateTime.parse(json['created_at'] as String),
     );