add MarianumConnectQuery base and adopt it in list queries

lib/api/marianumconnect/marianumconnect_query.dart

@@ -0,0 +1,29 @@
+import 'package:dio/dio.dart';
+
+import 'errors/marianumconnect_error.dart';
+import 'marianumconnect_api.dart';
+import 'marianumconnect_endpoint.dart';
+
+/// Shared base for MarianumConnect API queries. Owns the [dio] client (the
+/// shared authenticated singleton by default) and routes calls through [guard]
+/// so every query maps a DioException to the app's typed AppExceptions the same
+/// way instead of repeating the try/catch. Subclasses with bespoke error or
+/// lifecycle handling (own dio, silent failure, custom status mapping) may skip
+/// [guard] and still reuse [dio]/[endpoint].
+abstract class MarianumConnectQuery {
+  final Dio dio;
+
+  MarianumConnectQuery({Dio? dio}) : dio = dio ?? MarianumConnectApi.dio();
+
+  /// Resolves [path] against the active mobile-API base URL.
+  String endpoint(String path) => MarianumConnectEndpoint.resolve(path);
+
+  /// Runs [body], converting any DioException into the matching AppException.
+  Future<T> guard<T>(Future<T> Function() body) async {
+    try {
+      return await body();
+    } on DioException catch (e) {
+      throw mapMarianumConnectError(e);
+    }
+  }
+}

lib/api/marianumconnect/queries/get_holidays/get_holidays.dart

@@ -1,25 +1,13 @@
-import 'package:dio/dio.dart';
-
-import '../../errors/marianumconnect_error.dart';
-import '../../marianumconnect_api.dart';
-import '../../marianumconnect_endpoint.dart';
+import '../../marianumconnect_query.dart';
 import '../../models/mc_holiday.dart';
 
