feat(flyer-import): add session management and retrieval endpoints

- Add new API endpoints for retrieving flyer import sessions: - GET /flyer-import/sessions/latest - Retrieve latest session for user - GET /flyer-import/sessions/:sessionId - Retrieve specific session - Implement session persistence and restoration in Flutter UI - Add toJson() methods to FlyerImportItem and FlyerImportResult for serialization - Add new FlyerImportSession domain model for local session management - Add unit test file for FlyerImportService - Update FlyerImportController with new endpoints and user ID extraction - Update FlyerImportService with session retrieval logic and response mapping - Update API paths in Flutter client - Add session restoration on widget init in FlyerImportTab
2026-05-19 21:55:55 +02:00
parent 8b8f8b7b6f
commit 6cd5b80adb
10 changed files with 649 additions and 30 deletions
@@ -40,6 +40,8 @@ class ReceiptImportApiPaths {

 class FlyerImportApiPaths {
  static const parse = '/flyer-import/parse';
+  static const latestSession = '/flyer-import/sessions/latest';
+  static String bySession(int sessionId) => '/flyer-import/sessions/$sessionId';
 }

 class FlyerSelectionApiPaths {
@@ -0,0 +1,130 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../domain/flyer_import_result.dart';
+
+class FlyerImportSession {
+  final int? sessionId;
+  final String? fileName;
+  final FlyerImportResult? result;
+  final Map<int, bool> selected;
+
+  const FlyerImportSession({
+    this.sessionId,
+    this.fileName,
+    this.result,
+    this.selected = const {},
+  });
+
+  FlyerImportSession copyWith({
+    int? sessionId,
+    String? fileName,
+    FlyerImportResult? result,
+    Map<int, bool>? selected,
+  }) {
+    return FlyerImportSession(
+      sessionId: sessionId ?? this.sessionId,
+      fileName: fileName ?? this.fileName,
+      result: result ?? this.result,
+      selected: selected ?? this.selected,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'sessionId': sessionId,
+      'fileName': fileName,
+      'selected': selected.map((k, v) => MapEntry(k.toString(), v)),
+    };
+  }
+
+  factory FlyerImportSession.fromJson(Map<String, dynamic> json) {
+    final selectedRaw = (json['selected'] as Map<String, dynamic>? ?? {});
+    final selected = <int, bool>{};
+    for (final entry in selectedRaw.entries) {
+      final key = int.tryParse(entry.key);
+      if (key == null) continue;
+      selected[key] = entry.value == true;
+    }
+
+    return FlyerImportSession(
+      sessionId: (json['sessionId'] as num?)?.toInt(),
+      fileName: json['fileName'] as String?,
+      result: null,
+      selected: selected,
+    );
+  }
+}
+
+class FlyerImportSessionNotifier extends Notifier<FlyerImportSession?> {
+  static const _storageKey = 'flyer_import_session_v1';
+
+  @override
+  FlyerImportSession? build() => null;
+
+  Future<void> restore() async {
+    final prefs = await SharedPreferences.getInstance();
+    final raw = prefs.getString(_storageKey);
+    if (raw == null || raw.isEmpty) return;
+
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is Map<String, dynamic>) {
+        state = FlyerImportSession.fromJson(decoded);
+      }
+    } catch (_) {
+      await prefs.remove(_storageKey);
+    }
+  }
+
+  void setImportedResult({
+    required FlyerImportResult result,
+    required Map<int, bool> selected,
+    String? fileName,
+  }) {
+    state = FlyerImportSession(
+      sessionId: result.sessionId,
+      fileName: fileName,
+      result: result,
+      selected: selected,
+    );
+    unawaited(_persist());
+  }
+
+  void setSelected(int index, bool value) {
+    if (state == null) return;
+    final selected = Map<int, bool>.from(state!.selected)..[index] = value;
+    state = state!.copyWith(selected: selected);
+    unawaited(_persist());
+  }
+
+  void setSelectedForAll(int count, bool value) {
+    if (state == null) return;
+    final selected = <int, bool>{for (var i = 0; i < count; i++) i: value};
+    state = state!.copyWith(selected: selected);
+    unawaited(_persist());
+  }
+
+  Future<void> clear() async {
+    state = null;
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove(_storageKey);
+  }
+
+  Future<void> _persist() async {
+    final prefs = await SharedPreferences.getInstance();
+    if (state == null) {
+      await prefs.remove(_storageKey);
+      return;
+    }
+    await prefs.setString(_storageKey, jsonEncode(state!.toJson()));
+  }
+}
+
+final flyerImportSessionProvider =
+    NotifierProvider<FlyerImportSessionNotifier, FlyerImportSession?>(
+  FlyerImportSessionNotifier.new,
+);
@@ -191,6 +191,67 @@ class ImportRepository {
    return FlyerImportResult.fromJson(parsed);
  }

