client+server: decouple pupil book lendings from pupil, fix server future call, add user.pupilsAuth to endpoint and UI, bugs & fixes

Author: dabblingwithcode

school_data_hub_client/lib/src/protocol/client.dart

@@ -336,6 +336,7 @@ class EndpointAdminUser extends _i1.EndpointRef {
     String? schooldayEventsProcessingTeam,
     String? matrixUserId,
     int? credit,
+    Set<int>? pupilsAuth,
   }) =>
       caller.callServerEndpoint<_i11.User>(
         'adminUser',
@@ -353,6 +354,7 @@ class EndpointAdminUser extends _i1.EndpointRef {
           'schooldayEventsProcessingTeam': schooldayEventsProcessingTeam,
           'matrixUserId': matrixUserId,
           'credit': credit,
+          'pupilsAuth': pupilsAuth,
         },
       );
 
@@ -368,6 +370,7 @@ class EndpointAdminUser extends _i1.EndpointRef {
     required int reliefTimeUnits,
     required int credit,
     required bool isTester,
+    Set<int>? pupilsAuth,
   }) =>
       caller.callServerEndpoint<_i11.User>(
         'adminUser',
@@ -383,6 +386,7 @@ class EndpointAdminUser extends _i1.EndpointRef {
           'reliefTimeUnits': reliefTimeUnits,
           'credit': credit,
           'isTester': isTester,
+          'pupilsAuth': pupilsAuth,
         },
       );
 
