Merge pull request #387 from Ecwid/ECWID_136326

ECWID-136326 New Reports: internal API for topOfShippingMethodsByOrde…
Ecwid · Mar 11, 2024 · 5cc2d7d · 5cc2d7d
2 parents dce4bd0 + 012a153
commit 5cc2d7d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt
@@ -534,6 +534,7 @@ private fun createAdditionalDataPolymorphicType(): PolymorphicType<FetchedReport
 			"product" to FetchedReportResponse.FetchedAdditionalData.AdditionalProductData::class.java,
 			"coupon" to FetchedReportResponse.FetchedAdditionalData.AdditionalCouponData::class.java,
 			"abandoned_cart" to FetchedReportResponse.FetchedAdditionalData.AdditionalAbandonedCartData::class.java,
+			"shipping" to FetchedReportResponse.FetchedAdditionalData.AdditionalShippingData::class.java,
 		)
 	)
 }
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/report/result/FetchedReportResponse.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/report/result/FetchedReportResponse.kt
@@ -1,6 +1,7 @@
 package com.ecwid.apiclient.v3.dto.report.result
 
 import com.ecwid.apiclient.v3.dto.common.ApiFetchedDTO
+import com.ecwid.apiclient.v3.dto.order.enums.FulfillmentType
 import com.ecwid.apiclient.v3.dto.report.enums.ComparePeriod
 import com.ecwid.apiclient.v3.dto.report.enums.ReportType
 import com.ecwid.apiclient.v3.dto.report.enums.TimeScaleValue
@@ -79,6 +80,11 @@ data class FetchedReportResponse(
 			val autoAbandonedSalesRecovery: Boolean? = null,
 		) : FetchedAdditionalData(AdditionalDataType.ABANDONED_CARTS)
 
+		data class AdditionalShippingData(
+			val shippingMethodName: String? = null,
+			val fulfilmentType: FulfillmentType? = null,
+		) : FetchedAdditionalData(AdditionalDataType.SHIPPING)
+
 		enum class AdditionalDataType {
 			UTM,
 			ORDERS,
@@ -87,6 +93,7 @@ data class FetchedReportResponse(
 			INVENTORY_PRODUCT,
 			COUPONS,
 			ABANDONED_CARTS,
+			SHIPPING,
 		}
 	}
 

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt
@@ -119,6 +119,9 @@ val otherNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 
 	AllowNullable(FetchedReportResponse.FetchedAdditionalData.AdditionalAbandonedCartData::autoAbandonedSalesRecovery),
 
+	AllowNullable(FetchedReportResponse.FetchedAdditionalData.AdditionalShippingData::shippingMethodName),
+	AllowNullable(FetchedReportResponse.FetchedAdditionalData.AdditionalShippingData::fulfilmentType),
+
 	AllowNullable(CreateBatchRequest::groupId),
 	AllowNullable(CreateBatchRequestWithIds::groupId),