Remove School from codebase. (#720)

SharezoneApp · Aug 8, 2023 · fa8b990 · fa8b990
1 parent 44de3cd
commit fa8b990
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 232 deletions.
diff --git a/app/lib/groups/src/pages/course/group_page.dart b/app/lib/groups/src/pages/course/group_page.dart
@@ -106,7 +106,6 @@ class GroupPageState extends State<GroupPage> {
           builder: (context, snapshot) {
             final data = snapshot.hasData ? snapshot.data : null;
             final isEmpty = (data?.courses == null || data.courses.isEmpty) &&
-                data?.school == null &&
                 (data?.schoolClass == null || data.schoolClass.isEmpty);
 
             if (isEmpty) return _EmptyGroupList();

diff --git a/app/lib/onboarding/group_onboarding/pages/share_sharecode.dart b/app/lib/onboarding/group_onboarding/pages/share_sharecode.dart
@@ -191,8 +191,6 @@ class _SharecodeBox extends StatelessWidget {
         return 'des Kurses';
       case GroupType.schoolclass:
         return 'der Schulklasse';
-      case GroupType.school:
-        return 'der Schule';
       default:
         return '';
     }

diff --git a/app/lib/util/api.dart b/app/lib/util/api.dart
@@ -15,7 +15,6 @@ import 'package:sharezone/util/api/connections_gateway.dart';
 import 'package:sharezone/util/api/course_gateway.dart';
 import 'package:sharezone/util/api/homework_api.dart';
 import 'package:sharezone/util/api/school_class_gateway.dart';
-import 'package:sharezone/util/api/school_gateway.dart';
 import 'package:sharezone/util/api/timetable_gateway.dart';
 import 'package:sharezone/util/api/user_api.dart';
 import 'package:sharezone_common/references.dart';
@@ -35,7 +34,6 @@ class SharezoneGateway {
   final ConnectionsGateway connectionsGateway;
   final CourseGateway course;
   final SchoolClassGateway schoolClassGateway;
-  final SchoolGateway schoolGateway;
   final TimetableGateway timetable;
 
   factory SharezoneGateway({
@@ -51,7 +49,6 @@ class SharezoneGateway {
       course: CourseGateway(references, memberID, connectionsGateway),
       schoolClassGateway:
           SchoolClassGateway(references, memberID, connectionsGateway),
-      schoolGateway: SchoolGateway(references, memberID, connectionsGateway),
       authUser: authUser,
       timetable: TimetableGateway(references, memberID),
       user: UserGateway(references, authUser),
@@ -65,7 +62,6 @@ class SharezoneGateway {
     @required this.references,
     @required this.course,
     @required this.schoolClassGateway,
-    @required this.schoolGateway,
     @required this.timetable,
     @required this.user,
   })  : _authUser = authUser,

diff --git a/app/lib/util/api/connections_gateway.dart b/app/lib/util/api/connections_gateway.dart
@@ -120,8 +120,6 @@ class ConnectionsGateway implements MyConnectionsAccesor {
         return 'Courses';
       case GroupType.schoolclass:
         return 'SchoolClasses';
-      case GroupType.school:
-        return 'School';
     }
     throw UnimplementedError('There is no string for $groupType');
   }

diff --git a/app/lib/util/api/school_gateway.dart b/app/lib/util/api/school_gateway.dart
diff --git a/lib/group_domain_models/lib/group_domain_models.dart b/lib/group_domain_models/lib/group_domain_models.dart
@@ -17,6 +17,5 @@ export 'src/models/group_type.dart';
 export 'src/models/member_role.dart';
 export 'src/models/member.dart';
 export 'src/models/school_class.dart';
-export 'src/models/school.dart';
 export 'src/models/sharecode.dart';
 export 'src/models/write_permissions.dart';
diff --git a/lib/group_domain_models/lib/src/models/connections_data.dart b/lib/group_domain_models/lib/src/models/connections_data.dart
@@ -12,32 +12,22 @@ import 'package:sharezone_common/helper_functions.dart';
 import 'package:sharezone_common/references.dart';
 
 class ConnectionsData {
-  final School school;
   final Map<String, SchoolClass> schoolClass;
   final Map<String, Course> courses;
 
-  const ConnectionsData._(
-      {@required this.school,
-      @required this.schoolClass,
-      @required this.courses});
+  const ConnectionsData._({@required this.schoolClass, @required this.courses});
 
   factory ConnectionsData.fromData({@required Map<String, dynamic> data}) {
     if (data == null) {
       return const ConnectionsData._(
-        school: null,
         schoolClass: null,
         courses: {},
       );
     }
-    Map<String, School> schools = decodeMap(data[CollectionNames.schools],
-        (key, data) => School.fromData(data, id: key));
     Map<String, SchoolClass> schoolClasses = decodeMap(
         data[CollectionNames.schoolClasses],
         (key, data) => SchoolClass.fromData(data, id: key));
-    School school;
-    if (schools.length == 1) school = schools.values.first;
     return ConnectionsData._(
-      school: school,
       schoolClass: schoolClasses,
       courses: decodeMap(data[CollectionNames.courses],
           (key, data) => Course.fromData(data, id: key)),
@@ -53,7 +43,6 @@ class ConnectionsData {
     }
     return ConnectionsData._(
       schoolClass: schoolClass,
-      school: school,
       courses: courseMap,
     );
   }

diff --git a/lib/group_domain_models/lib/src/models/group_type.dart b/lib/group_domain_models/lib/src/models/group_type.dart
@@ -8,7 +8,7 @@
 
 import 'package:sharezone_common/helper_functions.dart';
 
-enum GroupType { course, schoolclass, school }
+enum GroupType { course, schoolclass }
 
 GroupType groupTypeFromString(String data) =>
     enumFromString(GroupType.values, data, orElse: GroupType.course);

diff --git a/lib/group_domain_models/lib/src/models/school.dart b/lib/group_domain_models/lib/src/models/school.dart