merge staging

school_data_hub_client/lib/src/protocol/_features/books/models/book_stats_dto.dart

@@ -0,0 +1,141 @@
+/* AUTOMATICALLY GENERATED CODE DO NOT MODIFY */
+/*   To generate run: "serverpod generate"    */
+
+// ignore_for_file: implementation_imports
+// ignore_for_file: library_private_types_in_public_api
+// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: public_member_api_docs
+// ignore_for_file: type_literal_in_constant_pattern
+// ignore_for_file: use_super_parameters
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'package:serverpod_client/serverpod_client.dart' as _i1;
+
+abstract class LibraryBookStatsDto implements _i1.SerializableModel {
+  LibraryBookStatsDto._({
+    required this.totalCatalogedBooks,
+    required this.totalBooksWithReadingLevel1,
+    required this.booksWithReadingLevel2,
+    required this.booksWithReadingLevel3,
+    required this.totalLibraryBooks,
+    required this.totalReadBooks,
+    required this.actuallyBorrowedBooks,
+  });
+
+  factory LibraryBookStatsDto({
+    required int totalCatalogedBooks,
+    required int totalBooksWithReadingLevel1,
+    required int booksWithReadingLevel2,
+    required int booksWithReadingLevel3,
+    required int totalLibraryBooks,
+    required int totalReadBooks,
+    required int actuallyBorrowedBooks,
+  }) = _LibraryBookStatsDtoImpl;
+
+  factory LibraryBookStatsDto.fromJson(Map<String, dynamic> jsonSerialization) {
+    return LibraryBookStatsDto(
+      totalCatalogedBooks: jsonSerialization['totalCatalogedBooks'] as int,
+      totalBooksWithReadingLevel1:
+          jsonSerialization['totalBooksWithReadingLevel1'] as int,
+      booksWithReadingLevel2:
+          jsonSerialization['booksWithReadingLevel2'] as int,
+      booksWithReadingLevel3:
+          jsonSerialization['booksWithReadingLevel3'] as int,
+      totalLibraryBooks: jsonSerialization['totalLibraryBooks'] as int,
+      totalReadBooks: jsonSerialization['totalReadBooks'] as int,
+      actuallyBorrowedBooks: jsonSerialization['actuallyBorrowedBooks'] as int,
+    );
+  }
+
+  int totalCatalogedBooks;
+
+  int totalBooksWithReadingLevel1;
+
+  int booksWithReadingLevel2;
+
+  int booksWithReadingLevel3;
+
+  int totalLibraryBooks;
+
+  int totalReadBooks;
+
+  int actuallyBorrowedBooks;
+
+  /// Returns a shallow copy of this [LibraryBookStatsDto]
+  /// with some or all fields replaced by the given arguments.
+  @_i1.useResult
+  LibraryBookStatsDto copyWith({
+    int? totalCatalogedBooks,
+    int? totalBooksWithReadingLevel1,
+    int? booksWithReadingLevel2,
+    int? booksWithReadingLevel3,
+    int? totalLibraryBooks,
+    int? totalReadBooks,
+    int? actuallyBorrowedBooks,
+  });
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      'totalCatalogedBooks': totalCatalogedBooks,
+      'totalBooksWithReadingLevel1': totalBooksWithReadingLevel1,
+      'booksWithReadingLevel2': booksWithReadingLevel2,
+      'booksWithReadingLevel3': booksWithReadingLevel3,
+      'totalLibraryBooks': totalLibraryBooks,
+      'totalReadBooks': totalReadBooks,
+      'actuallyBorrowedBooks': actuallyBorrowedBooks,
+    };
+  }
+
+  @override
+  String toString() {
+    return _i1.SerializationManager.encode(this);
+  }
+}
+
+class _LibraryBookStatsDtoImpl extends LibraryBookStatsDto {
+  _LibraryBookStatsDtoImpl({
+    required int totalCatalogedBooks,
+    required int totalBooksWithReadingLevel1,
+    required int booksWithReadingLevel2,
+    required int booksWithReadingLevel3,
+    required int totalLibraryBooks,
+    required int totalReadBooks,
+    required int actuallyBorrowedBooks,
+  }) : super._(
+          totalCatalogedBooks: totalCatalogedBooks,
+          totalBooksWithReadingLevel1: totalBooksWithReadingLevel1,
+          booksWithReadingLevel2: booksWithReadingLevel2,
+          booksWithReadingLevel3: booksWithReadingLevel3,
+          totalLibraryBooks: totalLibraryBooks,
+          totalReadBooks: totalReadBooks,
+          actuallyBorrowedBooks: actuallyBorrowedBooks,
+        );
+
+  /// Returns a shallow copy of this [LibraryBookStatsDto]
+  /// with some or all fields replaced by the given arguments.
+  @_i1.useResult
+  @override
+  LibraryBookStatsDto copyWith({
+    int? totalCatalogedBooks,
+    int? totalBooksWithReadingLevel1,
+    int? booksWithReadingLevel2,
+    int? booksWithReadingLevel3,
+    int? totalLibraryBooks,
+    int? totalReadBooks,
+    int? actuallyBorrowedBooks,
+  }) {
+    return LibraryBookStatsDto(
+      totalCatalogedBooks: totalCatalogedBooks ?? this.totalCatalogedBooks,
+      totalBooksWithReadingLevel1:
+          totalBooksWithReadingLevel1 ?? this.totalBooksWithReadingLevel1,
+      booksWithReadingLevel2:
+          booksWithReadingLevel2 ?? this.booksWithReadingLevel2,
+      booksWithReadingLevel3:
+          booksWithReadingLevel3 ?? this.booksWithReadingLevel3,
+      totalLibraryBooks: totalLibraryBooks ?? this.totalLibraryBooks,
+      totalReadBooks: totalReadBooks ?? this.totalReadBooks,
+      actuallyBorrowedBooks:
+          actuallyBorrowedBooks ?? this.actuallyBorrowedBooks,
+    );
+  }
+}

