Merge pull request #11 from dabblingwithcode/staging

Staging

Author: dabblingwithcode

.github/workflows/deployment-docker-staging.yml

@@ -168,6 +168,14 @@ jobs:
           SERVERPOD_MAX_REQUEST_SIZE: ${{ secrets.SERVERPOD_STAGING_MAX_REQUEST_SIZE }}
           # The token used to connect with insights must be at least 20 chars
           SERVERPOD_SERVICE_SECRET: ${{ secrets.SERVERPOD_STAGING_SERVICE_SECRET }}
+          # Mail configuration for sending emails
+          SERVERPOD_MAIL_USERNAME: ${{ secrets.SERVERPOD_MAIL_USERNAME }}
+          SERVERPOD_MAIL_PASSWORD: ${{ secrets.SERVERPOD_MAIL_PASSWORD }}
+          SERVERPOD_MAIL_SMTP_HOST: ${{ secrets.SERVERPOD_MAIL_SMTP_HOST }}
+          SERVERPOD_MAIL_ADMIN: ${{ secrets.SERVERPOD_MAIL_ADMIN }}
+          # Matrix configuration for sending emails
+          MATRIX_SERVER_URL: ${{ secrets.MATRIX_SERVER_URL }}
+          MATRIX_AUTH_TOKEN: ${{ secrets.MATRIX_AUTH_TOKEN }}
 
       - name: cleanup
         run: rm -rf ~/.ssh

.github/workflows/deployment-docker.yml

@@ -164,6 +164,14 @@ jobs:
           SERVERPOD_MAX_REQUEST_SIZE: ${{ secrets.SERVERPOD_MAX_REQUEST_SIZE }}
           # The token used to connect with insights must be at least 20 chars
           SERVERPOD_SERVICE_SECRET: ${{ secrets.SERVERPOD_SERVICE_SECRET }}
+          # Mail configuration for sending emails
+          SERVERPOD_MAIL_USERNAME: ${{ secrets.SERVERPOD_MAIL_USERNAME }}
+          SERVERPOD_MAIL_PASSWORD: ${{ secrets.SERVERPOD_MAIL_PASSWORD }}
+          SERVERPOD_MAIL_SMTP_HOST: ${{ secrets.SERVERPOD_MAIL_SMTP_HOST }}
+          SERVERPOD_MAIL_ADMIN: ${{ secrets.SERVERPOD_MAIL_ADMIN }}
+          # Matrix configuration for sending emails
+          MATRIX_SERVER_URL: ${{ secrets.MATRIX_SERVER_URL }}
+          MATRIX_AUTH_TOKEN: ${{ secrets.MATRIX_AUTH_TOKEN }}
 
       - name: cleanup
         run: rm -rf ~/.ssh

README.md

@@ -24,11 +24,13 @@ abstract class User implements _i1.SerializableModel {
     required this.userInfoId,
     this.userInfo,
     required this.role,
+    this.matrixUserId,
     required this.timeUnits,
     required this.reliefTimeUnits,
     this.scheduledLessonsTeacher,
     this.lessonsTeacher,
     this.pupilsAuth,
+    this.schooldayEventsProcessingTeam,
     required this.credit,
     required this.userFlags,
   });
@@ -38,11 +40,13 @@ abstract class User implements _i1.SerializableModel {
     required int userInfoId,
     _i2.UserInfo? userInfo,
     required _i3.Role role,
+    String? matrixUserId,
     required int timeUnits,
     required int reliefTimeUnits,
     List<_i4.ScheduledLessonTeacher>? scheduledLessonsTeacher,
     List<_i5.LessonTeacher>? lessonsTeacher,
     Set<int>? pupilsAuth,
+    String? schooldayEventsProcessingTeam,
     required int credit,
     required _i6.UserFlags userFlags,
   }) = _UserImpl;
