Merge pull request #484 from Ecwid/ECWID-161397

ECWID-161397 - add new field 'args' to EcwidApiError

Author: mplain

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(

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<String, String>? = null,
 )

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<String, String>? = null,
+	override val cause: Throwable? = null,
 ) : Exception(message, cause)

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),