feat: Centralized Error Handling & Crash Fixes

2026-02-11 18:52:23 +05:30
parent ea06510474
commit c1112ac01c
51 changed files with 2104 additions and 960 deletions
--- a/apps/mobile/packages/features/client/home/lib/src/data/repositories_impl/home_repository_impl.dart
+++ b/apps/mobile/packages/features/client/home/lib/src/data/repositories_impl/home_repository_impl.dart
@@ -15,92 +15,103 @@ class HomeRepositoryImpl implements HomeRepositoryInterface {

  @override
  Future<HomeDashboardData> getDashboardData() async {
-    final String? businessId = dc.ClientSessionStore.instance.session?.business?.id;
-    if (businessId == null || businessId.isEmpty) {
-      return const HomeDashboardData(
-        weeklySpending: 0,
-        next7DaysSpending: 0,
-        weeklyShifts: 0,
-        next7DaysScheduled: 0,
-        totalNeeded: 0,
-        totalFilled: 0,
+    try {
+      final String? businessId = dc.ClientSessionStore.instance.session?.business?.id;
+      if (businessId == null || businessId.isEmpty) {
+        return const HomeDashboardData(
+          weeklySpending: 0,
+          next7DaysSpending: 0,
+          weeklyShifts: 0,
+          next7DaysScheduled: 0,
+          totalNeeded: 0,
+          totalFilled: 0,
+        );
+      }
+
+      final DateTime now = DateTime.now();
+      final int daysFromMonday = now.weekday - DateTime.monday;
+      final DateTime monday =
+          DateTime(now.year, now.month, now.day).subtract(Duration(days: daysFromMonday));
+      final DateTime weekRangeStart = DateTime(monday.year, monday.month, monday.day);
+      final DateTime weekRangeEnd =
+          DateTime(monday.year, monday.month, monday.day + 13, 23, 59, 59, 999);
+      final fdc.QueryResult<
+          dc.GetCompletedShiftsByBusinessIdData,
+          dc.GetCompletedShiftsByBusinessIdVariables> completedResult =
+          await _dataConnect
+              .getCompletedShiftsByBusinessId(
+                businessId: businessId,
+                dateFrom: _toTimestamp(weekRangeStart),
+                dateTo: _toTimestamp(weekRangeEnd),
+              )
+              .execute();
+
+      double weeklySpending = 0.0;
+      double next7DaysSpending = 0.0;
+      int weeklyShifts = 0;
+      int next7DaysScheduled = 0;
+      for (final dc.GetCompletedShiftsByBusinessIdShifts shift
+          in completedResult.data.shifts) {
+        final DateTime? shiftDate = shift.date?.toDateTime();
+        if (shiftDate == null) {
+          continue;
+        }
+        final int offset = shiftDate.difference(weekRangeStart).inDays;
+        if (offset < 0 || offset > 13) {
+          continue;
+        }
+        final double cost = shift.cost ?? 0.0;
+        if (offset <= 6) {
+          weeklySpending += cost;
+          weeklyShifts += 1;
+        } else {
+          next7DaysSpending += cost;
+          next7DaysScheduled += 1;
+        }
+      }
+
+      final DateTime start = DateTime(now.year, now.month, now.day);
+      final DateTime end = DateTime(now.year, now.month, now.day, 23, 59, 59, 999);
+
+      final fdc.QueryResult<
+          dc.ListShiftRolesByBusinessAndDateRangeData,
+          dc.ListShiftRolesByBusinessAndDateRangeVariables> result =
+          await _dataConnect
+              .listShiftRolesByBusinessAndDateRange(
+                businessId: businessId,
+                start: _toTimestamp(start),
+                end: _toTimestamp(end),
+              )
+              .execute();
+
+      int totalNeeded = 0;
+      int totalFilled = 0;
+      for (final dc.ListShiftRolesByBusinessAndDateRangeShiftRoles shiftRole
+          in result.data.shiftRoles) {
+        totalNeeded += shiftRole.count;
+        totalFilled += shiftRole.assigned ?? 0;
+      }
+
+      return HomeDashboardData(
+        weeklySpending: weeklySpending,
+        next7DaysSpending: next7DaysSpending,
+        weeklyShifts: weeklyShifts,
+        next7DaysScheduled: next7DaysScheduled,
+        totalNeeded: totalNeeded,
+        totalFilled: totalFilled,
      );
-    }
-
-    final DateTime now = DateTime.now();
-    final int daysFromMonday = now.weekday - DateTime.monday;
-    final DateTime monday =
-        DateTime(now.year, now.month, now.day).subtract(Duration(days: daysFromMonday));
-    final DateTime weekRangeStart = DateTime(monday.year, monday.month, monday.day);
-    final DateTime weekRangeEnd =
-        DateTime(monday.year, monday.month, monday.day + 13, 23, 59, 59, 999);
-    final fdc.QueryResult<
-        dc.GetCompletedShiftsByBusinessIdData,
-        dc.GetCompletedShiftsByBusinessIdVariables> completedResult =
-        await _dataConnect
-            .getCompletedShiftsByBusinessId(
-              businessId: businessId,
-              dateFrom: _toTimestamp(weekRangeStart),
-              dateTo: _toTimestamp(weekRangeEnd),
-            )
-            .execute();
-
-
-    double weeklySpending = 0.0;
-    double next7DaysSpending = 0.0;
-    int weeklyShifts = 0;
-    int next7DaysScheduled = 0;
-    for (final dc.GetCompletedShiftsByBusinessIdShifts shift
-        in completedResult.data.shifts) {
-      final DateTime? shiftDate = shift.date?.toDateTime();
-      if (shiftDate == null) {
-        continue;
-      }
-      final int offset = shiftDate.difference(weekRangeStart).inDays;
-      if (offset < 0 || offset > 13) {
-        continue;
-      }
-      final double cost = shift.cost ?? 0.0;
-      if (offset <= 6) {
-        weeklySpending += cost;
-        weeklyShifts += 1;
-      } else {
-        next7DaysSpending += cost;
-        next7DaysScheduled += 1;
+    } catch (e) {
+      final String error = e.toString().toLowerCase();
+      if (error.contains('network') ||
+          error.contains('connection') ||
+          error.contains('unavailable') ||
+          error.contains('offline') ||
+          error.contains('socket') ||
+          error.contains('failed host lookup')) {
+        throw NetworkException(technicalMessage: 'Home dashboard fetch failed: $e');
      }
+      throw ServerException(technicalMessage: 'Home dashboard fetch failed: $e');
    }
-
-    final DateTime start = DateTime(now.year, now.month, now.day);
-    final DateTime end = DateTime(now.year, now.month, now.day, 23, 59, 59, 999);
-
-    final fdc.QueryResult<
-        dc.ListShiftRolesByBusinessAndDateRangeData,
-        dc.ListShiftRolesByBusinessAndDateRangeVariables> result =
-        await _dataConnect
-            .listShiftRolesByBusinessAndDateRange(
-              businessId: businessId,
-              start: _toTimestamp(start),
-              end: _toTimestamp(end),
-            )
-            .execute();
-
-
-    int totalNeeded = 0;
-    int totalFilled = 0;
-    for (final dc.ListShiftRolesByBusinessAndDateRangeShiftRoles shiftRole
-        in result.data.shiftRoles) {
-      totalNeeded += shiftRole.count;
-      totalFilled += shiftRole.assigned ?? 0;
-    }
-
-    return HomeDashboardData(
-      weeklySpending: weeklySpending,
-      next7DaysSpending: next7DaysSpending,
-      weeklyShifts: weeklyShifts,
-      next7DaysScheduled: next7DaysScheduled,
-      totalNeeded: totalNeeded,
-      totalFilled: totalFilled,
-    );
  }

  @override
@@ -114,46 +125,57 @@ class HomeRepositoryImpl implements HomeRepositoryInterface {

  @override
  Future<List<ReorderItem>> getRecentReorders() async {
-    final String? businessId = dc.ClientSessionStore.instance.session?.business?.id;
-    if (businessId == null || businessId.isEmpty) {
-      return const <ReorderItem>[];
+    try {
+      final String? businessId = dc.ClientSessionStore.instance.session?.business?.id;
+      if (businessId == null || businessId.isEmpty) {
+        return const <ReorderItem>[];
+      }
+
+      final DateTime now = DateTime.now();
+      final DateTime start = now.subtract(const Duration(days: 30));
+      final fdc.Timestamp startTimestamp = _toTimestamp(start);
+      final fdc.Timestamp endTimestamp = _toTimestamp(now);
+
+      final fdc.QueryResult<
+          dc.ListShiftRolesByBusinessDateRangeCompletedOrdersData,
+          dc.ListShiftRolesByBusinessDateRangeCompletedOrdersVariables> result =
+          await _dataConnect.listShiftRolesByBusinessDateRangeCompletedOrders(
+            businessId: businessId,
+            start: startTimestamp,
+            end: endTimestamp,
+          ).execute();
+
+      return result.data.shiftRoles.map((
+        dc.ListShiftRolesByBusinessDateRangeCompletedOrdersShiftRoles shiftRole,
+      ) {
+
+        final String location =
+            shiftRole.shift.location ??
+            shiftRole.shift.locationAddress ??
+            '';
+        final String type = shiftRole.shift.order.orderType.stringValue;
+        return ReorderItem(
+          orderId: shiftRole.shift.order.id,
+          title: '${shiftRole.role.name} - ${shiftRole.shift.title}',
+          location: location,
+          hourlyRate: shiftRole.role.costPerHour,
+          hours: shiftRole.hours ?? 0,
+          workers: shiftRole.count,
+          type: type,
+        );
+      }).toList();
+    } catch (e) {
+      final String error = e.toString().toLowerCase();
+      if (error.contains('network') ||
+          error.contains('connection') ||
+          error.contains('unavailable') ||
+          error.contains('offline') ||
+          error.contains('socket') ||
+          error.contains('failed host lookup')) {
+        throw NetworkException(technicalMessage: 'Home reorders fetch failed: $e');
+      }
+      throw ServerException(technicalMessage: 'Home reorders fetch failed: $e');
    }
-
-    final DateTime now = DateTime.now();
-    final DateTime start = now.subtract(const Duration(days: 30));
-    final fdc.Timestamp startTimestamp = _toTimestamp(start);
-    final fdc.Timestamp endTimestamp = _toTimestamp(now);
-
-    final fdc.QueryResult<
-        dc.ListShiftRolesByBusinessDateRangeCompletedOrdersData,
-        dc.ListShiftRolesByBusinessDateRangeCompletedOrdersVariables> result =
-        await _dataConnect.listShiftRolesByBusinessDateRangeCompletedOrders(
-          businessId: businessId,
-          start: startTimestamp,
-          end: endTimestamp,
-        ).execute();
-
-
-
-    return result.data.shiftRoles.map((
-      dc.ListShiftRolesByBusinessDateRangeCompletedOrdersShiftRoles shiftRole,
-    ) {
-
-      final String location =
-          shiftRole.shift.location ??
-          shiftRole.shift.locationAddress ??
-          '';
-      final String type = shiftRole.shift.order.orderType.stringValue;
-      return ReorderItem(
-        orderId: shiftRole.shift.order.id,
-        title: '${shiftRole.role.name} - ${shiftRole.shift.title}',
-        location: location,
-        hourlyRate: shiftRole.role.costPerHour,
-        hours: shiftRole.hours ?? 0,
-        workers: shiftRole.count,
-        type: type,
-      );
-    }).toList();
  }

  fdc.Timestamp _toTimestamp(DateTime date) {
--- a/apps/mobile/packages/features/client/home/lib/src/presentation/blocs/client_home_bloc.dart
+++ b/apps/mobile/packages/features/client/home/lib/src/presentation/blocs/client_home_bloc.dart
@@ -10,7 +10,7 @@ import 'client_home_state.dart';

 /// BLoC responsible for managing the state and business logic of the client home dashboard.
 class ClientHomeBloc extends Bloc<ClientHomeEvent, ClientHomeState>
-    with BlocErrorHandler<ClientHomeState> {
+    with BlocErrorHandler<ClientHomeState>, SafeBloc<ClientHomeEvent, ClientHomeState> {
  ClientHomeBloc({
    required GetDashboardDataUseCase getDashboardDataUseCase,
    required GetRecentReordersUseCase getRecentReordersUseCase,
--- a/apps/mobile/packages/features/client/home/lib/src/presentation/pages/client_home_page.dart
+++ b/apps/mobile/packages/features/client/home/lib/src/presentation/pages/client_home_page.dart
@@ -32,8 +32,21 @@ class ClientHomePage extends StatelessWidget {
              ClientHomeHeader(i18n: i18n),
              ClientHomeEditBanner(i18n: i18n),
              Flexible(
-                child: BlocBuilder<ClientHomeBloc, ClientHomeState>(
+                child: BlocConsumer<ClientHomeBloc, ClientHomeState>(
+                  listener: (BuildContext context, ClientHomeState state) {
+                    if (state.status == ClientHomeStatus.error &&
+                        state.errorMessage != null) {
+                      UiSnackbar.show(
+                        context,
+                        message: translateErrorKey(state.errorMessage!),
+                        type: UiSnackbarType.error,
+                      );
+                    }
+                  },
                  builder: (BuildContext context, ClientHomeState state) {
+                    if (state.status == ClientHomeStatus.error) {
+                      return _buildErrorState(context, state);
+                    }
                    if (state.isEditMode) {
                      return _buildEditModeList(context, state);
                    }
@@ -108,4 +121,33 @@ class ClientHomePage extends StatelessWidget {
      },
    );
  }
+
+  Widget _buildErrorState(BuildContext context, ClientHomeState state) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: <Widget>[
+          const Icon(
+            UiIcons.error,
+            size: 48,
+            color: UiColors.error,
+          ),
+          const SizedBox(height: UiConstants.space4),
+          Text(
+            state.errorMessage != null
+                ? translateErrorKey(state.errorMessage!)
+                : 'An error occurred',
+            style: UiTypography.body1m.textError,
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: UiConstants.space4),
+          UiButton.secondary(
+            text: 'Retry',
+            onPressed: () =>
+                BlocProvider.of<ClientHomeBloc>(context).add(ClientHomeStarted()),
+          ),
+        ],
+      ),
+    );
+  }
 }