-class GetHolidays {
-  final Dio _dio;
+class GetHolidays extends MarianumConnectQuery {
+  GetHolidays({super.dio});
 
-  GetHolidays({Dio? dio}) : _dio = dio ?? MarianumConnectApi.dio();
-
-  Future<List<McHoliday>> run() async {
-    try {
-      final response = await _dio.get<List<dynamic>>(
-        MarianumConnectEndpoint.resolve('holidays'),
-      );
-      return response.data!
-          .map((e) => McHoliday.fromJson(e as Map<String, dynamic>))
-          .toList();
-    } on DioException catch (e) {
-      throw mapMarianumConnectError(e);
-    }
-  }
+  Future<List<McHoliday>> run() => guard(() async {
+    final response = await dio.get<List<dynamic>>(endpoint('holidays'));
+    return response.data!
+        .map((e) => McHoliday.fromJson(e as Map<String, dynamic>))
+        .toList();
+  });
 }

lib/api/marianumconnect/queries/timetable_get_classes/timetable_get_classes.dart

@@ -1,26 +1,16 @@
-import 'package:dio/dio.dart';
-
-import '../../errors/marianumconnect_error.dart';
-import '../../marianumconnect_api.dart';
-import '../../marianumconnect_endpoint.dart';
+import '../../marianumconnect_query.dart';
 import 'timetable_get_classes_response.dart';
 
-class TimetableGetClasses {
-  final Dio _dio;
+class TimetableGetClasses extends MarianumConnectQuery {
+  TimetableGetClasses({super.dio});
 
-  TimetableGetClasses({Dio? dio}) : _dio = dio ?? MarianumConnectApi.dio();
-
-  Future<TimetableGetClassesResponse> run() async {
-    try {
-      final response = await _dio.get<List<dynamic>>(
-        MarianumConnectEndpoint.resolve('timetable/elements/classes'),
-      );
-      final list = response.data!
-          .map((e) => McTimetableClass.fromJson(e as Map<String, dynamic>))
-          .toList();
-      return TimetableGetClassesResponse(result: list);
-    } on DioException catch (e) {
-      throw mapMarianumConnectError(e);
-    }
-  }
+  Future<TimetableGetClassesResponse> run() => guard(() async {
+    final response = await dio.get<List<dynamic>>(
+      endpoint('timetable/elements/classes'),
+    );
+    final list = response.data!
+        .map((e) => McTimetableClass.fromJson(e as Map<String, dynamic>))
+        .toList();
+    return TimetableGetClassesResponse(result: list);
+  });
 }

lib/api/marianumconnect/queries/timetable_get_holidays/timetable_get_holidays.dart

@@ -1,26 +1,16 @@
-import 'package:dio/dio.dart';
-
-import '../../errors/marianumconnect_error.dart';
-import '../../marianumconnect_api.dart';
-import '../../marianumconnect_endpoint.dart';
+import '../../marianumconnect_query.dart';
 import 'timetable_get_holidays_response.dart';
 
-class TimetableGetHolidays {
-  final Dio _dio;
+class TimetableGetHolidays extends MarianumConnectQuery {
+  TimetableGetHolidays({super.dio});
 
-  TimetableGetHolidays({Dio? dio}) : _dio = dio ?? MarianumConnectApi.dio();
-
-  Future<TimetableGetHolidaysResponse> run() async {
-    try {
-      final response = await _dio.get<List<dynamic>>(
-        MarianumConnectEndpoint.resolve('timetable/holidays'),
-      );
-      final list = response.data!
-          .map((e) => McHoliday.fromJson(e as Map<String, dynamic>))
-          .toList();
-      return TimetableGetHolidaysResponse(result: list);
-    } on DioException catch (e) {
-      throw mapMarianumConnectError(e);
-    }
-  }
+  Future<TimetableGetHolidaysResponse> run() => guard(() async {
+    final response = await dio.get<List<dynamic>>(
+      endpoint('timetable/holidays'),
+    );
+    final list = response.data!
+        .map((e) => McHoliday.fromJson(e as Map<String, dynamic>))
+        .toList();
+    return TimetableGetHolidaysResponse(result: list);
+  });
 }

lib/api/marianumconnect/queries/timetable_get_rooms/timetable_get_rooms.dart

@@ -1,26 +1,14 @@
-import 'package:dio/dio.dart';
-
-import '../../errors/marianumconnect_error.dart';
-import '../../marianumconnect_api.dart';
-import '../../marianumconnect_endpoint.dart';
+import '../../marianumconnect_query.dart';
 import 'timetable_get_rooms_response.dart';
 
-class TimetableGetRooms {
-  final Dio _dio;
+class TimetableGetRooms extends MarianumConnectQuery {
+  TimetableGetRooms({super.dio});
 
-  TimetableGetRooms({Dio? dio}) : _dio = dio ?? MarianumConnectApi.dio();
-
-  Future<TimetableGetRoomsResponse> run() async {
-    try {
-      final response = await _dio.get<List<dynamic>>(
-        MarianumConnectEndpoint.resolve('timetable/rooms'),
-      );
-      final list = response.data!
-          .map((e) => McRoom.fromJson(e as Map<String, dynamic>))
-          .toList();
-      return TimetableGetRoomsResponse(result: list);
-    } on DioException catch (e) {
-      throw mapMarianumConnectError(e);
-    }
-  }
+  Future<TimetableGetRoomsResponse> run() => guard(() async {
+    final response = await dio.get<List<dynamic>>(endpoint('timetable/rooms'));
+    final list = response.data!
+        .map((e) => McRoom.fromJson(e as Map<String, dynamic>))
+        .toList();
+    return TimetableGetRoomsResponse(result: list);
+  });
 }

lib/api/marianumconnect/queries/timetable_get_students/timetable_get_students.dart

@@ -1,26 +1,16 @@
-import 'package:dio/dio.dart';
-
-import '../../errors/marianumconnect_error.dart';
-import '../../marianumconnect_api.dart';
-import '../../marianumconnect_endpoint.dart';
+import '../../marianumconnect_query.dart';
 import 'timetable_get_students_response.dart';
 
-class TimetableGetStudents {
-  final Dio _dio;
+class TimetableGetStudents extends MarianumConnectQuery {
+  TimetableGetStudents({super.dio});
 
-  TimetableGetStudents({Dio? dio}) : _dio = dio ?? MarianumConnectApi.dio();
-
-  Future<TimetableGetStudentsResponse> run() async {
-    try {
-      final response = await _dio.get<List<dynamic>>(
-        MarianumConnectEndpoint.resolve('timetable/elements/students'),
-      );
-      final list = response.data!
-          .map((e) => McTimetableStudent.fromJson(e as Map<String, dynamic>))
-          .toList();
-      return TimetableGetStudentsResponse(result: list);
-    } on DioException catch (e) {
-      throw mapMarianumConnectError(e);
-    }
-  }
+  Future<TimetableGetStudentsResponse> run() => guard(() async {
+    final response = await dio.get<List<dynamic>>(
+      endpoint('timetable/elements/students'),
+    );
+    final list = response.data!
+        .map((e) => McTimetableStudent.fromJson(e as Map<String, dynamic>))
+        .toList();
+    return TimetableGetStudentsResponse(result: list);
+  });
 }

lib/api/marianumconnect/queries/timetable_get_subjects/timetable_get_subjects.dart

@@ -1,26 +1,16 @@
-import 'package:dio/dio.dart';
-
-import '../../errors/marianumconnect_error.dart';
-import '../../marianumconnect_api.dart';
-import '../../marianumconnect_endpoint.dart';
+import '../../marianumconnect_query.dart';
 import 'timetable_get_subjects_response.dart';
 
-class TimetableGetSubjects {
-  final Dio _dio;
+class TimetableGetSubjects extends MarianumConnectQuery {
+  TimetableGetSubjects({super.dio});
 
-  TimetableGetSubjects({Dio? dio}) : _dio = dio ?? MarianumConnectApi.dio();
-
-  Future<TimetableGetSubjectsResponse> run() async {
-    try {
-      final response = await _dio.get<List<dynamic>>(
-        MarianumConnectEndpoint.resolve('timetable/subjects'),
-      );
-      final list = response.data!
-          .map((e) => McSubject.fromJson(e as Map<String, dynamic>))
-          .toList();
-      return TimetableGetSubjectsResponse(result: list);
-    } on DioException catch (e) {
-      throw mapMarianumConnectError(e);
-    }
-  }
+  Future<TimetableGetSubjectsResponse> run() => guard(() async {
+    final response = await dio.get<List<dynamic>>(
+      endpoint('timetable/subjects'),
+    );
+    final list = response.data!
+        .map((e) => McSubject.fromJson(e as Map<String, dynamic>))
+        .toList();
+    return TimetableGetSubjectsResponse(result: list);
+  });
 }

lib/api/marianumconnect/queries/timetable_get_teachers/timetable_get_teachers.dart

@@ -1,29 +1,16 @@
-import 'package:dio/dio.dart';
-
-import '../../errors/marianumconnect_error.dart';
-import '../../marianumconnect_api.dart';
-import '../../marianumconnect_endpoint.dart';
+import '../../marianumconnect_query.dart';
 import 'timetable_get_teachers_response.dart';
 
-class TimetableGetTeachers {
-  final Dio _dio;
+class TimetableGetTeachers extends MarianumConnectQuery {
+  TimetableGetTeachers({super.dio});
 
-  TimetableGetTeachers({Dio? dio}) : _dio = dio ?? MarianumConnectApi.dio();
-
-  Future<TimetableGetTeachersResponse> run() async {
-    try {
-      final response = await _dio.get<List<dynamic>>(
-        MarianumConnectEndpoint.resolve('timetable/elements/teachers'),
-      );
-      final list = response.data!
-          .map(
-            (e) =>
-                McTimetableTeacherElement.fromJson(e as Map<String, dynamic>),
-          )
-          .toList();
-      return TimetableGetTeachersResponse(result: list);
-    } on DioException catch (e) {
-      throw mapMarianumConnectError(e);
-    }
-  }
+  Future<TimetableGetTeachersResponse> run() => guard(() async {
+    final response = await dio.get<List<dynamic>>(
+      endpoint('timetable/elements/teachers'),
+    );
+    final list = response.data!
+        .map((e) => McTimetableTeacherElement.fromJson(e as Map<String, dynamic>))
+        .toList();
+    return TimetableGetTeachersResponse(result: list);
+  });
 }

lib/api/marianumconnect/queries/timetable_get_timegrid/timetable_get_timegrid.dart

@@ -1,26 +1,16 @@
-import 'package:dio/dio.dart';
-
-import '../../errors/marianumconnect_error.dart';
-import '../../marianumconnect_api.dart';
-import '../../marianumconnect_endpoint.dart';
+import '../../marianumconnect_query.dart';
 import 'timetable_get_timegrid_response.dart';
 
-class TimetableGetTimegrid {
-  final Dio _dio;
+class TimetableGetTimegrid extends MarianumConnectQuery {
+  TimetableGetTimegrid({super.dio});
 
-  TimetableGetTimegrid({Dio? dio}) : _dio = dio ?? MarianumConnectApi.dio();
-
-  Future<TimetableGetTimegridResponse> run() async {
-    try {
-      final response = await _dio.get<List<dynamic>>(
-        MarianumConnectEndpoint.resolve('timetable/timegrid'),
-      );
-      final list = response.data!
-          .map((e) => McTimegridUnit.fromJson(e as Map<String, dynamic>))
-          .toList();
-      return TimetableGetTimegridResponse(result: list);
-    } on DioException catch (e) {
-      throw mapMarianumConnectError(e);
-    }
-  }
+  Future<TimetableGetTimegridResponse> run() => guard(() async {
+    final response = await dio.get<List<dynamic>>(
+      endpoint('timetable/timegrid'),
+    );
+    final list = response.data!
+        .map((e) => McTimegridUnit.fromJson(e as Map<String, dynamic>))
+        .toList();
+    return TimetableGetTimegridResponse(result: list);
+  });
 }

lib/api/marianumconnect/queries/user_search/user_search.dart

@@ -1,30 +1,20 @@
-import 'package:dio/dio.dart';
-
-import '../../errors/marianumconnect_error.dart';
-import '../../marianumconnect_api.dart';
-import '../../marianumconnect_endpoint.dart';
+import '../../marianumconnect_query.dart';
 import 'user_search_response.dart';
 
 /// Searches active users (students, teachers, staff) via the MarianumConnect
 /// mobile API. Returns each match's Nextcloud username plus role, so the Talk
 /// search can start a direct chat and label results without hitting Nextcloud.
-class UserSearch {
-  final Dio _dio;
+class UserSearch extends MarianumConnectQuery {
+  UserSearch({super.dio});
 
-  UserSearch({Dio? dio}) : _dio = dio ?? MarianumConnectApi.dio();
-
-  Future<UserSearchResponse> run(String query) async {
-    try {
-      final response = await _dio.get<List<dynamic>>(
-        MarianumConnectEndpoint.resolve('users/search'),
-        queryParameters: {'q': query},
-      );
-      final list = response.data!
-          .map((e) => McUserSearchResult.fromJson(e as Map<String, dynamic>))
-          .toList();
-      return UserSearchResponse(result: list);
-    } on DioException catch (e) {
-      throw mapMarianumConnectError(e);
-    }
-  }
+  Future<UserSearchResponse> run(String query) => guard(() async {
+    final response = await dio.get<List<dynamic>>(
+      endpoint('users/search'),
+      queryParameters: {'q': query},
+    );
+    final list = response.data!
+        .map((e) => McUserSearchResult.fromJson(e as Map<String, dynamic>))
+        .toList();
+    return UserSearchResponse(result: list);
+  });
 }