+  Future<FlyerImportResult> getLatestFlyerImportSession({String? token}) async {
+    final uri = Uri.parse('$_baseUrl${FlyerImportApiPaths.latestSession}');
+    final response = await _client.get(
+      uri,
+      headers: {
+        'Content-Type': 'application/json',
+        if (token != null) 'Authorization': 'Bearer $token',
+      },
+    );
+
+    if (response.statusCode < 200 || response.statusCode >= 300) {
+      throw ApiException(
+        type: _mapStatusCodeToErrorType(response.statusCode),
+        message: 'Kunde inte hämta senaste flyer-session: ${response.body}',
+        statusCode: response.statusCode,
+      );
+    }
+
+    final parsed = _parseResponse(response);
+    if (parsed is! Map<String, dynamic>) {
+      throw ApiException(
+        type: ApiErrorType.unknown,
+        message: 'Felaktigt svar vid hämtning av flyer-session.',
+      );
+    }
+
+    return FlyerImportResult.fromJson(parsed);
+  }
+
+  Future<FlyerImportResult> getFlyerImportSession({
+    required int sessionId,
+    String? token,
+  }) async {
+    final uri = Uri.parse('$_baseUrl${FlyerImportApiPaths.bySession(sessionId)}');
+    final response = await _client.get(
+      uri,
+      headers: {
+        'Content-Type': 'application/json',
+        if (token != null) 'Authorization': 'Bearer $token',
+      },
+    );
+
+    if (response.statusCode < 200 || response.statusCode >= 300) {
+      throw ApiException(
+        type: _mapStatusCodeToErrorType(response.statusCode),
+        message: 'Kunde inte hämta flyer-session: ${response.body}',
+        statusCode: response.statusCode,
+      );
+    }
+
+    final parsed = _parseResponse(response);
+    if (parsed is! Map<String, dynamic>) {
+      throw ApiException(
+        type: ApiErrorType.unknown,
+        message: 'Felaktigt svar vid hämtning av flyer-session.',
+      );
+    }
+
+    return FlyerImportResult.fromJson(parsed);
+  }
+
  Future<List<Map<String, dynamic>>> createFlyerSelectionsBulk({
    required int sessionId,
    required List<Map<String, dynamic>> items,
@@ -37,7 +37,7 @@ class FlyerImportItem {
    this.matchConfidence,
  });

-  factory FlyerImportItem.fromJson(Map<String, dynamic> json) {
+  factory FlyerImportItem.fromJson(Map<String, dynamic> json) {
    return FlyerImportItem(
      flyerItemId: (json['flyerItemId'] as num?)?.toInt(),
      rawName: json['rawName'] as String? ?? '',
@@ -56,6 +56,28 @@ class FlyerImportItem {
      matchedProductName: json['matchedProductName'] as String?,
      matchedVia: json['matchedVia'] as String?,
      matchConfidence: (json['matchConfidence'] as num?)?.toDouble(),
-    );
-  }
-}
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'flyerItemId': flyerItemId,
+      'rawName': rawName,
+      'normalizedName': normalizedName,
+      'category': category,
+      'price': price,
+      'priceUnit': priceUnit,
+      'offerText': offerText,
+      'isOffer': isOffer,
+      'offerLimitText': offerLimitText,
+      'comparisonPrice': comparisonPrice,
+      'comparisonUnit': comparisonUnit,
+      'parseConfidence': parseConfidence,
+      'parseReasons': parseReasons,
+      'matchedProductId': matchedProductId,
+      'matchedProductName': matchedProductName,
+      'matchedVia': matchedVia,
+      'matchConfidence': matchConfidence,
+    };
+  }
+}
@@ -26,4 +26,12 @@ class FlyerImportResult {
      warnings: warnings,
    );
  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'sessionId': sessionId,
+      'items': items.map((item) => item.toJson()).toList(),
+      'warnings': warnings,
+    };
+  }
 }
@@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';

 import '../../../core/utils/pdf_opener.dart';
 import '../../auth/data/auth_providers.dart';
+import '../data/flyer_import_session.dart';
 import '../data/import_providers.dart';
 import '../domain/flyer_import_item.dart';
 import '../domain/flyer_import_result.dart';
