Handle provider errors on the abstract class (#977)

NIAEFEUP · Sep 29, 2023 · 14e7f05 · 14e7f05
2 parents 46ab53b + 9d145da
commit 14e7f05
Show file tree

Hide file tree

Showing 22 changed files with 250 additions and 330 deletions.
diff --git a/uni/lib/model/providers/lazy/bus_stop_provider.dart b/uni/lib/model/providers/lazy/bus_stop_provider.dart
@@ -1,14 +1,12 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:logger/logger.dart';
 import 'package:uni/controller/fetchers/departures_fetcher.dart';
 import 'package:uni/controller/local_storage/app_bus_stop_database.dart';
 import 'package:uni/model/entities/bus_stop.dart';
 import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 
 class BusStopProvider extends StateProviderNotifier {
   BusStopProvider() : super(dependsOnSession: false, cacheDuration: null);
@@ -33,20 +31,14 @@ class BusStopProvider extends StateProviderNotifier {
   }
 
   Future<void> fetchUserBusTrips() async {
-    try {
-      for (final stopCode in configuredBusStops.keys) {
-        final stopTrips = await DeparturesFetcher.getNextArrivalsStop(
-          stopCode,
-          configuredBusStops[stopCode]!,
-        );
-        _configuredBusStops[stopCode]?.trips = stopTrips;
-      }
-      _timeStamp = DateTime.now();
-      updateStatus(RequestStatus.successful);
-    } catch (e) {
-      Logger().e('Failed to get Bus Stop information');
-      updateStatus(RequestStatus.failed);
+    for (final stopCode in configuredBusStops.keys) {
+      final stopTrips = await DeparturesFetcher.getNextArrivalsStop(
+        stopCode,
+        configuredBusStops[stopCode]!,
+      );
+      _configuredBusStops[stopCode]?.trips = stopTrips;
     }
+    _timeStamp = DateTime.now();
   }
 
   Future<void> addUserBusStop(String stopCode, BusStopData stopData) async {
@@ -59,7 +51,6 @@ class BusStopProvider extends StateProviderNotifier {
       _configuredBusStops[stopCode] = stopData;
     }
 
-    updateStatus(RequestStatus.busy);
     await fetchUserBusTrips();
 
     final db = AppBusStopDatabase();
@@ -69,7 +60,6 @@ class BusStopProvider extends StateProviderNotifier {
   Future<void> removeUserBusStop(
     String stopCode,
   ) async {
-    updateStatus(RequestStatus.busy);
     _configuredBusStops.remove(stopCode);
     notifyListeners();
 

diff --git a/uni/lib/model/providers/lazy/calendar_provider.dart b/uni/lib/model/providers/lazy/calendar_provider.dart
@@ -7,7 +7,6 @@ import 'package:uni/model/entities/calendar_event.dart';
 import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 
 class CalendarProvider extends StateProviderNotifier {
   CalendarProvider()
@@ -23,16 +22,9 @@ class CalendarProvider extends StateProviderNotifier {
   }
 
   Future<void> fetchCalendar(Session session) async {
-    try {
-      _calendar = await CalendarFetcherHtml().getCalendar(session);
-
-      final db = CalendarDatabase();
-      unawaited(db.saveCalendar(calendar));
-
-      updateStatus(RequestStatus.successful);
-    } catch (e) {
-      updateStatus(RequestStatus.failed);
-    }
+    _calendar = await CalendarFetcherHtml().getCalendar(session);
+    final db = CalendarDatabase();
+    unawaited(db.saveCalendar(calendar));
   }
 
   @override

diff --git a/uni/lib/model/providers/lazy/course_units_info_provider.dart b/uni/lib/model/providers/lazy/course_units_info_provider.dart
@@ -1,14 +1,12 @@
 import 'dart:collection';
 
-import 'package:logger/logger.dart';
 import 'package:uni/controller/fetchers/course_units_fetcher/course_units_info_fetcher.dart';
 import 'package:uni/model/entities/course_units/course_unit.dart';
 import 'package:uni/model/entities/course_units/course_unit_class.dart';
 import 'package:uni/model/entities/course_units/course_unit_sheet.dart';
 import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 
 class CourseUnitsInfoProvider extends StateProviderNotifier {
   CourseUnitsInfoProvider()
@@ -26,33 +24,16 @@ class CourseUnitsInfoProvider extends StateProviderNotifier {
     CourseUnit courseUnit,
     Session session,
   ) async {
-    updateStatus(RequestStatus.busy);
-    try {
-      _courseUnitsSheets[courseUnit] = await CourseUnitsInfoFetcher()
-          .fetchCourseUnitSheet(session, courseUnit.occurrId);
-    } catch (e) {
-      updateStatus(RequestStatus.failed);
-      Logger().e('Failed to get course unit sheet for ${courseUnit.name}: $e');
-      return;
-    }
-    updateStatus(RequestStatus.successful);
+    _courseUnitsSheets[courseUnit] = await CourseUnitsInfoFetcher()
+        .fetchCourseUnitSheet(session, courseUnit.occurrId);
   }
 
   Future<void> fetchCourseUnitClasses(
     CourseUnit courseUnit,
     Session session,
   ) async {
-    updateStatus(RequestStatus.busy);
-    try {
-      _courseUnitsClasses[courseUnit] = await CourseUnitsInfoFetcher()
-          .fetchCourseUnitClasses(session, courseUnit.occurrId);
-    } catch (e) {
-      updateStatus(RequestStatus.failed);
-      Logger()
-          .e('Failed to get course unit classes for ${courseUnit.name}: $e');
-      return;
-    }
-    updateStatus(RequestStatus.successful);
+    _courseUnitsClasses[courseUnit] = await CourseUnitsInfoFetcher()
+        .fetchCourseUnitClasses(session, courseUnit.occurrId);
   }
 
   @override

diff --git a/uni/lib/model/providers/lazy/exam_provider.dart b/uni/lib/model/providers/lazy/exam_provider.dart
@@ -10,7 +10,6 @@ import 'package:uni/model/entities/exam.dart';
 import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 
 class ExamProvider extends StateProviderNotifier {
   ExamProvider()
@@ -56,21 +55,16 @@ class ExamProvider extends StateProviderNotifier {
     List<CourseUnit> userUcs, {
     required bool persistentSession,
   }) async {
-    try {
-      final exams = await ExamFetcher(profile.courses, userUcs)
-          .extractExams(session, parserExams);
+    final exams = await ExamFetcher(profile.courses, userUcs)
+        .extractExams(session, parserExams);
 
-      exams.sort((exam1, exam2) => exam1.begin.compareTo(exam2.begin));
+    exams.sort((exam1, exam2) => exam1.begin.compareTo(exam2.begin));
 
-      if (persistentSession) {
-        await AppExamsDatabase().saveNewExams(exams);
-      }
-
-      _exams = exams;
-      updateStatus(RequestStatus.successful);
-    } catch (e) {
-      updateStatus(RequestStatus.failed);
+    if (persistentSession) {
+      await AppExamsDatabase().saveNewExams(exams);
     }
+
+    _exams = exams;
   }
 
   Future<void> updateFilteredExams() async {

diff --git a/uni/lib/model/providers/lazy/faculty_locations_provider.dart b/uni/lib/model/providers/lazy/faculty_locations_provider.dart
@@ -5,7 +5,6 @@ import 'package:uni/model/entities/location_group.dart';
 import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 
 class FacultyLocationsProvider extends StateProviderNotifier {
   FacultyLocationsProvider()
@@ -17,13 +16,9 @@ class FacultyLocationsProvider extends StateProviderNotifier {
 
   @override
   Future<void> loadFromStorage() async {
-    updateStatus(RequestStatus.busy);
     _locations = await LocationFetcherAsset().getLocations();
-    updateStatus(RequestStatus.successful);
   }
 
   @override
-  Future<void> loadFromRemote(Session session, Profile profile) async {
-    updateStatus(RequestStatus.successful);
-  }
+  Future<void> loadFromRemote(Session session, Profile profile) async {}
 }
diff --git a/uni/lib/model/providers/lazy/home_page_provider.dart b/uni/lib/model/providers/lazy/home_page_provider.dart
@@ -2,7 +2,6 @@ import 'package:uni/controller/local_storage/app_shared_preferences.dart';
 import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 import 'package:uni/utils/favorite_widget_type.dart';
 
 class HomePageProvider extends StateProviderNotifier {
@@ -20,9 +19,7 @@ class HomePageProvider extends StateProviderNotifier {
   }
 
   @override
-  Future<void> loadFromRemote(Session session, Profile profile) async {
-    updateStatus(RequestStatus.successful);
-  }
+  Future<void> loadFromRemote(Session session, Profile profile) async {}
 
   void setHomePageEditingMode({required bool editingMode}) {
     _isEditing = editingMode;

diff --git a/uni/lib/model/providers/lazy/lecture_provider.dart b/uni/lib/model/providers/lazy/lecture_provider.dart
@@ -10,7 +10,6 @@ import 'package:uni/model/entities/lecture.dart';
 import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 
 class LectureProvider extends StateProviderNotifier {
   LectureProvider()
@@ -42,20 +41,15 @@ class LectureProvider extends StateProviderNotifier {
     required bool persistentSession,
     ScheduleFetcher? fetcher,
   }) async {
-    try {
-      final lectures =
-          await getLecturesFromFetcherOrElse(fetcher, session, profile);
+    final lectures =
+        await getLecturesFromFetcherOrElse(fetcher, session, profile);
 
-      if (persistentSession) {
-        final db = AppLecturesDatabase();
-        await db.saveNewLectures(lectures);
-      }
-
-      _lectures = lectures;
-      updateStatus(RequestStatus.successful);
-    } catch (e) {
-      updateStatus(RequestStatus.failed);
+    if (persistentSession) {
+      final db = AppLecturesDatabase();
+      await db.saveNewLectures(lectures);
     }
+
+    _lectures = lectures;
   }
 
   Future<List<Lecture>> getLecturesFromFetcherOrElse(

diff --git a/uni/lib/model/providers/lazy/library_occupation_provider.dart b/uni/lib/model/providers/lazy/library_occupation_provider.dart
@@ -6,7 +6,6 @@ import 'package:uni/model/entities/library_occupation.dart';
 import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 
 class LibraryOccupationProvider extends StateProviderNotifier {
   LibraryOccupationProvider()
@@ -28,16 +27,10 @@ class LibraryOccupationProvider extends StateProviderNotifier {
   }
 
   Future<void> fetchLibraryOccupation(Session session) async {
-    try {
-      _occupation = await LibraryOccupationFetcherSheets()
-          .getLibraryOccupationFromSheets(session);
+    _occupation = await LibraryOccupationFetcherSheets()
+        .getLibraryOccupationFromSheets(session);
 
-      final db = LibraryOccupationDatabase();
-      unawaited(db.saveOccupation(_occupation!));
-
-      updateStatus(RequestStatus.successful);
-    } catch (e) {
-      updateStatus(RequestStatus.failed);
-    }
+    final db = LibraryOccupationDatabase();
+    unawaited(db.saveOccupation(_occupation!));
   }
 }
diff --git a/uni/lib/model/providers/lazy/reference_provider.dart b/uni/lib/model/providers/lazy/reference_provider.dart
@@ -8,7 +8,6 @@ import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/reference.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 
 class ReferenceProvider extends StateProviderNotifier {
   ReferenceProvider()
@@ -31,18 +30,11 @@ class ReferenceProvider extends StateProviderNotifier {
   }
 
   Future<void> fetchUserReferences(Session session) async {
-    try {
-      final response =
-          await ReferenceFetcher().getUserReferenceResponse(session);
+    final response = await ReferenceFetcher().getUserReferenceResponse(session);
 
-      _references = await parseReferences(response);
+    _references = await parseReferences(response);
 
-      updateStatus(RequestStatus.successful);
-
-      final referencesDb = AppReferencesDatabase();
-      unawaited(referencesDb.saveNewReferences(references));
-    } catch (e) {
-      updateStatus(RequestStatus.failed);
-    }
+    final referencesDb = AppReferencesDatabase();
+    unawaited(referencesDb.saveNewReferences(references));
   }
 }
diff --git a/uni/lib/model/providers/lazy/restaurant_provider.dart b/uni/lib/model/providers/lazy/restaurant_provider.dart
@@ -8,7 +8,6 @@ import 'package:uni/model/entities/profile.dart';
 import 'package:uni/model/entities/restaurant.dart';
 import 'package:uni/model/entities/session.dart';
 import 'package:uni/model/providers/state_provider_notifier.dart';
-import 'package:uni/model/request_status.dart';
 
 class RestaurantProvider extends StateProviderNotifier {
   RestaurantProvider()
@@ -37,18 +36,12 @@ class RestaurantProvider extends StateProviderNotifier {
   }
 
   Future<void> fetchRestaurants(Session session) async {
-    try {
-      final restaurants = await RestaurantFetcher().getRestaurants(session);
+    final restaurants = await RestaurantFetcher().getRestaurants(session);
 
-      final db = RestaurantDatabase();
-      unawaited(db.saveRestaurants(restaurants));
+    final db = RestaurantDatabase();
+    unawaited(db.saveRestaurants(restaurants));
 
-      _restaurants = filterPastMeals(restaurants);
-
-      updateStatus(RequestStatus.successful);
-    } catch (e) {
-      updateStatus(RequestStatus.failed);
-    }
+    _restaurants = filterPastMeals(restaurants);
   }
 
   Future<void> toggleFavoriteRestaurant(