Merge pull request #216 from Ecwid/generalize_nested_classes

Fix attribute converting - declare converter methods for concrete classes in their respective interfaces

Author: Alexis2004

src/main/kotlin/com/ecwid/apiclient/v3/dto/common/FetchedAttributeValue.kt

@@ -1,15 +1,40 @@
 package com.ecwid.apiclient.v3.dto.common
 
+import com.ecwid.apiclient.v3.dto.custom.CustomAppRequest
 import com.ecwid.apiclient.v3.dto.product.enums.AttributeValueLocation
+import com.ecwid.apiclient.v3.dto.product.result.FetchedProduct
 import com.ecwid.apiclient.v3.dto.producttype.enums.AttributeType
+import com.ecwid.apiclient.v3.dto.variation.result.FetchedVariation
 
-interface FetchedAttributeValue<T : FetchedAttributeValue<T>> {
+interface FetchedAttributeValue {
 	val id: Int?
 	val name: String?
 	val type: AttributeType?
 	val value: String?
 	val show: AttributeValueLocation?
 
-	fun cast(): T
+	fun toProductAttribute() = FetchedProduct.AttributeValue(
+		id = id,
+		name = name,
+		type = type,
+		value = value,
+		show = show,
+	)
+
+	fun toVariationAttribute() = FetchedVariation.AttributeValue(
+		id = id,
+		name = name,
+		type = type,
+		value = value,
+		show = show,
+	)
+
+	fun toOrderAttribute() = CustomAppRequest.AttributeValue(
+		id = id,
+		name = name,
+		type = type,
+		value = value,
+		show = show,
+	)
 
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/common/UpdatedAttributeValue.kt

@@ -1,13 +1,27 @@
 package com.ecwid.apiclient.v3.dto.common
 
 import com.ecwid.apiclient.v3.dto.product.enums.AttributeValueAlias
+import com.ecwid.apiclient.v3.dto.product.request.UpdatedProduct
+import com.ecwid.apiclient.v3.dto.variation.request.UpdatedVariation
 
-interface UpdatedAttributeValue<T : UpdatedAttributeValue<T>> {
+interface UpdatedAttributeValue {
 	val id: Int?
 	val alias: AttributeValueAlias?
 	val name: String?
 	val value: String?
 
-	fun cast(): T
+	fun toProductAttribute() = UpdatedProduct.AttributeValue(
+		id = id,
+		alias = alias,
+		name = name,
+		value = value,
+	)
+
+	fun toVariationAttribute() = UpdatedVariation.AttributeValue(
+		id = id,
+		alias = alias,
+		name = name,
+		value = value,
+	)
 
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/custom/CustomAppRequest.kt

@@ -282,16 +282,7 @@ data class CustomAppRequest(
 		override val type: AttributeType? = null,
 		override val value: String? = null,
 		override val show: AttributeValueLocation? = null
-	) : FetchedAttributeValue<AttributeValue> {
-
-		override fun cast() = AttributeValue(
-			id = id,
-			name = name,
-			type = type,
-			value = value,
-			show = show
-		)
-	}
+	) : FetchedAttributeValue
 
 	data class ProductDimensions(
 		val length: Double? = null,

src/main/kotlin/com/ecwid/apiclient/v3/dto/product/request/UpdatedProduct.kt

@@ -277,14 +277,7 @@ data class UpdatedProduct(
 		override val alias: AttributeValueAlias? = null,
 		override val name: String? = null,
 		override val value: String? = null
-	) : UpdatedAttributeValue<AttributeValue> {
-
-		override fun cast() = AttributeValue(
-			id = id,
-			alias = alias,
-			name = name,
-			value = value,
-		)
+	) : UpdatedAttributeValue {
 
 		companion object {
 

src/main/kotlin/com/ecwid/apiclient/v3/dto/product/result/FetchedProduct.kt

@@ -240,16 +240,7 @@ data class FetchedProduct(
 		override val type: AttributeType? = null,
 		override val value: String? = null,
 		override val show: AttributeValueLocation? = null
-	) : FetchedAttributeValue<AttributeValue> {
-
-		override fun cast() = AttributeValue(
-			id = id,
-			name = name,
-			type = type,
-			value = value,
-			show = show
-		)
-	}
+	) : FetchedAttributeValue
 
 	data class RelatedProducts(
 		val productIds: List<Int>? = null,

src/main/kotlin/com/ecwid/apiclient/v3/dto/variation/request/UpdatedVariation.kt

@@ -39,15 +39,7 @@ data class UpdatedVariation(
 		override val alias: AttributeValueAlias? = null,
 		override val name: String? = null,
 		override val value: String? = null
-	) : UpdatedAttributeValue<AttributeValue> {
-
-		override fun cast() = AttributeValue(
-			id = id,
-			alias = alias,
-			name = name,
-			value = value,
-		)
-	}
+	) : UpdatedAttributeValue
 
 	data class WholesalePrice(
 		val quantity: Int = 0,

src/main/kotlin/com/ecwid/apiclient/v3/dto/variation/result/FetchedVariation.kt

@@ -55,16 +55,7 @@ data class FetchedVariation(
 		override val type: AttributeType? = null,
 		override val value: String? = null,
 		override val show: AttributeValueLocation? = null
-	) : FetchedAttributeValue<AttributeValue> {
-
-		override fun cast() = AttributeValue(
-			id = id,
-			name = name,
-			type = type,
-			value = value,
-			show = show
-		)
-	}
+	) : FetchedAttributeValue
 
 	data class WholesalePrice(
 		val quantity: Int = 0,