fix user bulk create WIP

dabblingwithcode · dabblingwithcode · commit 1ade303f5d12 · 2026-03-11T21:28:06.000+01:00
diff --git a/school_data_hub_flutter/lib/features/user/domain/user_manager.dart b/school_data_hub_flutter/lib/features/user/domain/user_manager.dart
@@ -278,22 +278,74 @@ class UserManager {
     return requests;
   }
 
-  /// Streams batch create results one-by-one (avoids HTTP timeout). Caller listens and accumulates.
-  Stream<BatchCreateUserEvent> batchCreateUsersStreamFromImportRows(
+  /// Creates users in small HTTP chunks, yielding a [BatchCreateResult] per chunk.
+  ///
+  /// Each chunk is a short HTTP request to [batchCreateUsers] (not WebSocket),
+  /// so it is unaffected by the hub stream lifecycle.
+  Stream<BatchCreateResult> batchCreateUsersInChunks(
     List<StaffImportRow> rows, {
+    int chunkSize = 3,
     String Function(StaffImportRow)? generatePassword,
-  }) {
+  }) async* {
     final requests = buildCreateUserRequestsFromImportRows(
       rows,
       generatePassword: generatePassword,
     );
-    _log.info('[UserManager] batchCreateUsersStreamFromImportRows: rows=${rows.length} -> requests=${requests.length}, calling API stream');
-    return _apiService.batchCreateUsersStream(requests);
+    _log.info(
+      '[UserManager] batchCreateUsersInChunks: rows=${rows.length} -> '
+      'requests=${requests.length}, chunkSize=$chunkSize',
+    );
+
+    for (var i = 0; i < requests.length; i += chunkSize) {
+      final end = (i + chunkSize).clamp(0, requests.length);
+      final chunk = requests.sublist(i, end);
+      _log.info('[UserManager] sending chunk ${i ~/ chunkSize + 1} (indices $i..$end)');
+
+      final response = await _apiService.batchCreateUsers(chunk);
+      if (response == null) {
+        yield BatchCreateResult(
+          credentials: [],
+          errors: [
+            for (var j = 0; j < chunk.length; j++)
+              BatchCreateError(
+                rowIndex: i + j,
+                userNameOrKurzel: chunk[j].userName,
+                message: 'Server-Antwort war null.',
+              ),
+          ],
+        );
+        continue;
+      }
+
+      yield BatchCreateResult(
+        credentials: response.credentials
+            .map(
+              (c) => StaffCredentialEntry(
+                userName: c.userName,
+                fullName: c.fullName,
+                email: c.email,
+                password: c.password,
+              ),
+            )
+            .toList(),
+        errors: response.errors
+            .map(
+              (e) => BatchCreateError(
+                rowIndex: e.rowIndex + i,
+                userNameOrKurzel: e.userNameOrKurzel,
+                message: e.message,
+              ),
+            )
+            .toList(),
+      );
+    }
+
+    _log.info('[UserManager] batchCreateUsersInChunks: done');
+    await fetchUsersCommand.runAsync();
   }
 
