Merge branch 'dev' into 408-feature-implement-paidunpaid-breaks---client-app-frontend-development

backend/dataconnect/connector/application/queries.gql

@@ -543,6 +543,36 @@ query listAcceptedApplicationsByShiftRoleKey(
   }
 }
 
+query listOverlappingAcceptedApplicationsByStaff(
+  $staffId: UUID!
+  $newStart: Timestamp!
+  $newEnd: Timestamp!
+  $offset: Int
+  $limit: Int
+) @auth(level: USER) {
+  applications(
+    where: {
+      staffId: { eq: $staffId }
+      status: { in: [ CONFIRMED, CHECKED_IN, CHECKED_OUT, LATE ] }
+      shiftRole: {
+        startTime: { lt: $newEnd }
+        endTime: { gt: $newStart }
+      }
+    }
+    offset: $offset
+    limit: $limit
+    orderBy: { appliedAt: ASC }
+  ) {
+    id
+    shiftId
+    roleId
+    checkInTime
+    checkOutTime
+    staff { id fullName email phone photoUrl }
+    shiftRole { startTime endTime }
+  }
+}
+
 #getting staffs of an shiftrole status for orders of the day view client 
 query listAcceptedApplicationsByBusinessForDay(
   $businessId: UUID!

backend/dataconnect/connector/order/mutations.gql

@@ -15,9 +15,9 @@ mutation createOrder(
   $shifts: Any
   $requested: Int
   $teamHubId: UUID!
-  $recurringDays: Any
+  $recurringDays: [String!]
   $permanentStartDate: Timestamp
-  $permanentDays: Any
+  $permanentDays: [String!]
   $notes: String
   $detectedConflicts: Any
   $poReference: String
@@ -64,8 +64,8 @@ mutation updateOrder(
   $shifts: Any
   $requested: Int
   $teamHubId: UUID!
-  $recurringDays: Any
-  $permanentDays: Any
+  $recurringDays: [String!]
+  $permanentDays: [String!]
   $notes: String
   $detectedConflicts: Any
   $poReference: String

backend/dataconnect/connector/shiftRole/queries.gql

@@ -354,7 +354,7 @@ query listShiftRolesByBusinessAndDateRange(
       locationAddress
       title
       status
-      order { id eventName }
+      order { id eventName orderType }
     }
   }
 }

backend/dataconnect/schema/order.gql

@@ -52,10 +52,10 @@ type Order @table(name: "orders", key: ["id"]) {
   startDate: Timestamp #for recurring and permanent
   endDate: Timestamp #for recurring and permanent
 
-  recurringDays: Any @col(dataType: "jsonb")
+  recurringDays: [String!]
   poReference: String
 
-  permanentDays: Any @col(dataType: "jsonb")
+  permanentDays: [String!]
 
   detectedConflicts: Any @col(dataType:"jsonb")
   notes: String