From 59c566513a7df40a8e8321c5dc5ebf3fbbf822d6 Mon Sep 17 00:00:00 2001 From: Renat Ayzyatullen Date: Tue, 18 Mar 2025 21:23:36 +0400 Subject: [PATCH 1/3] ECWID-157318 Negative promo targets - filter categories for exclusion list - apiclient - whitespace change --- .../apiclient/v3/dto/category/request/CategoriesSearchRequest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/category/request/CategoriesSearchRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/category/request/CategoriesSearchRequest.kt index 7dc93c24f..dda2bd4de 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/category/request/CategoriesSearchRequest.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/category/request/CategoriesSearchRequest.kt @@ -20,6 +20,7 @@ data class CategoriesSearchRequest( val responseFields: ResponseFields = ResponseFields.All, ) : ApiRequest, PagingRequest { + override fun toRequestInfo() = RequestInfo.createGetRequest( pathSegments = listOf( "categories" From 33d5054fba6f91317c3e68a36f29397642da2016 Mon Sep 17 00:00:00 2001 From: Renat Ayzyatullen Date: Tue, 18 Mar 2025 23:02:16 +0400 Subject: [PATCH 2/3] ECWID-157318 Negative promo targets - filter categories for exclusion list - apiclient - try increasing delay for processDelay calls --- src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt | 2 +- src/test/kotlin/com/ecwid/apiclient/v3/entity/OrdersTest.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt b/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt index 6544eaea7..63f772fca 100644 --- a/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt +++ b/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt @@ -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 diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/entity/OrdersTest.kt b/src/test/kotlin/com/ecwid/apiclient/v3/entity/OrdersTest.kt index d875bd8a7..c390cb84d 100644 --- a/src/test/kotlin/com/ecwid/apiclient/v3/entity/OrdersTest.kt +++ b/src/test/kotlin/com/ecwid/apiclient/v3/entity/OrdersTest.kt @@ -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 @@ -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 } @@ -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 } From 072680eb5dfe0fcf3c74c631b33d9da54c84a8d8 Mon Sep 17 00:00:00 2001 From: Renat Ayzyatullen Date: Tue, 18 Mar 2025 23:40:31 +0400 Subject: [PATCH 3/3] ECWID-157318 Negative promo targets - filter categories for exclusion list - apiclient - try nullifying shippingOption.pickupInstruction in generated test order --- src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt b/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt index a117b7c92..bd686d068 100644 --- a/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt +++ b/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt @@ -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(),