Merge pull request #341 from Ecwid/report-additional-data

Add additionalData to FetchedReportResponse
Ecwid · Oct 20, 2023 · 63150f3 · 63150f3
2 parents 547162b + 5c35c41
commit 63150f3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt
@@ -528,6 +528,7 @@ private fun createAdditionalDataPolymorphicType(): PolymorphicType<FetchedReport
 		jsonFieldName = "type",
 		childClasses = mapOf(
 			"utm" to FetchedReportResponse.FetchedAdditionalData.AdditionalUtmData::class.java,
+			"orders" to FetchedReportResponse.FetchedAdditionalData.AdditionalOrdersData::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
@@ -15,6 +15,7 @@ data class FetchedReportResponse(
 	val dataset: List<FetchedDataset>? = null,
 	val comparePeriodAggregatedData: List<FetchedDataItem>? = null,
 	val comparePeriodDataset: List<FetchedDataset>? = null,
+	val additionalData: FetchedAdditionalData? = null,
 ) : ApiFetchedDTO {
 
 	data class FetchedDataset(
@@ -41,8 +42,13 @@ data class FetchedReportResponse(
 			val utmList: List<FetchedUtmDataItem> = emptyList(),
 		) : FetchedAdditionalData(AdditionalDataType.UTM)
 
+		data class AdditionalOrdersData(
+			val ordersCount: Int = 0,
+		) : FetchedAdditionalData(AdditionalDataType.ORDERS)
+
 		enum class AdditionalDataType {
-			UTM
+			UTM,
+			ORDERS
 		}
 	}
 

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt
@@ -93,6 +93,7 @@ val otherNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	AllowNullable(FetchedReportResponse::dataset),
 	AllowNullable(FetchedReportResponse::comparePeriodAggregatedData),
 	AllowNullable(FetchedReportResponse::comparePeriodDataset),
+	AllowNullable(FetchedReportResponse::additionalData),
 
 	AllowNullable(FetchedReportResponse.FetchedDataset::startTimeStamp),
 	AllowNullable(FetchedReportResponse.FetchedDataset::endTimeStamp),