Skip to content

ECWID-157318 Negative promo targets - filter categories for exclusion list - apiclient #477

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
renat-ayzyatullen merged 3 commits into from
Mar 19, 2025
Merged

ECWID-157318 Negative promo targets - filter categories for exclusion list - apiclient #477

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
59c5665
ECWID-157318 Negative promo targets - filter categories for exclusion…
renat-ayzyatullen Mar 18, 2025
33d5054
ECWID-157318 Negative promo targets - filter categories for exclusion…
renat-ayzyatullen Mar 18, 2025
072680e
ECWID-157318 Negative promo targets - filter categories for exclusion…
renat-ayzyatullen Mar 18, 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
1 change: 1 addition & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/category/request/CategoriesSearchRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ data class CategoriesSearchRequest(
val responseFields: ResponseFields = ResponseFields.All,
) : ApiRequest, PagingRequest<CategoriesSearchRequest> {


override fun toRequestInfo() = RequestInfo.createGetRequest(
pathSegments = listOf(
"categories"
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ class CartsTest : BaseEntityTest() {

apiClient.createOrder(orderCreateRequest)

return processDelay(500L, 10) {
return processDelay(1500L, 10) {
val cartsSearchResult2 = apiClient.searchCartsAsSequence(cartsSearchRequest)
val newCartList = cartsSearchResult2 - cartsSearchResult1
if (newCartList.count() == 1) newCartList[0].cartId else null
Expand Down
6 changes: 3 additions & 3 deletions src/test/kotlin/com/ecwid/apiclient/v3/entity/OrdersTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ class OrdersTest : BaseEntityTest() {
assertTrue(orderCreateResult.id > 0)

// Waiting till order became available for searching
processDelay(1000, 10) {
processDelay(1500, 10) {
val ordersSearchRequest = OrdersSearchRequest(keywords = orderCreateRequest.newOrder.orderComments)
val ordersSearchResult = apiClient.searchOrders(ordersSearchRequest)
if (ordersSearchResult.total > 0) ordersSearchResult else null
Expand Down Expand Up @@ -337,7 +337,7 @@ class OrdersTest : BaseEntityTest() {

// Waiting till order became available for searching and trying to request only one page
val ordersSearchRequest = OrdersSearchRequest(offset = 2, limit = 2)
val ordersSearchResult = processDelay(1000, 10) {
val ordersSearchResult = processDelay(1500, 10) {
val result = apiClient.searchOrders(ordersSearchRequest)
if (result.count == 1 && result.total == 3) result else null
}
Expand All @@ -356,7 +356,7 @@ class OrdersTest : BaseEntityTest() {
val orderCreateResult = apiClient.createOrder(orderCreateRequest)
assertTrue(orderCreateResult.id > 0)

processDelay(1000, 10) {
processDelay(1500, 10) {
val result = apiClient.searchOrders(OrdersSearchRequest())
if (result.count == 1) result else null
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ fun generateTestOrder(): UpdatedOrder {
shippingRate = randomPrice(),
estimatedTransitTime = "Estimates " + randomAlphanumeric(8),
isPickup = true,
pickupInstruction = "Instruction " + randomAlphanumeric(64),
pickupInstruction = null, // can not be set now without matching owner.newShippingSettings entry ECWID-153335
fulfillmentType = FulfillmentType.PICKUP
),
taxesOnShipping = listOf(),
Expand Down