fix: Merge conflicts resolved in backend folder

This commit is contained in:
dhinesh-m24
2026-02-04 11:37:30 +05:30
parent 599890c58d
commit fcb1ddbbb3
7 changed files with 825 additions and 26 deletions

View File

@@ -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
}
}