Merge pull request #392 from Oloodi/386-refactor-streamline-applicationstatus-enum-in-data-connect-and-ui

386 refactor streamline applicationstatus enum in data connect and UI

apps/mobile/packages/domain/lib/src/adapters/financial/time_card_adapter.dart

@@ -41,7 +41,6 @@ class TimeCardAdapter {
       case 'DISPUTED':
         return TimeCardStatus.disputed;
       case 'CHECKED_IN':
-      case 'ACCEPTED':
       case 'CONFIRMED':
       default:
         return TimeCardStatus.pending;

apps/mobile/packages/features/client/client_coverage/lib/src/data/repositories_impl/coverage_repository_impl.dart

@@ -177,8 +177,6 @@ class CoverageRepositoryImpl implements CoverageRepository {
       switch (status.value) {
         case dc.ApplicationStatus.PENDING:
           return CoverageWorkerStatus.pending;
-        case dc.ApplicationStatus.ACCEPTED:
-          return CoverageWorkerStatus.confirmed;
         case dc.ApplicationStatus.REJECTED:
           return CoverageWorkerStatus.rejected;
         case dc.ApplicationStatus.CONFIRMED:

apps/mobile/packages/features/staff/home/lib/src/data/repositories/home_repository_impl.dart

@@ -46,10 +46,8 @@ class HomeRepositoryImpl
         .dayEnd(_toTimestamp(end))
         .execute());
 
-    // Filter for ACCEPTED applications (same logic as shifts_repository_impl)
+    // Filter for CONFIRMED applications (same logic as shifts_repository_impl)
     final apps = response.data.applications.where((app) =>
-        (app.status is Known &&
-            (app.status as Known).value == ApplicationStatus.ACCEPTED) ||
         (app.status is Known &&
             (app.status as Known).value == ApplicationStatus.CONFIRMED));
 
@@ -145,4 +143,3 @@ class HomeRepositoryImpl
     );
   }
 }
-

apps/mobile/packages/features/staff/shifts/lib/src/data/repositories_impl/shifts_repository_impl.dart

@@ -176,7 +176,7 @@ class ShiftsRepositoryImpl
       final DateTime? endDt = _toDateTime(app.shiftRole.endTime);
       final DateTime? createdDt = _toDateTime(app.createdAt);
 
-      // Override status to reflect the application state (e.g., CHECKED_OUT, ACCEPTED)
+      // Override status to reflect the application state (e.g., CHECKED_OUT, CONFIRMED)
       final bool hasCheckIn = app.checkInTime != null;
       final bool hasCheckOut = app.checkOutTime != null;
       dc.ApplicationStatus? appStatus;
@@ -187,7 +187,7 @@ class ShiftsRepositoryImpl
           ? 'completed'
           : hasCheckIn
               ? 'checked_in'
-              : _mapStatus(appStatus ?? dc.ApplicationStatus.ACCEPTED);
+              : _mapStatus(appStatus ?? dc.ApplicationStatus.CONFIRMED);
       shifts.add(
         Shift(
           id: app.shift.id,
@@ -223,7 +223,6 @@ class ShiftsRepositoryImpl
 
   String _mapStatus(dc.ApplicationStatus status) {
     switch (status) {
-      case dc.ApplicationStatus.ACCEPTED:
       case dc.ApplicationStatus.CONFIRMED:
         return 'confirmed';
       case dc.ApplicationStatus.PENDING:
@@ -477,7 +476,7 @@ class ShiftsRepositoryImpl
             shiftId: shiftId,
             staffId: staffId,
             roleId: targetRoleId,
-            status: dc.ApplicationStatus.ACCEPTED,
+            status: dc.ApplicationStatus.CONFIRMED,
             origin: dc.ApplicationOrigin.STAFF,
           )
           // TODO: this should be PENDING so a vendor can accept it.
@@ -518,7 +517,7 @@ class ShiftsRepositoryImpl
 
   @override
   Future<void> acceptShift(String shiftId) async {
-    await _updateApplicationStatus(shiftId, dc.ApplicationStatus.ACCEPTED);
+    await _updateApplicationStatus(shiftId, dc.ApplicationStatus.CONFIRMED);
   }
 
   @override

backend/dataconnect/connector/application/queries.gql

@@ -275,7 +275,7 @@ query getApplicationsByStaffId(
   applications(
     where: { 
       staffId: { eq: $staffId } 
-      status: { in: [ACCEPTED, CONFIRMED, CHECKED_IN, CHECKED_OUT, LATE] }
+      status: { in: [ CONFIRMED, CHECKED_IN, CHECKED_OUT, LATE] }
       shift: {
         date: { ge: $dayStart, le: $dayEnd }
       }
@@ -516,7 +516,7 @@ query getApplicationByStaffShiftAndRole(
 }
 
 
-#getting staffs of an shiftrole ACCEPTED for orders view client
+#getting staffs of an shiftrole CONFIRMED for orders view client
 query listAcceptedApplicationsByShiftRoleKey(
   $shiftId: UUID!
   $roleId: UUID!
@@ -527,7 +527,7 @@ query listAcceptedApplicationsByShiftRoleKey(
     where: {
       shiftId: { eq: $shiftId }
       roleId: { eq: $roleId }
-      status: { eq: ACCEPTED }
+      status: { eq: CONFIRMED }
     }
     offset: $offset
     limit: $limit
@@ -540,7 +540,7 @@ query listAcceptedApplicationsByShiftRoleKey(
   }
 }
 
-#getting staffs of an shiftrole ACCEPTED for orders of the day view client 
+#getting staffs of an shiftrole status for orders of the day view client 
 query listAcceptedApplicationsByBusinessForDay(
   $businessId: UUID!
   $dayStart: Timestamp!
@@ -550,8 +550,7 @@ query listAcceptedApplicationsByBusinessForDay(
 ) @auth(level: USER) {
   applications(
     where: {
-      #status: { eq: ACCEPTED }
+      status: { in: [ CONFIRMED, CHECKED_IN, CHECKED_OUT, LATE] }
-      status: { in: [ACCEPTED, CONFIRMED, CHECKED_IN, CHECKED_OUT, LATE] }
       shift: {
         date: { ge: $dayStart, le: $dayEnd }
         order: { businessId: { eq: $businessId } }
@@ -581,11 +580,10 @@ query listStaffsApplicationsByBusinessForDay(
 ) @auth(level: USER) {
   applications(
     where: {
-      status: {in: [ACCEPTED, CONFIRMED, CHECKED_IN, CHECKED_OUT, LATE]}
+      status: {in: [ CONFIRMED, CHECKED_IN, CHECKED_OUT, LATE]}
       shift: {
         date: { ge: $dayStart, le: $dayEnd }
         order: { businessId: { eq: $businessId } }
-        #status: { eq: ACCEPTED }
       }
     }
     offset: $offset

backend/dataconnect/schema/application.gql

@@ -1,6 +1,5 @@
 enum ApplicationStatus {
   PENDING
-  ACCEPTED
   REJECTED
   CONFIRMED
   CHECKED_IN