fix: Merge conflicts resolved in backend folder

backend/dataconnect/connector/shiftRole/queries.gql

@@ -25,6 +25,7 @@ query getShiftRoleById(
     }
 
     shift{
+      location
       locationAddress
       description
       orderId
@@ -37,6 +38,7 @@ query getShiftRoleById(
         business{
           id
           businessName
+          companyLogoUrl
         }
 
         vendor{
@@ -44,6 +46,10 @@ query getShiftRoleById(
           companyName
         }
 
+        teamHub{
+          hubName
+        }
+
       }
     }
   }
@@ -80,6 +86,7 @@ query listShiftRolesByShiftId(
     }
 
     shift{
+      location
       locationAddress
       description
       orderId
@@ -135,6 +142,7 @@ query listShiftRolesByRoleId(
     }
 
     shift{
+      location
       locationAddress
       description
       orderId
@@ -197,6 +205,7 @@ query listShiftRolesByShiftIdAndTimeRange(
     }
 
     shift{
+      location
       locationAddress
       description
       orderId
@@ -233,6 +242,7 @@ query listShiftRolesByVendorId(
   shiftRoles(
     where: {
       shift: {
+        status: {in: [IN_PROGRESS, CONFIRMED, ASSIGNED, OPEN, PENDING]} #IN_PROGRESS? PENDING?
         order: {
           vendorId: { eq: $vendorId }
         }
@@ -266,9 +276,12 @@ query listShiftRolesByVendorId(
       id
       title
       date
+      location
       locationAddress
       description
       orderId
+      status
+      durationDays
 
       order {
         id
@@ -322,10 +335,11 @@ query listShiftRolesByBusinessAndDateRange(
     shift {
       id
       date
+      location
       locationAddress
       title
       status
-      order { id }
+      order { id eventName }
     }
   }
 }
@@ -367,11 +381,21 @@ query listShiftRolesByBusinessAndOrder(
       title
       date
       orderId
+      location
       locationAddress
 
       order{
         vendorId
+        eventName
         date
+        #location
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
       }
     }
   }
@@ -417,6 +441,7 @@ query listShiftRolesByBusinessDateRangeCompletedOrders(
     shift {
       id
       date
+      location
       locationAddress
       title
       status
@@ -514,4 +539,4 @@ query getCompletedShiftsByBusinessId(
       #vendor { id companyName }
     }
   }
-}
+}