fix: Merge conflicts resolved in backend folder

backend/dataconnect/connector/order/mutations.gql

@@ -2,6 +2,7 @@ mutation createOrder(
   $vendorId: UUID
   $businessId: UUID!
   $orderType: OrderType!
+  #$location: String
   $status: OrderStatus
   $date: Timestamp
   $startDate: Timestamp
@@ -13,6 +14,7 @@ mutation createOrder(
   $assignedStaff: Any
   $shifts: Any
   $requested: Int
+  $teamHubId: UUID!
   $recurringDays: Any
   $permanentStartDate: Timestamp
   $permanentDays: Any
@@ -25,6 +27,7 @@ mutation createOrder(
       vendorId: $vendorId
       businessId: $businessId
       orderType: $orderType
+      #location: $location
       status: $status
       date: $date
       startDate: $startDate
@@ -36,6 +39,7 @@ mutation createOrder(
       assignedStaff: $assignedStaff
       shifts: $shifts
       requested: $requested
+      teamHubId: $teamHubId
       recurringDays: $recurringDays
       permanentDays: $permanentDays
       notes: $notes
@@ -49,6 +53,7 @@ mutation updateOrder(
   $id: UUID!
   $vendorId: UUID
   $businessId: UUID
+  #$location: String
   $status: OrderStatus
   $date: Timestamp
   $startDate: Timestamp
@@ -58,6 +63,7 @@ mutation updateOrder(
   $assignedStaff: Any
   $shifts: Any
   $requested: Int
+  $teamHubId: UUID!
   $recurringDays: Any
   $permanentDays: Any
   $notes: String
@@ -69,6 +75,7 @@ mutation updateOrder(
     data: {
       vendorId: $vendorId
       businessId: $businessId
+      #location: $location
       status: $status
       date: $date
       startDate: $startDate
@@ -78,6 +85,7 @@ mutation updateOrder(
       assignedStaff: $assignedStaff
       shifts: $shifts
       requested: $requested
+      teamHubId: $teamHubId
       recurringDays: $recurringDays
       permanentDays: $permanentDays
       notes: $notes
@@ -89,4 +97,4 @@ mutation updateOrder(
 
 mutation deleteOrder($id: UUID!) @auth(level: USER) {
   order_delete(id: $id) 
-}
+}

backend/dataconnect/connector/order/queries.gql

@@ -12,6 +12,7 @@ query listOrders(
     vendorId
     businessId
     orderType
+    #location
     status
     date
     startDate
@@ -40,6 +41,13 @@ query listOrders(
       id
       companyName
     }
+
+    teamHub {
+      address
+      placeId
+      hubName
+    }
+
   }
 }
 
@@ -54,6 +62,7 @@ query getOrderById($id: UUID!) @auth(level: USER) {
     vendorId
     businessId
     orderType
+    #location
     status
     date
     startDate
@@ -82,6 +91,13 @@ query getOrderById($id: UUID!) @auth(level: USER) {
       id
       companyName
     }
+
+    teamHub {
+      address
+      placeId
+      hubName
+    }
+
   }
 }
 
@@ -104,6 +120,7 @@ query getOrdersByBusinessId(
     vendorId
     businessId
     orderType
+    #location
     status
     date
     startDate
@@ -132,6 +149,13 @@ query getOrdersByBusinessId(
       id
       companyName
     }
+
+    teamHub {
+      address
+      placeId
+      hubName
+    }
+
   }
 }
 
@@ -154,6 +178,7 @@ query getOrdersByVendorId(
     vendorId
     businessId
     orderType
+    #location
     status
     date
     startDate
@@ -182,6 +207,13 @@ query getOrdersByVendorId(
       id
       companyName
     }
+
+    teamHub {
+      address
+      placeId
+      hubName
+    }
+
   }
 }
 
@@ -204,6 +236,7 @@ query getOrdersByStatus(
     vendorId
     businessId
     orderType
+    #location
     status
     date
     startDate
@@ -232,6 +265,13 @@ query getOrdersByStatus(
       id
       companyName
     }
+
+    teamHub {
+      address
+      placeId
+      hubName
+    }
+
   }
 }
 
@@ -257,6 +297,7 @@ query getOrdersByDateRange(
     vendorId
     businessId
     orderType
+    #location
     status
     date
     startDate
@@ -285,6 +326,13 @@ query getOrdersByDateRange(
       id
       companyName
     }
+
+    teamHub {
+      address
+      placeId
+      hubName
+    }
+
   }
 }
 
@@ -306,6 +354,7 @@ query getRapidOrders(
     vendorId
     businessId
     orderType
+    #location
     status
     date
     startDate
@@ -334,5 +383,53 @@ query getRapidOrders(
       id
       companyName
     }
+
+    teamHub {
+      address
+      placeId
+      hubName
+    }
+
   }
 }
+
+#to validate if an hub has orders before delete
+query listOrdersByBusinessAndTeamHub(
+  $businessId: UUID!
+  $teamHubId: UUID!
+  $offset: Int
+  $limit: Int
+) @auth(level: USER) {
+  orders(
+    where: {
+      businessId: { eq: $businessId }
+      teamHubId: { eq: $teamHubId }
+      #status: {in: [ DRAFT POSTED FILLED PENDING FULLY_STAFFED PARTIAL_STAFFED ] }
+    }
+    offset: $offset
+    limit: $limit
+    orderBy: { createdAt: DESC }
+  ) {
+    id
+    eventName
+    orderType
+    status
+    duration
+
+    businessId
+    vendorId
+    teamHubId
+
+    date
+    startDate
+    endDate
+
+    requested
+    total
+    notes
+
+    createdAt
+    updatedAt
+    createdBy
+  }
+}