Introduce FetchedAttributeValue interface

Author: mvgreen

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

@@ -0,0 +1,12 @@
+package com.ecwid.apiclient.v3.dto.common
+
+import com.ecwid.apiclient.v3.dto.product.enums.AttributeValueLocation
+import com.ecwid.apiclient.v3.dto.producttype.enums.AttributeType
+
+interface FetchedAttributeValue {
+	val id: Int?
+	val name: String?
+	val type: AttributeType?
+	val value: String?
+	val show: AttributeValueLocation?
+}

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

@@ -1,10 +1,7 @@
 package com.ecwid.apiclient.v3.dto.custom
 
 import com.ecwid.apiclient.v3.dto.cart.result.FetchedCart
-import com.ecwid.apiclient.v3.dto.common.ApiRequestDTO
-import com.ecwid.apiclient.v3.dto.common.OrderedStringToListStringMap
-import com.ecwid.apiclient.v3.dto.common.OrderedStringToStringMap
-import com.ecwid.apiclient.v3.dto.common.PictureInfo
+import com.ecwid.apiclient.v3.dto.common.*
 import com.ecwid.apiclient.v3.dto.order.enums.*
 import com.ecwid.apiclient.v3.dto.product.enums.AttributeValueLocation
 import com.ecwid.apiclient.v3.dto.producttype.enums.AttributeType
@@ -282,7 +279,20 @@ data class CustomAppRequest(
 		val type: AttributeType? = null,
 		val value: String? = null,
 		val show: AttributeValueLocation? = null
-	)
+	) {
+
+		fun FetchedAttributeValue.ofOrder() =
+			AttributeValue(
+				id = id,
+				name = name,
+				type = type,
+				value = value,
+				show = show
+			)
+
+		fun Collection<FetchedAttributeValue>.ofOrder() = this.map { it.ofOrder() }
+
+	}
 
 	data class ProductDimensions(
 		val length: Double? = null,

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

@@ -1,10 +1,7 @@
 package com.ecwid.apiclient.v3.dto.product.result
 
-import com.ecwid.apiclient.v3.dto.common.ApiFetchedDTO
+import com.ecwid.apiclient.v3.dto.common.*
 import com.ecwid.apiclient.v3.dto.common.ApiFetchedDTO.ModifyKind
-import com.ecwid.apiclient.v3.dto.common.LocalizedValueMap
-import com.ecwid.apiclient.v3.dto.common.PictureInfo
-import com.ecwid.apiclient.v3.dto.common.ProductCondition
 import com.ecwid.apiclient.v3.dto.product.enums.*
 import com.ecwid.apiclient.v3.dto.product.request.UpdatedProduct
 import com.ecwid.apiclient.v3.dto.producttype.enums.AttributeType
@@ -238,12 +235,25 @@ data class FetchedProduct(
 	)
 
 	data class AttributeValue(
-		val id: Int? = null,
-		val name: String? = null,
-		val type: AttributeType? = null,
-		val value: String? = null,
-		val show: AttributeValueLocation? = null
-	)
+		override val id: Int? = null,
+		override val name: String? = null,
+		override val type: AttributeType? = null,
+		override val value: String? = null,
+		override val show: AttributeValueLocation? = null
+	): FetchedAttributeValue {
+
+		fun FetchedAttributeValue.ofProduct() =
+			AttributeValue(
+				id = id,
+				name = name,
+				type = type,
+				value = value,
+				show = show
+			)
+
+		fun Collection<FetchedAttributeValue>.ofProduct() = this.map { it.ofProduct() }
+
+	}
 
 	data class RelatedProducts(
 		val productIds: List<Int>? = null,

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

@@ -2,6 +2,7 @@ package com.ecwid.apiclient.v3.dto.variation.result
 
 import com.ecwid.apiclient.v3.dto.common.ApiFetchedDTO
 import com.ecwid.apiclient.v3.dto.common.ApiFetchedDTO.ModifyKind
+import com.ecwid.apiclient.v3.dto.common.FetchedAttributeValue
 import com.ecwid.apiclient.v3.dto.common.LocalizedValueMap
 import com.ecwid.apiclient.v3.dto.product.enums.AttributeValueLocation
 import com.ecwid.apiclient.v3.dto.product.enums.OutOfStockVisibilityBehaviour
@@ -49,12 +50,25 @@ data class FetchedVariation(
 ) : ApiFetchedDTO {
 
 	data class AttributeValue(
-		val id: Int? = null,
-		val name: String? = null,
-		val type: AttributeType? = null,
-		val value: String? = null,
-		val show: AttributeValueLocation? = null
-	)
+		override val id: Int? = null,
+		override val name: String? = null,
+		override val type: AttributeType? = null,
+		override val value: String? = null,
+		override val show: AttributeValueLocation? = null
+	): FetchedAttributeValue {
+
+		fun FetchedAttributeValue.ofVariation() =
+			AttributeValue(
+				id = id,
+				name = name,
+				type = type,
+				value = value,
+				show = show
+			)
+
+		fun Collection<FetchedAttributeValue>.ofVariation() = this.map { it.ofVariation() }
+
+	}
 
 	data class WholesalePrice(
 		val quantity: Int = 0,