school_data_hub_client/lib/src/protocol/_features/pupil/models/pupil_identity/pupil_identity.dart

@@ -31,6 +31,7 @@ abstract class PupilIdentity implements _i1.SerializableModel {
     required this.afterSchoolCare,
     this.religion,
     this.religionLessonsSince,
+    this.religionLessonsCancelledAt,
     this.familyLanguageLessonsSince,
     this.leavingDate,
   });
@@ -52,6 +53,7 @@ abstract class PupilIdentity implements _i1.SerializableModel {
     required bool afterSchoolCare,
     String? religion,
     DateTime? religionLessonsSince,
+    DateTime? religionLessonsCancelledAt,
     DateTime? familyLanguageLessonsSince,
     DateTime? leavingDate,
   }) = _PupilIdentityImpl;
@@ -83,6 +85,11 @@ abstract class PupilIdentity implements _i1.SerializableModel {
           ? null
           : _i1.DateTimeJsonExtension.fromJson(
               jsonSerialization['religionLessonsSince']),
+      religionLessonsCancelledAt:
+          jsonSerialization['religionLessonsCancelledAt'] == null
+              ? null
+              : _i1.DateTimeJsonExtension.fromJson(
+                  jsonSerialization['religionLessonsCancelledAt']),
       familyLanguageLessonsSince:
           jsonSerialization['familyLanguageLessonsSince'] == null
               ? null
@@ -127,6 +134,8 @@ abstract class PupilIdentity implements _i1.SerializableModel {
 
   DateTime? religionLessonsSince;
 
+  DateTime? religionLessonsCancelledAt;
+
   DateTime? familyLanguageLessonsSince;
 
   DateTime? leavingDate;
@@ -151,6 +160,7 @@ abstract class PupilIdentity implements _i1.SerializableModel {
     bool? afterSchoolCare,
     String? religion,
     DateTime? religionLessonsSince,
+    DateTime? religionLessonsCancelledAt,
     DateTime? familyLanguageLessonsSince,
     DateTime? leavingDate,
   });
@@ -175,6 +185,8 @@ abstract class PupilIdentity implements _i1.SerializableModel {
       if (religion != null) 'religion': religion,
       if (religionLessonsSince != null)
         'religionLessonsSince': religionLessonsSince?.toJson(),
+      if (religionLessonsCancelledAt != null)
+        'religionLessonsCancelledAt': religionLessonsCancelledAt?.toJson(),
       if (familyLanguageLessonsSince != null)
         'familyLanguageLessonsSince': familyLanguageLessonsSince?.toJson(),
       if (leavingDate != null) 'leavingDate': leavingDate?.toJson(),
@@ -207,6 +219,7 @@ class _PupilIdentityImpl extends PupilIdentity {
     required bool afterSchoolCare,
     String? religion,
     DateTime? religionLessonsSince,
+    DateTime? religionLessonsCancelledAt,
     DateTime? familyLanguageLessonsSince,
     DateTime? leavingDate,
   }) : super._(
@@ -226,6 +239,7 @@ class _PupilIdentityImpl extends PupilIdentity {
           afterSchoolCare: afterSchoolCare,
           religion: religion,
           religionLessonsSince: religionLessonsSince,
+          religionLessonsCancelledAt: religionLessonsCancelledAt,
           familyLanguageLessonsSince: familyLanguageLessonsSince,
           leavingDate: leavingDate,
         );
@@ -251,6 +265,7 @@ class _PupilIdentityImpl extends PupilIdentity {
     bool? afterSchoolCare,
     Object? religion = _Undefined,
     Object? religionLessonsSince = _Undefined,
+    Object? religionLessonsCancelledAt = _Undefined,
     Object? familyLanguageLessonsSince = _Undefined,
     Object? leavingDate = _Undefined,
   }) {
@@ -275,6 +290,9 @@ class _PupilIdentityImpl extends PupilIdentity {
       religionLessonsSince: religionLessonsSince is DateTime?
           ? religionLessonsSince
           : this.religionLessonsSince,
+      religionLessonsCancelledAt: religionLessonsCancelledAt is DateTime?
+          ? religionLessonsCancelledAt
+          : this.religionLessonsCancelledAt,
       familyLanguageLessonsSince: familyLanguageLessonsSince is DateTime?
           ? familyLanguageLessonsSince
           : this.familyLanguageLessonsSince,

school_data_hub_client/lib/src/protocol/_features/pupil/models/pupil_identity/pupil_identity_dto.dart

@@ -13,37 +13,54 @@ import 'package:serverpod_client/serverpod_client.dart' as _i1;
 
 abstract class PupilIdentityDto implements _i1.SerializableModel {
   PupilIdentityDto._({
+    required this.sender,
     required this.type,
+    this.dataTimeStamp,
     required this.value,
   });
 
   factory PupilIdentityDto({
+    required String sender,
     required String type,
+    DateTime? dataTimeStamp,
     required String value,
   }) = _PupilIdentityDtoImpl;
 
   factory PupilIdentityDto.fromJson(Map<String, dynamic> jsonSerialization) {
     return PupilIdentityDto(
+      sender: jsonSerialization['sender'] as String,
       type: jsonSerialization['type'] as String,
+      dataTimeStamp: jsonSerialization['dataTimeStamp'] == null
+          ? null
+          : _i1.DateTimeJsonExtension.fromJson(
+              jsonSerialization['dataTimeStamp']),
       value: jsonSerialization['value'] as String,
     );
   }
 
+  String sender;
+
   String type;
 
+  DateTime? dataTimeStamp;
+
   String value;
 
   /// Returns a shallow copy of this [PupilIdentityDto]
   /// with some or all fields replaced by the given arguments.
   @_i1.useResult
   PupilIdentityDto copyWith({
+    String? sender,
     String? type,
+    DateTime? dataTimeStamp,
     String? value,
   });
   @override
   Map<String, dynamic> toJson() {
     return {
+      'sender': sender,
       'type': type,
+      if (dataTimeStamp != null) 'dataTimeStamp': dataTimeStamp?.toJson(),
       'value': value,
     };
   }
@@ -54,12 +71,18 @@ abstract class PupilIdentityDto implements _i1.SerializableModel {
   }
 }
 
+class _Undefined {}
+
 class _PupilIdentityDtoImpl extends PupilIdentityDto {
   _PupilIdentityDtoImpl({
+    required String sender,
     required String type,
+    DateTime? dataTimeStamp,
     required String value,
   }) : super._(
+          sender: sender,
           type: type,
+          dataTimeStamp: dataTimeStamp,
           value: value,
         );
 
@@ -68,11 +91,16 @@ class _PupilIdentityDtoImpl extends PupilIdentityDto {
   @_i1.useResult
   @override
   PupilIdentityDto copyWith({
+    String? sender,
     String? type,
+    Object? dataTimeStamp = _Undefined,
     String? value,
   }) {
     return PupilIdentityDto(
+      sender: sender ?? this.sender,
       type: type ?? this.type,
+      dataTimeStamp:
+          dataTimeStamp is DateTime? ? dataTimeStamp : this.dataTimeStamp,
       value: value ?? this.value,
     );
   }