From d6cabe4d8826896cb0aede76d844a940201939a1 Mon Sep 17 00:00:00 2001 From: "illarion.borts" Date: Sat, 12 Apr 2025 11:26:23 +0200 Subject: [PATCH 1/3] ECWID-161397 - add new field 'args' to EcwidApiError --- .../kotlin/com/ecwid/apiclient/v3/dto/common/EcwidApiError.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/common/EcwidApiError.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/common/EcwidApiError.kt index 00947b897..775a40d80 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/common/EcwidApiError.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/common/EcwidApiError.kt @@ -2,5 +2,6 @@ package com.ecwid.apiclient.v3.dto.common data class EcwidApiError( val errorMessage: String? = null, - val errorCode: String? = null + val errorCode: String? = null, + val args: Map? = null, ) From 420db34db037564fe7c06537e9978278736ece1d Mon Sep 17 00:00:00 2001 From: "illarion.borts" Date: Sat, 12 Apr 2025 13:36:55 +0200 Subject: [PATCH 2/3] ECWID-161397 - add new field 'args' to EcwidApiException --- src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt | 3 ++- .../com/ecwid/apiclient/v3/exception/EcwidApiException.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt index 88b361c6a..eb33c9fc0 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt @@ -204,7 +204,8 @@ class ApiClientHelper private constructor( statusCode = httpResponse.statusCode, reasonPhrase = httpResponse.reasonPhrase, code = ecwidError?.errorCode, - message = ecwidError?.errorMessage + message = ecwidError?.errorMessage, + args = ecwidError?.args, ) } catch (e: JsonDeserializationException) { throw EcwidApiException( diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/exception/EcwidApiException.kt b/src/main/kotlin/com/ecwid/apiclient/v3/exception/EcwidApiException.kt index 63860e1a8..adcf52524 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/exception/EcwidApiException.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/exception/EcwidApiException.kt @@ -5,5 +5,6 @@ data class EcwidApiException( val reasonPhrase: String? = null, val code: String? = null, override val message: String? = null, - override val cause: Throwable? = null + val args: Map? = null, + override val cause: Throwable? = null, ) : Exception(message, cause) From d89c3a7635d35379302f1d5f48c91497e3dd1f07 Mon Sep 17 00:00:00 2001 From: "illarion.borts" Date: Sat, 12 Apr 2025 15:12:56 +0200 Subject: [PATCH 3/3] ECWID-161397 - fix test --- 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 bd686d068..b890527ca 100644 --- a/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt +++ b/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt @@ -104,7 +104,7 @@ fun generateTestOrder(): UpdatedOrder { shippingOption = UpdatedOrder.ShippingOption( shippingMethodId = "MethodId " + randomAlphanumeric(8), - shippingCarrierName = "Carrier " + randomAlphanumeric(8), + shippingCarrierName = null, // not saved for pickup, see ECWID-153335 shippingMethodName = "Method " + randomAlphanumeric(8), shippingRate = randomPrice(), estimatedTransitTime = "Estimates " + randomAlphanumeric(8),