-  /// Batch-creates users from import rows. Passwords are generated on the client;
-  /// server validates and skips duplicate userName/email. Refreshes user list at the end.
-  /// Prefer [batchCreateUsersStreamFromImportRows] for large batches to avoid timeout.
+  /// Batch-creates users from import rows in a single HTTP call.
+  /// For large batches prefer [batchCreateUsersInChunks] to avoid timeout.
   Future<BatchCreateResult> batchCreateUsersFromImportRows(
     List<StaffImportRow> rows, {
     String Function(StaffImportRow)? generatePassword,
diff --git a/school_data_hub_flutter/lib/features/user/presentation/batch_import_users/batch_import_users_page.dart b/school_data_hub_flutter/lib/features/user/presentation/batch_import_users/batch_import_users_page.dart
@@ -6,7 +6,6 @@ import 'package:flutter_it/flutter_it.dart';
 import 'package:gap/gap.dart';
 import 'package:logging/logging.dart';
 import 'package:printing/printing.dart';
-import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/app_utils/pdf_viewer_page.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
@@ -16,6 +15,7 @@ import 'package:school_data_hub_flutter/features/user/data/staff_excel_import_pa
 import 'package:school_data_hub_flutter/features/user/domain/batch_create_result.dart';
 import 'package:school_data_hub_flutter/features/user/domain/user_manager.dart';
 import 'package:school_data_hub_flutter/features/user/presentation/batch_import_users/staff_credentials_pdf_service.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 final _log = Logger('BatchImportUsersPage');
 
@@ -32,11 +32,12 @@ class _BatchImportUsersPageState extends State<BatchImportUsersPage> {
   bool _isCreating = false;
   int _progressCreated = 0;
   int _progressErrors = 0;
-  StreamSubscription<BatchCreateUserEvent>? _streamSubscription;
+  StreamSubscription<BatchCreateResult>? _chunkSubscription;
 
   @override
   void dispose() {
-    _streamSubscription?.cancel();
+    _chunkSubscription?.cancel();
+    WakelockPlus.disable();
     super.dispose();
   }
 
@@ -63,89 +64,90 @@ class _BatchImportUsersPageState extends State<BatchImportUsersPage> {
       _progressCreated = 0;
       _progressErrors = 0;
     });
+
+    await WakelockPlus.enable();
+    _log.info('[BatchImport] Wakelock enabled');
+
     final userManager = di<UserManager>();
-    final credentials = <StaffCredentialEntry>[];
-    final errors = <BatchCreateError>[];
+    final allCredentials = <StaffCredentialEntry>[];
+    final allErrors = <BatchCreateError>[];
 
     try {
-      _log.info('[BatchImport] Getting stream from UserManager');
-      final stream = userManager.batchCreateUsersStreamFromImportRows(rows);
-      _log.info('[BatchImport] Subscribing to batchCreateUsersStream');
-      _streamSubscription = stream.listen(
-        (event) {
+      final stream = userManager.batchCreateUsersInChunks(rows);
+      _log.info('[BatchImport] Subscribing to batchCreateUsersInChunks');
+      _chunkSubscription = stream.listen(
+        (chunkResult) {
           if (!mounted) return;
-          if (event.credential != null) {
-            final c = event.credential!;
-            credentials.add(
-              StaffCredentialEntry(
-                userName: c.userName,
-                fullName: c.fullName,
-                email: c.email,
-                password: c.password,
-              ),
-            );
-            setState(() => _progressCreated = credentials.length);
-            _log.info(
-              '[BatchImport] Event: created ${credentials.length} — ${c.userName}',
-            );
-          } else if (event.error != null) {
-            final e = event.error!;
-            errors.add(
-              BatchCreateError(
-                rowIndex: e.rowIndex,
-                userNameOrKurzel: e.userNameOrKurzel,
-                message: e.message,
-              ),
-            );
-            setState(() => _progressErrors = errors.length);
-            _log.info(
-              '[BatchImport] Event: error ${errors.length} — row ${e.rowIndex} ${e.userNameOrKurzel}: ${e.message}',
-            );
-          }
+          allCredentials.addAll(chunkResult.credentials);
+          allErrors.addAll(chunkResult.errors);
+          setState(() {
+            _progressCreated = allCredentials.length;
+            _progressErrors = allErrors.length;
+          });
+          _log.info(
+            '[BatchImport] Chunk done — created=${chunkResult.successCount}, '
+            'errors=${chunkResult.failureCount}, '
+            'total created=$_progressCreated, total errors=$_progressErrors',
+          );
         },
         onError: (Object e, StackTrace? st) {
-          _log.severe('[BatchImport] Stream onError', e, st);
+          _log.severe('[BatchImport] Chunk stream onError', e, st);
           if (mounted) {
             setState(() => _isCreating = false);
-            ScaffoldMessenger.of(
-              context,
-            ).showSnackBar(SnackBar(content: Text('Fehler: $e')));
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text('Fehler: $e')),
+            );
           }
+          WakelockPlus.disable();
         },
-        onDone: () async {
+        onDone: () {
           _log.info(
-            '[BatchImport] Stream onDone — credentials=${credentials.length} errors=${errors.length}',
+            '[BatchImport] All chunks done — '
+            'credentials=${allCredentials.length} errors=${allErrors.length}',
           );
-          if (!mounted) return;
-          _log.info('[BatchImport] Refreshing user list');
-          await userManager.fetchUsersCommand.runAsync();
+          WakelockPlus.disable();
           if (!mounted) return;
           setState(() {
             _batchResult = BatchCreateResult(
-              credentials: credentials,
-              errors: errors,
+              credentials: allCredentials,
+              errors: allErrors,
             );
             _isCreating = false;
             _progressCreated = 0;
             _progressErrors = 0;
           });
-          _log.info(
-            '[BatchImport] Batch complete. Success: ${credentials.length}, failures: ${errors.length}',
-          );
         },
         cancelOnError: false,
       );
     } catch (e, st) {
       _log.severe('[BatchImport] _createUsers catch', e, st);
+      await WakelockPlus.disable();
       if (mounted) {
         setState(() => _isCreating = false);
-        ScaffoldMessenger.of(
-          context,
-        ).showSnackBar(SnackBar(content: Text('Fehler: $e')));
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Fehler: $e')),
+        );
       }
     }
   }
 
+  void _abortCreate() {
+    _log.info('[BatchImport] User aborted batch create');
+    _chunkSubscription?.cancel();
+    _chunkSubscription = null;
+    WakelockPlus.disable();
+    if (mounted) {
+      setState(() {
+        _isCreating = false;
+        _progressCreated = 0;
+        _progressErrors = 0;
+      });
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Import abgebrochen.')),
+      );
+    }
+  }
+
   Future<void> _printCredentials() async {
     final credentials = _batchResult?.credentials ?? [];
     if (credentials.isEmpty) return;
@@ -262,21 +264,33 @@ class _BatchImportUsersPageState extends State<BatchImportUsersPage> {
                       style: AppStyles.subtitle,
                     ),
                     const Gap(8),
-                    ElevatedButton.icon(
-                      style: AppStyles.actionButtonStyle,
-                      onPressed: _isCreating ? null : _createUsers,
-                      icon: _isCreating
-                          ? const SizedBox(
-                              width: 20,
-                              height: 20,
-                              child: CircularProgressIndicator(strokeWidth: 2),
-                            )
-                          : const Icon(Icons.person_add),
-                      label: Text(
-                        _isCreating
-                            ? 'Wird erstellt… ($_progressCreated / ${_parseResult!.rows.length}, $_progressErrors Fehler)'
-                            : 'Benutzer anlegen',
-                      ),
+                    Row(
+                      children: [
+                        ElevatedButton.icon(
+                          style: AppStyles.actionButtonStyle,
+                          onPressed: _isCreating ? null : _createUsers,
+                          icon: _isCreating
+                              ? const SizedBox(
+                                  width: 20,
+                                  height: 20,
+                                  child: CircularProgressIndicator(strokeWidth: 2),
+                                )
+                              : const Icon(Icons.person_add),
+                          label: Text(
+                            _isCreating
+                                ? 'Wird erstellt… ($_progressCreated / ${_parseResult!.rows.length}, $_progressErrors Fehler)'
+                                : 'Benutzer anlegen',
+                          ),
+                        ),
+                        if (_isCreating) ...[
+                          const Gap(12),
+                          OutlinedButton.icon(
+                            onPressed: _abortCreate,
+                            icon: const Icon(Icons.cancel_outlined),
+                            label: const Text('Abbrechen'),
+                          ),
+                        ],
+                      ],
                     ),
                   ],
                 ],
