From 7afe3b942c6862cdb36ff0710ab5947fb61410e6 Mon Sep 17 00:00:00 2001 From: Ivan Zagaichuk Date: Fri, 11 Nov 2022 14:44:09 +0400 Subject: [PATCH 1/4] add new methods for get repeat URL --- .../kotlin/com/ecwid/apiclient/v3/ApiClient.kt | 2 ++ .../v3/dto/cart/request/RepeatCartURLRequest.kt | 16 ++++++++++++++++ .../v3/dto/cart/result/RepeatCartURLResult.kt | 7 +++++++ .../dto/order/request/RepeatOrderURLRequest.kt | 16 ++++++++++++++++ .../v3/dto/order/result/RepeatOrderURLResult.kt | 7 +++++++ .../apiclient/v3/impl/CartsApiClientImpl.kt | 5 +++++ .../apiclient/v3/impl/OrdersApiClientImpl.kt | 3 +++ 7 files changed, 56 insertions(+) create mode 100644 src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt create mode 100644 src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/RepeatCartURLResult.kt create mode 100644 src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt create mode 100644 src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/RepeatOrderURLResult.kt diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt index cf535e806..9b546e214 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt @@ -195,6 +195,7 @@ interface OrdersApiClient { fun deleteOrderItemOptionFiles(request: OrderItemOptionFilesDeleteRequest): OrderItemOptionFileDeleteResult fun searchDeletedOrders(request: DeletedOrdersSearchRequest): DeletedOrdersSearchResult fun searchDeletedOrdersAsSequence(request: DeletedOrdersSearchRequest): Sequence + fun getRepeatOrderURL(request: RepeatOrderURLRequest): RepeatOrderURLResult } // Product types @@ -269,6 +270,7 @@ interface CartsApiClient { fun updateCart(request: CartUpdateRequest): CartUpdateResult fun calculateOrderDetails(request: CalculateOrderDetailsRequest): CalculateOrderDetailsResult fun convertCartToOrder(request: ConvertCartToOrderRequest): ConvertCartToOrderResult + fun getRepeatCartURL(request: RepeatCartURLRequest): RepeatCartURLResult } // Discount coupons diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt new file mode 100644 index 000000000..f4f549deb --- /dev/null +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt @@ -0,0 +1,16 @@ +package com.ecwid.apiclient.v3.dto.cart.request + +import com.ecwid.apiclient.v3.dto.ApiRequest +import com.ecwid.apiclient.v3.impl.RequestInfo + +class RepeatCartURLRequest ( + val orderNumber: Long = 0 +) : ApiRequest { + override fun toRequestInfo() = RequestInfo.createGetRequest( + pathSegments = listOf( + "carts", + "$orderNumber", + "repeat" + ) + ) +} diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/RepeatCartURLResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/RepeatCartURLResult.kt new file mode 100644 index 000000000..c0e45b8d7 --- /dev/null +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/RepeatCartURLResult.kt @@ -0,0 +1,7 @@ +package com.ecwid.apiclient.v3.dto.cart.result + +import com.ecwid.apiclient.v3.dto.common.ApiResultDTO + +data class RepeatCartURLResult ( + val repeatCartUrl: String = "" +) : ApiResultDTO diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt new file mode 100644 index 000000000..68403bdc1 --- /dev/null +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt @@ -0,0 +1,16 @@ +package com.ecwid.apiclient.v3.dto.order.request + +import com.ecwid.apiclient.v3.dto.ApiRequest +import com.ecwid.apiclient.v3.impl.RequestInfo + +class RepeatOrderURLRequest ( + val orderNumber: Long = 0 +) : ApiRequest { + override fun toRequestInfo() = RequestInfo.createGetRequest( + pathSegments = listOf( + "orders", + "$orderNumber", + "repeat" + ) + ) +} diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/RepeatOrderURLResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/RepeatOrderURLResult.kt new file mode 100644 index 000000000..fc3d245c3 --- /dev/null +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/RepeatOrderURLResult.kt @@ -0,0 +1,7 @@ +package com.ecwid.apiclient.v3.dto.order.result + +import com.ecwid.apiclient.v3.dto.common.ApiResultDTO + +data class RepeatOrderURLResult ( + val repeatOrderUrl: String = "" +) : ApiResultDTO diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/impl/CartsApiClientImpl.kt b/src/main/kotlin/com/ecwid/apiclient/v3/impl/CartsApiClientImpl.kt index a8476befc..0cf2f2519 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/impl/CartsApiClientImpl.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/impl/CartsApiClientImpl.kt @@ -4,6 +4,8 @@ import com.ecwid.apiclient.v3.ApiClientHelper import com.ecwid.apiclient.v3.CartsApiClient import com.ecwid.apiclient.v3.dto.cart.request.* import com.ecwid.apiclient.v3.dto.cart.result.* +import com.ecwid.apiclient.v3.dto.order.request.RepeatOrderURLRequest +import com.ecwid.apiclient.v3.dto.order.result.RepeatOrderURLResult internal data class CartsApiClientImpl( private val apiClientHelper: ApiClientHelper @@ -33,4 +35,7 @@ internal data class CartsApiClientImpl( override fun convertCartToOrder(request: ConvertCartToOrderRequest) = apiClientHelper.makeObjectResultRequest(request) + + override fun getRepeatCartURL(request: RepeatCartURLRequest) = + apiClientHelper.makeObjectResultRequest(request) } diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/impl/OrdersApiClientImpl.kt b/src/main/kotlin/com/ecwid/apiclient/v3/impl/OrdersApiClientImpl.kt index 045bced92..c8e2a67ea 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/impl/OrdersApiClientImpl.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/impl/OrdersApiClientImpl.kt @@ -55,4 +55,7 @@ internal class OrdersApiClientImpl( offsetRequest = offsetRequest.copy(offset = offsetRequest.offset + searchResult.count) } while (searchResult.count >= searchResult.limit) } + + override fun getRepeatOrderURL(request: RepeatOrderURLRequest) = + apiClientHelper.makeObjectResultRequest(request) } From 3e010096578c15aecb911fc08e764bc85bd980e3 Mon Sep 17 00:00:00 2001 From: Ivan Zagaichuk Date: Fri, 18 Nov 2022 10:31:19 +0400 Subject: [PATCH 2/4] delete unused imports --- .../kotlin/com/ecwid/apiclient/v3/impl/CartsApiClientImpl.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/impl/CartsApiClientImpl.kt b/src/main/kotlin/com/ecwid/apiclient/v3/impl/CartsApiClientImpl.kt index 0cf2f2519..aea96e24f 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/impl/CartsApiClientImpl.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/impl/CartsApiClientImpl.kt @@ -4,8 +4,6 @@ import com.ecwid.apiclient.v3.ApiClientHelper import com.ecwid.apiclient.v3.CartsApiClient import com.ecwid.apiclient.v3.dto.cart.request.* import com.ecwid.apiclient.v3.dto.cart.result.* -import com.ecwid.apiclient.v3.dto.order.request.RepeatOrderURLRequest -import com.ecwid.apiclient.v3.dto.order.result.RepeatOrderURLResult internal data class CartsApiClientImpl( private val apiClientHelper: ApiClientHelper From 00db17e43b68d4b8d926cbedac73d10963519f73 Mon Sep 17 00:00:00 2001 From: Ivan Zagaichuk Date: Fri, 18 Nov 2022 10:32:12 +0400 Subject: [PATCH 3/4] delete extra spaces --- .../ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt | 2 +- .../ecwid/apiclient/v3/dto/cart/result/RepeatCartURLResult.kt | 2 +- .../apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt | 2 +- .../ecwid/apiclient/v3/dto/order/result/RepeatOrderURLResult.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt index f4f549deb..88a45df5c 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt @@ -3,7 +3,7 @@ package com.ecwid.apiclient.v3.dto.cart.request import com.ecwid.apiclient.v3.dto.ApiRequest import com.ecwid.apiclient.v3.impl.RequestInfo -class RepeatCartURLRequest ( +class RepeatCartURLRequest( val orderNumber: Long = 0 ) : ApiRequest { override fun toRequestInfo() = RequestInfo.createGetRequest( diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/RepeatCartURLResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/RepeatCartURLResult.kt index c0e45b8d7..2f7d553bb 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/RepeatCartURLResult.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/RepeatCartURLResult.kt @@ -2,6 +2,6 @@ package com.ecwid.apiclient.v3.dto.cart.result import com.ecwid.apiclient.v3.dto.common.ApiResultDTO -data class RepeatCartURLResult ( +data class RepeatCartURLResult( val repeatCartUrl: String = "" ) : ApiResultDTO diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt index 68403bdc1..5252f928d 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt @@ -3,7 +3,7 @@ package com.ecwid.apiclient.v3.dto.order.request import com.ecwid.apiclient.v3.dto.ApiRequest import com.ecwid.apiclient.v3.impl.RequestInfo -class RepeatOrderURLRequest ( +class RepeatOrderURLRequest( val orderNumber: Long = 0 ) : ApiRequest { override fun toRequestInfo() = RequestInfo.createGetRequest( diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/RepeatOrderURLResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/RepeatOrderURLResult.kt index fc3d245c3..8032b4529 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/RepeatOrderURLResult.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/RepeatOrderURLResult.kt @@ -2,6 +2,6 @@ package com.ecwid.apiclient.v3.dto.order.result import com.ecwid.apiclient.v3.dto.common.ApiResultDTO -data class RepeatOrderURLResult ( +data class RepeatOrderURLResult( val repeatOrderUrl: String = "" ) : ApiResultDTO From 957071ebf809793e0aedce2d449cf80b55498e55 Mon Sep 17 00:00:00 2001 From: Ivan Zagaichuk Date: Fri, 18 Nov 2022 10:46:03 +0400 Subject: [PATCH 4/4] made the class as a data class --- .../ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt | 2 +- .../apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt index 88a45df5c..c49ff8541 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/RepeatCartURLRequest.kt @@ -3,7 +3,7 @@ package com.ecwid.apiclient.v3.dto.cart.request import com.ecwid.apiclient.v3.dto.ApiRequest import com.ecwid.apiclient.v3.impl.RequestInfo -class RepeatCartURLRequest( +data class RepeatCartURLRequest( val orderNumber: Long = 0 ) : ApiRequest { override fun toRequestInfo() = RequestInfo.createGetRequest( diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt index 5252f928d..6237e68a7 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/RepeatOrderURLRequest.kt @@ -3,7 +3,7 @@ package com.ecwid.apiclient.v3.dto.order.request import com.ecwid.apiclient.v3.dto.ApiRequest import com.ecwid.apiclient.v3.impl.RequestInfo -class RepeatOrderURLRequest( +data class RepeatOrderURLRequest( val orderNumber: Long = 0 ) : ApiRequest { override fun toRequestInfo() = RequestInfo.createGetRequest(