fix user bulk create

Author: dabblingwithcode

school_data_hub_client/lib/src/protocol/client.dart

@@ -401,6 +401,7 @@ class EndpointAdminUser extends _i1.EndpointRef {
       );
 
   /// Batch-creates users. Returns credentials for successes and errors for skipped/failed rows.
+  /// Each create runs in its own transaction; creates are executed in parallel (up to 5 at a time) to reduce timeout risk.
   _i2.Future<_i13.BatchCreateUsersResponse> batchCreateUsers(
           List<_i14.CreateUserRequest> requests) =>
       caller.callServerEndpoint<_i13.BatchCreateUsersResponse>(

school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/matrix_users_list_page.dart

@@ -194,6 +194,7 @@ class _MatrixUsersListContent extends WatchingWidget {
   static Future<Map<String?, UserWithDevices>> _loadAppUsersByMatrixId() async {
     try {
       final list = await di<UserApiService>().getAllUsersWithDevices();
+      if (list == null) return {};
       final map = <String?, UserWithDevices>{};
       for (final u in list) {
         final matrixId = u.user.matrixUserId;

school_data_hub_flutter/lib/features/user/data/user_api_service.dart

@@ -1,23 +1,33 @@
 import 'package:flutter_it/flutter_it.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/core/client/client_helper.dart';
 
 /// API service for user-related operations.
 class UserApiService {
   Client get _client => di<Client>();
 
   /// Fetch all users.
-  Future<List<User>> getAllUsers() async {
-    return _client.user.getAllUsers();
+  Future<List<User>?> getAllUsers() async {
+    return ClientHelper.apiCall(
+      call: () => _client.user.getAllUsers(),
+      errorMessage: 'Benutzer abrufen',
+    );
   }
 
   /// Fetch all users with UserInfo and list of UserDevices per user.
-  Future<List<UserWithDevices>> getAllUsersWithDevices() async {
-    return _client.user.getAllUsersWithDevices();
+  Future<List<UserWithDevices>?> getAllUsersWithDevices() async {
+    return ClientHelper.apiCall(
+      call: () => _client.user.getAllUsersWithDevices(),
+      errorMessage: 'Benutzer mit Geräten abrufen',
+    );
   }
 
   /// Get the currently authenticated user.
   Future<User?> getCurrentUser() async {
-    return _client.user.getCurrentUser();
+    return ClientHelper.apiCall<User?>(
+      call: () => _client.user.getCurrentUser(),
+      errorMessage: 'Aktuellen Benutzer abrufen',
+    );
   }
 
   /// Create a new user.
@@ -34,18 +44,21 @@ class UserApiService {
     required bool isTester,
     Set<int>? pupilsAuth,
   }) async {
-    await _client.adminUser.createUser(
-      userName: userName,
-      fullName: fullName,
-      email: email,
-      matrixUserId: matrixUserId,
-      password: password,
-      role: role,
-      timeUnits: timeUnits,
-      reliefTimeUnits: reliefTimeUnits,
-      scopeNames: scopeNames,
-      isTester: isTester,
-      pupilsAuth: pupilsAuth,
+    await ClientHelper.apiCall(
+      call: () => _client.adminUser.createUser(
+        userName: userName,
+        fullName: fullName,
+        email: email,
+        matrixUserId: matrixUserId,
+        password: password,
+        role: role,
+        timeUnits: timeUnits,
+        reliefTimeUnits: reliefTimeUnits,
+        scopeNames: scopeNames,
+        isTester: isTester,
+        pupilsAuth: pupilsAuth,
+      ),
+      errorMessage: 'Benutzer erstellen',
     );
   }
 
@@ -65,55 +78,76 @@ class UserApiService {
     String? imageUrl,
     Set<int>? pupilsAuth,
   }) async {
-    await _client.adminUser.updateUser(
-      userId,
-      userName: userName,
-      fullName: fullName,
-      email: email,
-      role: role,
-      matrixUserId: matrixUserId,
-      timeUnits: timeUnits,
-      reliefTimeUnits: reliefTimeUnits,
-      credit: credit,
-      isTester: isTester,
-      pupilsAuth: pupilsAuth,
+    await ClientHelper.apiCall(
+      call: () => _client.adminUser.updateUser(
+        userId,
+        userName: userName,
+        fullName: fullName,
+        email: email,
+        role: role,
+        matrixUserId: matrixUserId,
+        timeUnits: timeUnits,
+        reliefTimeUnits: reliefTimeUnits,
+        credit: credit,
+        isTester: isTester,
+        pupilsAuth: pupilsAuth,
+      ),
+      errorMessage: 'Benutzer aktualisieren',
     );
     // TODO: when server supports UserInfo.imageUrl, add imageUrl to the
     // endpoint and pass it here (client must be regenerated).
   }
 
   /// Reset a user's password. Returns `true` on success.
-  Future<bool> resetPassword(String userEmail, String newPassword) async {
-    return _client.adminUser.resetPassword(userEmail, newPassword);
+  Future<bool?> resetPassword(String userEmail, String newPassword) async {
+    return ClientHelper.apiCall(
+      call: () => _client.adminUser.resetPassword(userEmail, newPassword),
+      errorMessage: 'Passwort zurücksetzen',
+    );
   }
 
   /// Change the current user's password. Returns `true` on success.
-  Future<bool> changePassword(String oldPassword, String newPassword) async {
-    return _client.user.changePassword(oldPassword, newPassword);
+  Future<bool?> changePassword(String oldPassword, String newPassword) async {
+    return ClientHelper.apiCall(
+      call: () => _client.user.changePassword(oldPassword, newPassword),
+      errorMessage: 'Passwort ändern',
+    );
   }
 
   /// Delete (block) a user by ID.
   Future<void> deleteUser(int userId) async {
-    await _client.adminUser.deleteUser(userId);
+    await ClientHelper.apiCall(
+      call: () => _client.adminUser.deleteUser(userId),
+      errorMessage: 'Benutzer löschen',
+    );
   }
 
   /// Delete the auth key associated with a device. Returns updated user+devices
   /// for the session user (or null if not authenticated).
   Future<UserWithDevices?> deleteAuthKeyAssociatedWithDevice(
     UserDevice device,
   ) async {
-    return _client.adminUser.deleteAuthKeyAssociatedWithDevice(device);
+    return ClientHelper.apiCall<UserWithDevices?>(
+      call: () => _client.adminUser.deleteAuthKeyAssociatedWithDevice(device),
+      errorMessage: 'Geräte-Auth-Key löschen',
+    );
   }
 
   /// Increase staff credit for all users. Returns `true` on success.
-  Future<bool> increaseStaffCredit() async {
-    return _client.user.increaseStaffCredit();
+  Future<bool?> increaseStaffCredit() async {
+    return ClientHelper.apiCall(
+      call: () => _client.user.increaseStaffCredit(),
+      errorMessage: 'Mitarbeiter-Guthaben erhöhen',
+    );
   }
 
   /// Batch-creates users. Returns credentials for successes and errors for skipped/failed rows.
-  Future<BatchCreateUsersResponse> batchCreateUsers(
+  Future<BatchCreateUsersResponse?> batchCreateUsers(
     List<CreateUserRequest> requests,
   ) async {
-    return _client.adminUser.batchCreateUsers(requests);
+    return ClientHelper.apiCall(
+      call: () => _client.adminUser.batchCreateUsers(requests),
+      errorMessage: 'Benutzer-Stapelimport',
+    );
   }
 }

school_data_hub_flutter/lib/features/user/domain/user_manager.dart

@@ -126,8 +126,8 @@ class UserManager {
   //-- Command implementations --
 
   Future<void> _fetchUsers() async {
-    final List<UserWithDevices> list = await _apiService
-        .getAllUsersWithDevices();
+    final list = await _apiService.getAllUsersWithDevices();
+    if (list == null) return;
     list.sort(
       (a, b) => (a.user.userInfo?.userName ?? '').compareTo(
         b.user.userInfo?.userName ?? '',
@@ -152,7 +152,7 @@ class UserManager {
       pupilsAuth: params.pupilsAuth,
     );
     final userWithDetails = await _apiService.getCurrentUser();
-    _addUser(userWithDetails!);
+    if (userWithDetails != null) _addUser(userWithDetails);
 
     _notificationService.showSnackBar(
       NotificationType.success,
@@ -165,7 +165,7 @@ class UserManager {
       params.userEmail,
       params.newPassword,
     );
-    if (!success) {
+    if (success != true) {
       throw Exception('Passwort konnte nicht zurückgesetzt werden!');
     }
     _notificationService.showSnackBar(
@@ -179,7 +179,7 @@ class UserManager {
       params.oldPassword,
       params.newPassword,
     );
-    if (!success) {
+    if (success != true) {
       throw Exception('Passwort konnte nicht geändert werden!');
     }
     _notificationService.showSnackBar(
@@ -233,7 +233,7 @@ class UserManager {
 
   Future<void> _increaseUsersCredit() async {
     final success = await _apiService.increaseStaffCredit();
-    if (!success) {
+    if (success != true) {
       throw Exception('Guthaben konnte nicht erhöht werden!');
     }
     _notificationService.showSnackBar(
@@ -255,24 +255,28 @@ class UserManager {
       final email = row.email.trim().isEmpty
           ? '$userName@schule.local'
           : row.email.trim();
-      final scopeNames =
-          row.role == Role.admin ? ['admin'] : <String>[];
-      requests.add(CreateUserRequest(
-        userName: userName,
-        fullName: row.fullName,
-        email: email,
-        password: gen(row),
-        role: row.role,
-        timeUnits: row.timeUnits,
-        reliefTimeUnits: row.reliefTimeUnits,
-        scopeNames: scopeNames,
-        isTester: false,
-        matrixUserId: null,
-        credit: null,
-        pupilsAuth: null,
-      ));
+      final scopeNames = row.role == Role.admin ? ['admin'] : <String>[];
+      requests.add(
+        CreateUserRequest(
+          userName: userName,
+          fullName: row.fullName,
+          email: email,
+          password: gen(row),
+          role: row.role,
+          timeUnits: row.timeUnits,
+          reliefTimeUnits: row.reliefTimeUnits,
+          scopeNames: scopeNames,
+          isTester: false,
+          matrixUserId: null,
+          credit: null,
+          pupilsAuth: null,
+        ),
+      );
     }
     final response = await _apiService.batchCreateUsers(requests);
+    if (response == null) {
+      throw Exception('Benutzer-Stapelimport fehlgeschlagen.');
+    }
     final credentials = response.credentials
         .map(
           (c) => StaffCredentialEntry(