diff --git a/school_data_hub_flutter/macos/Flutter/GeneratedPluginRegistrant.swift b/school_data_hub_flutter/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -22,6 +22,7 @@ import screen_retriever_macos
 import shared_preferences_foundation
 import sqflite_darwin
 import url_launcher_macos
+import wakelock_plus
 import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
@@ -42,5 +43,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+  WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
   WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
 }
diff --git a/school_data_hub_flutter/pubspec.lock b/school_data_hub_flutter/pubspec.lock
@@ -1898,6 +1898,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "15.0.0"
+  wakelock_plus:
+    dependency: "direct main"
+    description:
+      name: wakelock_plus
+      sha256: "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
+  wakelock_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: wakelock_plus_platform_interface
+      sha256: "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
   watch_it:
     dependency: transitive
     description:
diff --git a/school_data_hub_flutter/pubspec.yaml b/school_data_hub_flutter/pubspec.yaml
@@ -98,6 +98,7 @@ dependencies:
   pdfrx: ^2.2.24
   flutter_svg: ^2.2.3
   terminate_restart: ^1.0.11
+  wakelock_plus: ^1.4.0
 dev_dependencies:
   flutter_lints: '>=3.0.0 <6.0.0'
   flutter_test:
diff --git a/school_data_hub_server/lib/src/_features/admin/endpoints/admin_user_endpoint.dart b/school_data_hub_server/lib/src/_features/admin/endpoints/admin_user_endpoint.dart