@@ -56,6 +60,7 @@ abstract class User implements _i1.SerializableModel {
           : _i2.UserInfo.fromJson(
               (jsonSerialization['userInfo'] as Map<String, dynamic>)),
       role: _i3.Role.fromJson((jsonSerialization['role'] as String)),
+      matrixUserId: jsonSerialization['matrixUserId'] as String?,
       timeUnits: jsonSerialization['timeUnits'] as int,
       reliefTimeUnits: jsonSerialization['reliefTimeUnits'] as int,
       scheduledLessonsTeacher: (jsonSerialization['scheduledLessonsTeacher']
@@ -71,6 +76,8 @@ abstract class User implements _i1.SerializableModel {
           : _i1.SetJsonExtension.fromJson(
               (jsonSerialization['pupilsAuth'] as List),
               itemFromJson: (e) => e as int),
+      schooldayEventsProcessingTeam:
+          jsonSerialization['schooldayEventsProcessingTeam'] as String?,
       credit: jsonSerialization['credit'] as int,
       userFlags: _i6.UserFlags.fromJson(
           (jsonSerialization['userFlags'] as Map<String, dynamic>)),
@@ -88,6 +95,8 @@ abstract class User implements _i1.SerializableModel {
 
   _i3.Role role;
 
+  String? matrixUserId;
+
   int timeUnits;
 
   int reliefTimeUnits;
@@ -98,6 +107,8 @@ abstract class User implements _i1.SerializableModel {
 
   Set<int>? pupilsAuth;
 
+  String? schooldayEventsProcessingTeam;
+
   int credit;
 
   _i6.UserFlags userFlags;
@@ -110,11 +121,13 @@ abstract class User implements _i1.SerializableModel {
     int? userInfoId,
     _i2.UserInfo? userInfo,
     _i3.Role? role,
+    String? matrixUserId,
     int? timeUnits,
     int? reliefTimeUnits,
     List<_i4.ScheduledLessonTeacher>? scheduledLessonsTeacher,
     List<_i5.LessonTeacher>? lessonsTeacher,
     Set<int>? pupilsAuth,
+    String? schooldayEventsProcessingTeam,
     int? credit,
     _i6.UserFlags? userFlags,
   });
@@ -125,6 +138,7 @@ abstract class User implements _i1.SerializableModel {
       'userInfoId': userInfoId,
       if (userInfo != null) 'userInfo': userInfo?.toJson(),
       'role': role.toJson(),
+      if (matrixUserId != null) 'matrixUserId': matrixUserId,
       'timeUnits': timeUnits,
       'reliefTimeUnits': reliefTimeUnits,
       if (scheduledLessonsTeacher != null)
@@ -134,6 +148,8 @@ abstract class User implements _i1.SerializableModel {
         'lessonsTeacher':
             lessonsTeacher?.toJson(valueToJson: (v) => v.toJson()),
       if (pupilsAuth != null) 'pupilsAuth': pupilsAuth?.toJson(),
+      if (schooldayEventsProcessingTeam != null)
+        'schooldayEventsProcessingTeam': schooldayEventsProcessingTeam,
       'credit': credit,
       'userFlags': userFlags.toJson(),
     };
@@ -153,23 +169,27 @@ class _UserImpl extends User {
     required int userInfoId,
     _i2.UserInfo? userInfo,
     required _i3.Role role,
+    String? matrixUserId,
     required int timeUnits,
     required int reliefTimeUnits,
     List<_i4.ScheduledLessonTeacher>? scheduledLessonsTeacher,
     List<_i5.LessonTeacher>? lessonsTeacher,
     Set<int>? pupilsAuth,
+    String? schooldayEventsProcessingTeam,
     required int credit,
     required _i6.UserFlags userFlags,
   }) : super._(
           id: id,
           userInfoId: userInfoId,
           userInfo: userInfo,
           role: role,
+          matrixUserId: matrixUserId,
           timeUnits: timeUnits,
           reliefTimeUnits: reliefTimeUnits,
           scheduledLessonsTeacher: scheduledLessonsTeacher,
           lessonsTeacher: lessonsTeacher,
           pupilsAuth: pupilsAuth,
+          schooldayEventsProcessingTeam: schooldayEventsProcessingTeam,
           credit: credit,
           userFlags: userFlags,
         );
@@ -183,11 +203,13 @@ class _UserImpl extends User {
     int? userInfoId,
     Object? userInfo = _Undefined,
     _i3.Role? role,
+    Object? matrixUserId = _Undefined,
     int? timeUnits,
     int? reliefTimeUnits,
     Object? scheduledLessonsTeacher = _Undefined,
     Object? lessonsTeacher = _Undefined,
     Object? pupilsAuth = _Undefined,
+    Object? schooldayEventsProcessingTeam = _Undefined,
     int? credit,
     _i6.UserFlags? userFlags,
   }) {
@@ -197,6 +219,7 @@ class _UserImpl extends User {
       userInfo:
           userInfo is _i2.UserInfo? ? userInfo : this.userInfo?.copyWith(),
       role: role ?? this.role,
+      matrixUserId: matrixUserId is String? ? matrixUserId : this.matrixUserId,
       timeUnits: timeUnits ?? this.timeUnits,
       reliefTimeUnits: reliefTimeUnits ?? this.reliefTimeUnits,
       scheduledLessonsTeacher: scheduledLessonsTeacher
@@ -209,6 +232,9 @@ class _UserImpl extends User {
       pupilsAuth: pupilsAuth is Set<int>?
           ? pupilsAuth
           : this.pupilsAuth?.map((e0) => e0).toSet(),
+      schooldayEventsProcessingTeam: schooldayEventsProcessingTeam is String?
+          ? schooldayEventsProcessingTeam
+          : this.schooldayEventsProcessingTeam,
       credit: credit ?? this.credit,
       userFlags: userFlags ?? this.userFlags.copyWith(),
     );