@@ -898,12 +902,12 @@ class EndpointPupilBookLending extends _i1.EndpointRef {
   @override
   String get name => 'pupilBookLending';
 
-  _i2.Future<_i7.PupilData> postPupilBookLending(
+  _i2.Future<_i29.PupilBookLending> postPupilBookLending(
     int pupilId,
     String libraryId,
     String lentBy,
   ) =>
-      caller.callServerEndpoint<_i7.PupilData>(
+      caller.callServerEndpoint<_i29.PupilBookLending>(
         'pupilBookLending',
         'postPupilBookLending',
         {
@@ -928,28 +932,28 @@ class EndpointPupilBookLending extends _i1.EndpointRef {
         {'lendingId': lendingId},
       );
 
-  _i2.Future<_i7.PupilData> updatePupilBookLending(
+  _i2.Future<_i29.PupilBookLending> updatePupilBookLending(
           _i29.PupilBookLending pupilBookLending) =>
-      caller.callServerEndpoint<_i7.PupilData>(
+      caller.callServerEndpoint<_i29.PupilBookLending>(
         'pupilBookLending',
         'updatePupilBookLending',
         {'pupilBookLending': pupilBookLending},
       );
 
-  _i2.Future<_i7.PupilData> deletePupilBookLending(String lendingId) =>
-      caller.callServerEndpoint<_i7.PupilData>(
+  _i2.Future<bool> deletePupilBookLending(String lendingId) =>
+      caller.callServerEndpoint<bool>(
         'pupilBookLending',
         'deletePupilBookLending',
         {'lendingId': lendingId},
       );
 
   /// Add a file to a PupilBookLending record
-  _i2.Future<_i7.PupilData> addFileToPupilBookLending(
+  _i2.Future<_i29.PupilBookLending> addFileToPupilBookLending(
     String lendingId,
     String filePath,
     String createdBy,
   ) =>
-      caller.callServerEndpoint<_i7.PupilData>(
+      caller.callServerEndpoint<_i29.PupilBookLending>(
         'pupilBookLending',
         'addFileToPupilBookLending',
         {

school_data_hub_client/lib/src/protocol/protocol.dart

@@ -1303,6 +1303,11 @@ class Protocol extends _i1.SerializationManager {
     if (t == List<String>) {
       return (data as List).map((e) => deserialize<String>(e)).toList() as T;
     }
+    if (t == _i1.getType<Set<int>?>()) {
+      return (data != null
+          ? (data as List).map((e) => deserialize<int>(e)).toSet()
+          : null) as T;
+    }
     if (t == Set<int>) {
       return (data as List).map((e) => deserialize<int>(e)).toSet() as T;
     }

school_data_hub_flutter/lib/common/widgets/hub_document/hub_documents_section.dart

@@ -12,7 +12,6 @@ import 'package:school_data_hub_flutter/common/widgets/hub_document/encrypted_do
 import 'package:school_data_hub_flutter/common/widgets/media_capture_buttons.dart';
 import 'package:school_data_hub_flutter/core/auth/auth_clearance_helper.dart';
 import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
-import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 
 /// A reusable widget for displaying and managing document collections.
 ///
@@ -86,6 +85,28 @@ class HubDocumentsSectionWidget extends StatelessWidget {
         Row(
           mainAxisSize: MainAxisSize.min,
           children: [
+            if (totalCount == 0)
+              SizedBox(
+                height: 70,
+                width: (21 / 30) * 70,
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: const Color.fromARGB(255, 221, 221, 221),
+                    borderRadius: BorderRadius.circular(5),
+                  ),
+                  child: const Center(
+                    child: Text(
+                      textAlign: TextAlign.center,
+                      'Keine\nDokumente',
+                      style: TextStyle(
+                        fontSize: 8,
+                        color: Color.fromARGB(255, 110, 110, 110),
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                ),
+              ),
             for (final file in imageFiles) ...[
               _DocumentItem(
                 file: file,

school_data_hub_flutter/lib/core/init/init_on_user_auth.dart

@@ -13,6 +13,7 @@ import 'package:school_data_hub_flutter/features/authorizations/domain/authoriza
 import 'package:school_data_hub_flutter/features/authorizations/domain/filters/authorization_filter_manager.dart';
 import 'package:school_data_hub_flutter/features/authorizations/domain/filters/pupil_authorization_filter_manager.dart';
 import 'package:school_data_hub_flutter/features/books/domain/book_manager.dart';
+import 'package:school_data_hub_flutter/features/books/domain/pupil_book_lending_manager.dart';
 import 'package:school_data_hub_flutter/features/learning/domain/competence_manager.dart';
 import 'package:school_data_hub_flutter/features/learning/domain/filters/competence_filter_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/filters/learning_support_filter_manager.dart';
@@ -96,6 +97,12 @@ class InitOnUserAuth {
       dispose: (m) => m.dispose(),
     );
 
+    di.registerSingletonAsync<PupilBookLendingManager>(
+      () => PupilBookLendingManager().init(),
+      dependsOn: [HubSessionManager, PupilProxyManager],
+      dispose: (m) => m.dispose(),
+    );
+
     di.registerSingletonAsync<SchoolDataMainManager>(
       () => SchoolDataMainManager().init(),
       dispose: (m) => m.dispose(),

school_data_hub_flutter/lib/features/books/data/pupil_book_api_service.dart

@@ -6,25 +6,25 @@ class PupilBookApiService {
   Client get _client => di<Client>();
   //- create pupil book lending
 
-  Future<PupilData?> postPupilBookLending({
+  Future<PupilBookLending?> postPupilBookLending({
     required int pupilId,
     required String libraryId,
     required String lentBy,
   }) async {
-    final pupil = await ClientHelper.apiCall(
+    final pupilBookLending = await ClientHelper.apiCall(
       call: () => _client.pupilBookLending.postPupilBookLending(
         pupilId,
         libraryId,
         lentBy,
       ),
       errorMessage: 'Fehler beim Erstellen des Leihvorgangs',
     );
-    return pupil;
+    return pupilBookLending;
   }
 
   //- update pupil book lending
 
-  Future<PupilData?> updatePupilBookLending({
+  Future<PupilBookLending?> updatePupilBookLending({
     required PupilBookLending bookLending,
   }) async {
     final pupil = await ClientHelper.apiCall(
@@ -36,11 +36,11 @@ class PupilBookApiService {
 
   //- delete pupil book
 
-  Future<PupilData?> deletePupilBookLending(String lendingId) async {
-    final pupil = await ClientHelper.apiCall(
+  Future<bool?> deletePupilBookLending(String lendingId) async {
+    final success = await ClientHelper.apiCall(
       call: () => _client.pupilBookLending.deletePupilBookLending(lendingId),
       errorMessage: 'Fehler beim Löschen des Leihvorgangs',
     );
-    return pupil;
+    return success;
   }
 }

school_data_hub_flutter/lib/features/books/data/pupil_book_lending_api_service.dart

@@ -0,0 +1,68 @@
+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';
+
+class PupilBookLendingApiService {
+  Client get _client => di<Client>();
+
+  //- read
+
+  Future<List<PupilBookLending>?> fetchAllPupilBookLendings() async {
+    final lendings = await ClientHelper.apiCall(
+      call: () => _client.pupilBookLending.fetchPupilBookLendings(),
+      errorMessage: 'Fehler beim Laden der Leihvorgänge',
+    );
+    return lendings;
+  }
+
+  Future<PupilBookLending?> fetchPupilBookLendingByLendingId(
+    String lendingId,
+  ) async {
+    final lending = await ClientHelper.apiCall(
+      call: () =>
+          _client.pupilBookLending.fetchPupilBookLendingByLendingId(lendingId),
+      errorMessage: 'Fehler beim Laden des Leihvorgangs',
+    );
+    return lending;
+  }
+
+  //- create
+
+  Future<PupilBookLending?> postPupilBookLending({
+    required int pupilId,
+    required String libraryId,
+    required String lentBy,
+  }) async {
+    final lending = await ClientHelper.apiCall(
+      call: () => _client.pupilBookLending.postPupilBookLending(
+        pupilId,
+        libraryId,
+        lentBy,
+      ),
+      errorMessage: 'Fehler beim Erstellen des Leihvorgangs',
+    );
+    return lending;
+  }
+
+  //- update
+
+  Future<PupilBookLending?> updatePupilBookLending({
+    required PupilBookLending bookLending,
+  }) async {
+    final lending = await ClientHelper.apiCall(
+      call: () => _client.pupilBookLending.updatePupilBookLending(bookLending),
+      errorMessage: 'Fehler beim Aktualisieren des Leihvorgangs',
+    );
+    return lending;
+  }
+
+  //- delete
+
+  Future<bool?> deletePupilBookLending({required String lendingId}) async {
+    final success = await ClientHelper.apiCall(
+      call: () => _client.pupilBookLending.deletePupilBookLending(lendingId),
+      errorMessage: 'Fehler beim Löschen des Leihvorgangs',
+    );
+    return success;
+  }
+}