@@ -23,6 +24,89 @@ class _FlyerImportTabState extends ConsumerState<FlyerImportTab> {
  FlyerImportResult? _result;
  final Map<int, bool> _selected = {};

+  @override
+  void initState() {
+    super.initState();
+    _restoreSession();
+  }
+
+  Future<void> _restoreSession() async {
+    final notifier = ref.read(flyerImportSessionProvider.notifier);
+    await notifier.restore();
+    var session = ref.read(flyerImportSessionProvider);
+
+    final token = await ref.read(authStateProvider.future);
+    final repo = ref.read(importRepositoryProvider);
+
+    if (session?.sessionId != null) {
+      try {
+        final serverResult = await repo.getFlyerImportSession(
+          sessionId: session!.sessionId!,
+          token: token,
+        );
+        if (!mounted) return;
+        final selected = session.selected.isEmpty
+            ? {
+                for (var i = 0; i < serverResult.items.length; i++)
+                  i: serverResult.items[i].matchedProductId != null,
+              }
+            : session.selected;
+        setState(() {
+          _result = serverResult;
+          _selected
+            ..clear()
+            ..addAll(selected);
+        });
+        notifier.setImportedResult(
+          result: serverResult,
+          selected: selected,
+          fileName: session.fileName,
+        );
+        return;
+      } catch (_) {
+        // fallback nedan
+      }
+    }
+
+    try {
+      final latest = await repo.getLatestFlyerImportSession(token: token);
+      if (!mounted) return;
+      if (latest.sessionId != null && latest.items.isNotEmpty) {
+        final selected = {
+          for (var i = 0; i < latest.items.length; i++)
+            i: latest.items[i].matchedProductId != null,
+        };
+        setState(() {
+          _result = latest;
+          _selected
+            ..clear()
+            ..addAll(selected);
+        });
+        notifier.setImportedResult(
+          result: latest,
+          selected: selected,
+          fileName: session?.fileName,
+        );
+      } else if (session?.result != null) {
+        setState(() {
+          _result = session!.result;
+          _selected
+            ..clear()
+            ..addAll(session.selected);
+        });
+      }
+    } catch (_) {
+      session = ref.read(flyerImportSessionProvider);
+      if (!mounted || session?.result == null) return;
+      setState(() {
+        _result = session!.result;
+        _selected
+          ..clear()
+          ..addAll(session.selected);
+      });
+    }
+  }
+
  Future<void> _pickFile() async {
    final result = await FilePicker.pickFiles(
      type: FileType.custom,
@@ -58,6 +142,11 @@ class _FlyerImportTabState extends ConsumerState<FlyerImportTab> {
          ..clear()
          ..addAll(selected);
      });
+      ref.read(flyerImportSessionProvider.notifier).setImportedResult(
+            result: parsed,
+            selected: selected,
+            fileName: file.name,
+          );
    } catch (e) {
      if (mounted) showErrorDialog(context, 'Flyerimport misslyckades: $e');
    } finally {
@@ -329,14 +418,15 @@ class _FlyerImportTabState extends ConsumerState<FlyerImportTab> {
               children: [
                 Text('${items.length} rader hittades', style: theme.textTheme.titleSmall),
                 TextButton(
-                   onPressed: () {
-                     final target = selectedCount < items.length;
-                     setState(() {
-                       for (var i = 0; i < items.length; i++) {
-                         _selected[i] = target;
-                       }
-                     });
-                   },
+                  onPressed: () {
+                    final target = selectedCount < items.length;
+                    setState(() {
+                      for (var i = 0; i < items.length; i++) {
+                        _selected[i] = target;
+                      }
+                    });
+                    ref.read(flyerImportSessionProvider.notifier).setSelectedForAll(items.length, target);
+                  },
                   child: Text(selectedCount < items.length ? 'Välj alla' : 'Avmarkera alla'),
                 ),
               ],
@@ -352,9 +442,13 @@ class _FlyerImportTabState extends ConsumerState<FlyerImportTab> {
                  ? ''
                  : _removeLimitTextFromOfferText(item.offerText!, limitText);

-               return CheckboxListTile(
-                 value: _selected[index] ?? false,
-                 onChanged: (value) => setState(() => _selected[index] = value ?? false),
+                return CheckboxListTile(
+                  value: _selected[index] ?? false,
+                  onChanged: (value) {
+                    final checked = value ?? false;
+                    setState(() => _selected[index] = checked);
+                    ref.read(flyerImportSessionProvider.notifier).setSelected(index, checked);
+                  },
                 title: Row(
                   children: [
                     Expanded(child: Text(item.rawName)),