Skip to content

[Bookings] Update the path of the resources endpoint #14771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 17, 2025
Merged

[Bookings] Update the path of the resources endpoint #14771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f13732
Update the staff member endpoint path
hichamboushaba Oct 16, 2025
b7f3e99
Remove redundant null check
hichamboushaba Oct 16, 2025
2f6496e
Skip fetching order for bookings without orders
hichamboushaba Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...n/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingsRestClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class BookingsRestClient @Inject constructor(
site: SiteModel,
resourceId: Long
): WooPayload<BookingResourceDto> {
val endpoint = WOOCOMMERCE.resources.id(resourceId).pathV2Bookings
val endpoint = WOOCOMMERCE.resources.team_members.id(resourceId).pathV2Bookings

val response = wooNetwork.executeGetGsonRequest(
site = site,
Expand All @@ -90,7 +90,7 @@ class BookingsRestClient @Inject constructor(
BookingsFilterOption.AttendanceStatus -> TODO()
BookingsFilterOption.PaymentStatus -> TODO()
BookingsFilterOption.BookingType -> TODO()
is BookingsFilterOption.Customer -> filter.customerId?.let { set("customer", it.toString()) }
is BookingsFilterOption.Customer -> set("customer", filter.customerId.toString())

BookingsFilterOption.Location -> TODO()
is BookingsFilterOption.DateRange -> {
Expand Down
8 changes: 5 additions & 3 deletions ...c/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingsStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,16 @@ class BookingsStore @Inject internal constructor(
response.isError -> WooResult(response.error)
response.result != null -> {
val bookingDto = response.result
val orderResult = orderStore.fetchSingleOrderSync(site, bookingDto.orderId)
if (orderResult.isError) {
val orderResult = bookingDto.orderId.takeIf { it != 0L }?.let {
orderStore.fetchSingleOrderSync(site, bookingDto.orderId)
}
if (orderResult?.isError == true) {
return@withDefaultContext WooResult(orderResult.error)
}
val entity = with(bookingDtoMapper) {
bookingDto.toEntity(
localSiteId = site.localId(),
orderEntity = orderResult.model,
orderEntity = orderResult?.model,
)
}
bookingsDao.insertOrReplace(listOf(entity))
Expand Down
2 changes: 1 addition & 1 deletion libs/fluxc-processor/src/main/resources/wc-wp-api-endpoints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,4 @@

/bookings
/bookings/<id>/
/resources/<id>/
/resources/team-members/<id>/
Loading