Merge pull request #444 from Oloodi/staff_recurring_permanent_order

Staff recurring permanent order

backend/dataconnect/connector/application/queries.gql

@@ -356,6 +356,95 @@ query getApplicationsByStaffId(
   }
 }
 
+query getMyApplicationsByStaffId(
+  $staffId: UUID!
+  $offset: Int
+  $limit: Int
+  $dayStart: Timestamp
+  $dayEnd: Timestamp
+) @auth(level: USER) {
+  applications(
+    where: { 
+      staffId: { eq: $staffId } 
+      status: { in: [ CONFIRMED, CHECKED_IN, CHECKED_OUT, LATE, PENDING] }
+      shift: {
+        date: { ge: $dayStart, le: $dayEnd }
+      }
+    
+    }
+    offset: $offset
+    limit: $limit
+  ) {
+    id
+    shiftId
+    staffId
+    status
+    appliedAt
+    checkInTime
+    checkOutTime
+    origin
+    createdAt
+
+    shift {
+      id
+      title
+      date
+      startTime
+      endTime
+      location
+      status
+      durationDays
+      description
+      latitude
+      longitude
+
+      order {
+        id
+        eventName
+        #location
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
+        business {
+          id
+          businessName
+          email
+          contactName
+          companyLogoUrl
+        }
+        vendor {
+          id
+          companyName
+        }
+      }
+
+    }
+
+    shiftRole {
+      id
+      roleId
+      count
+      assigned
+      startTime
+      endTime
+      hours
+      breakType
+      isBreakPaid
+      totalValue
+      role {
+        id
+        name
+        costPerHour
+      }
+    }
+
+  }
+}
+
 query vaidateDayStaffApplication(
   $staffId: UUID!
   $offset: Int
@@ -695,10 +784,14 @@ query listCompletedApplicationsByStaffId(
       durationDays
       latitude
       longitude
+      orderId
 
       order {
         id
         eventName
+        orderType
+        startDate
+        endDate
 
         teamHub {
           address

backend/dataconnect/connector/shiftRole/queries.gql

@@ -254,7 +254,7 @@ query listShiftRolesByVendorId(
   shiftRoles(
     where: {
       shift: {
-        status: {in: [IN_PROGRESS, CONFIRMED, ASSIGNED, OPEN, PENDING]} #IN_PROGRESS? PENDING?
+        status: {in: [IN_PROGRESS, ASSIGNED, OPEN]} #IN_PROGRESS? 
         order: {
           vendorId: { eq: $vendorId }
         }
@@ -511,7 +511,7 @@ query getCompletedShiftsByBusinessId(
   shifts(
     where: {
       order: { businessId: { eq: $businessId } }
-      status: {in: [IN_PROGRESS, CONFIRMED, COMPLETED, OPEN]}
+      status: {in: [IN_PROGRESS, COMPLETED, OPEN]}
       date: { ge: $dateFrom, le: $dateTo }
     }
     offset: $offset

backend/dataconnect/functions/seed.gql

@@ -927,7 +927,7 @@ mutation seedAll @transaction {
       placeId: "Eiw0MDAwIFNhbiBKb3NlIFN0cmVldCwgR3JhbmFkYSBIaWxscywgQ0EsIFVTQSIuKiwKFAoSCYNJZBTdmsKAEddGOfBj8LvTEhQKEglnNXI0zZrCgBEjR6om62lcVw"
       latitude: 34.2611486
       longitude: -118.5010287
-      status: ASSIGNED
+      status: OPEN
       workersNeeded: 2
       filled: 1
     }
@@ -950,7 +950,7 @@ mutation seedAll @transaction {
       placeId: "Eiw2ODAwIFNhbiBKb3NlIFN0cmVldCwgR3JhbmFkYSBIaWxscywgQ0EsIFVTQSIuKiwKFAoSCYNJZBTdmsKAEddGOfBj8LvTEhQKEglnNXI0zZrCgBEjR6om62lcVw"
       latitude: 34.2611486
       longitude: -118.5010287
-      status: ASSIGNED
+      status: OPEN
       workersNeeded: 2
       filled: 1
     }
@@ -996,7 +996,7 @@ mutation seedAll @transaction {
       placeId: "Eiw0MDAwIFNhbiBKb3NlIFN0cmVldCwgR3JhbmFkYSBIaWxscywgQ0EsIFVTQSIuKiwKFAoSCYNJZBTdmsKAEddGOfBj8LvTEhQKEglnNXI0zZrCgBEjR6om62lcVw"
       latitude: 34.2611486
       longitude: -118.5010287
-      status: ASSIGNED
+      status: OPEN
       workersNeeded: 2
       filled: 1
     }
@@ -1042,7 +1042,7 @@ mutation seedAll @transaction {
       placeId: "Eiw1MDAwIFNhbiBKb3NlIFN0cmVldCwgR3JhbmFkYSBIaWxscywgQ0EsIFVTQSIuKiwKFAoSCYNJZBTdmsKAEddGOfBj8LvTEhQKEglnNXI0zZrCgBEjR6om62lcVw"
       latitude: 34.2611486
       longitude: -118.5010287
-      status: ASSIGNED
+      status: OPEN
       workersNeeded: 2
       filled: 1
     }

backend/dataconnect/schema/shift.gql

@@ -1,9 +1,7 @@
 enum ShiftStatus {
   DRAFT
   FILLED
-  PENDING
   ASSIGNED
-  CONFIRMED
   OPEN
   IN_PROGRESS
   COMPLETED