Skip to content

Generalize nested classes #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alexis2004 merged 8 commits into from
Sep 15, 2022
Merged

Generalize nested classes #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ce48d1
Introduce UpdatedAttributeValue interface
Sep 12, 2022
2f41f01
Introduce FetchedAttributeValue interface
Sep 13, 2022
3f25834
Fix codestyle issues
Sep 13, 2022
45ed2fc
Fix codestyle issue in FetchedVariation
Sep 13, 2022
eb7756f
Merge remote-tracking branch 'origin/master' into generalize_nested_c…
Sep 14, 2022
da3f652
Remove redundant utility extensions
Sep 15, 2022
fcd03b1
Fix spacing in CustomAppRequest
Sep 15, 2022
fb378b8
Fix typo
Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/common/FetchedAttributeValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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?
}
10 changes: 10 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/common/UpdatedAttributeValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.ecwid.apiclient.v3.dto.common

import com.ecwid.apiclient.v3.dto.product.enums.AttributeValueAlias

interface UpdatedAttributeValue {
val id: Int?
val alias: AttributeValueAlias?
val name: String?
val value: String?
}
26 changes: 15 additions & 11 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/custom/CustomAppRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -226,7 +223,10 @@ data class CustomAppRequest(
val applicationLimit: DiscountCouponApplicationLimit? = null,
val creationDate: Date? = null,
val orderCount: Int? = null,
@Deprecated("This field is added for backward compatibility only. Don't use it.", replaceWith = ReplaceWith("catalogLimit"))
@Deprecated(
"This field is added for backward compatibility only. Don't use it.",
replaceWith = ReplaceWith("catalogLimit")
)
val legacyCatalogLimit: DiscountCouponCatalogLimit? = null,
val catalogLimit: DiscountCouponCatalogLimit? = null,
val repeatCustomerOnly: Boolean? = null,
Expand Down Expand Up @@ -277,12 +277,16 @@ data class CustomAppRequest(
)

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 Collection<FetchedAttributeValue>.toOrderAttributeList() = this.map { it as AttributeValue }

}

data class ProductDimensions(
val length: Double? = null,
Expand Down
17 changes: 8 additions & 9 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/product/request/UpdatedProduct.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package com.ecwid.apiclient.v3.dto.product.request

import com.ecwid.apiclient.v3.dto.common.NullableUpdatedValue
import com.ecwid.apiclient.v3.dto.common.ApiUpdatedDTO
import com.ecwid.apiclient.v3.dto.common.*
import com.ecwid.apiclient.v3.dto.common.ApiUpdatedDTO.ModifyKind
import com.ecwid.apiclient.v3.dto.common.LocalizedValueMap
import com.ecwid.apiclient.v3.dto.common.ProductCondition
import com.ecwid.apiclient.v3.dto.product.enums.*
import com.ecwid.apiclient.v3.dto.product.result.FetchedProduct

Expand Down Expand Up @@ -276,11 +273,13 @@ data class UpdatedProduct(
)

data class AttributeValue internal constructor(
val id: Int? = null,
val alias: AttributeValueAlias? = null,
val name: String? = null,
val value: String? = null
) {
override val id: Int? = null,
override val alias: AttributeValueAlias? = null,
override val name: String? = null,
override val value: String? = null
) : UpdatedAttributeValue {

fun Collection<UpdatedAttributeValue>.toProductAttributeList() = this.map { it as AttributeValue }

companion object {

Expand Down
21 changes: 11 additions & 10 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/product/result/FetchedProduct.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -238,12 +235,16 @@ 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 Collection<FetchedAttributeValue>.toProductAttributeList() = this.map { it as AttributeValue }

}

data class RelatedProducts(
val productIds: List<Int>? = null,
Expand Down
15 changes: 10 additions & 5 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/variation/request/UpdatedVariation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.ecwid.apiclient.v3.dto.variation.request

import com.ecwid.apiclient.v3.dto.common.ApiUpdatedDTO
import com.ecwid.apiclient.v3.dto.common.ApiUpdatedDTO.ModifyKind
import com.ecwid.apiclient.v3.dto.common.UpdatedAttributeValue
import com.ecwid.apiclient.v3.dto.product.enums.AttributeValueAlias
import com.ecwid.apiclient.v3.dto.product.enums.OutOfStockVisibilityBehaviour
import com.ecwid.apiclient.v3.dto.variation.result.FetchedVariation
Expand Down Expand Up @@ -34,11 +35,15 @@ data class UpdatedVariation(
) : ApiUpdatedDTO {

data class AttributeValue(
val id: Int? = null,
val alias: AttributeValueAlias? = null,
val name: String? = null,
val value: String? = null
)
override val id: Int? = null,
override val alias: AttributeValueAlias? = null,
override val name: String? = null,
override val value: String? = null
) : UpdatedAttributeValue {

fun Collection<UpdatedAttributeValue>.toVariationAttributeList() = this.map { it as AttributeValue }

}

data class WholesalePrice(
val quantity: Int = 0,
Expand Down
17 changes: 11 additions & 6 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/variation/result/FetchedVariation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -49,12 +50,16 @@ 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 Collection<FetchedAttributeValue>.toVariationAttributeList() = this.map { it as AttributeValue }

}

data class WholesalePrice(
val quantity: Int = 0,
Expand Down