Merge remote-tracking branch 'origin/master' into ECWID-135161-reviews-api

Author: kitty-ecwid

src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt

@@ -530,7 +530,8 @@ private fun createAdditionalDataPolymorphicType(): PolymorphicType<FetchedReport
 			"utm" to FetchedReportResponse.FetchedAdditionalData.AdditionalUtmData::class.java,
 			"orders" to FetchedReportResponse.FetchedAdditionalData.AdditionalOrdersData::class.java,
 			"customers" to FetchedReportResponse.FetchedAdditionalData.AdditionalCustomerData::class.java,
-			"product" to FetchedReportResponse.FetchedAdditionalData.AdditionalInventoryData::class.java
+			"inventory_product" to FetchedReportResponse.FetchedAdditionalData.AdditionalInventoryData::class.java,
+			"product" to FetchedReportResponse.FetchedAdditionalData.AdditionalProductData::class.java,
 		)
 	)
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/productreview/request/ProductReviewSearchRequest.kt

@@ -7,6 +7,7 @@ import com.ecwid.apiclient.v3.dto.productreview.enums.ProductReviewStatus
 import com.ecwid.apiclient.v3.impl.RequestInfo
 import com.ecwid.apiclient.v3.responsefields.ResponseFields
 import java.time.Instant
+import java.util.concurrent.TimeUnit
 
 data class ProductReviewSearchRequest(
 	val reviewId: String? = null,
@@ -39,10 +40,10 @@ data class ProductReviewSearchRequest(
 			request.orderId?.let { put("orderId", it) }
 			request.status?.let { put("status", it.toString()) }
 			request.rating?.let { put("rating", it.toString()) }
-			request.createdFrom?.let { put("createdFrom", it.toString()) }
-			request.createdTo?.let { put("createdTo", it.toString()) }
-			request.updatedFrom?.let { put("updatedFrom", it.toString()) }
-			request.updatedTo?.let { put("updatedTo", it.toString()) }
+			request.createdFrom?.let { put("createdFrom", TimeUnit.MILLISECONDS.toSeconds(it.toEpochMilli()).toString()) }
+			request.createdTo?.let { put("createdTo", TimeUnit.MILLISECONDS.toSeconds(it.toEpochMilli()).toString()) }
+			request.updatedFrom?.let { put("updatedFrom", TimeUnit.MILLISECONDS.toSeconds(it.toEpochMilli()).toString()) }
+			request.updatedTo?.let { put("updatedTo", TimeUnit.MILLISECONDS.toSeconds(it.toEpochMilli()).toString()) }
 			request.sortBy?.let { put("sortBy", it.name) }
 			put("offset", request.offset.toString())
 			put("limit", request.limit.toString())

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ReportType.kt

@@ -17,6 +17,8 @@ enum class ReportType {
 	newOrdersVsRepeatOrders,
 	topOfCustomersByOrders,
 	inventory,
+	topOfShippingMethodsByOrders,
+	topOfPaymentMethodsByOrders,
 
 	/** finance */
 	allRevenue,

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/result/FetchedReportResponse.kt

@@ -62,13 +62,21 @@ data class FetchedReportResponse(
 			val imageUrl: String? = null,
 			val thumbnailUrl: String? = null,
 			val exampleOrder: String? = null,
+		) : FetchedAdditionalData(AdditionalDataType.INVENTORY_PRODUCT)
+
+		data class AdditionalProductData(
+			val productName: String? = null,
+			val productSmallThumbnailUrl: String? = null,
+			val productUrl: String? = null,
+			val productEditUrl: String? = null,
 		) : FetchedAdditionalData(AdditionalDataType.PRODUCT)
 
 		enum class AdditionalDataType {
 			UTM,
 			ORDERS,
 			CUSTOMERS,
 			PRODUCT,
+			INVENTORY_PRODUCT,
 		}
 	}
 

src/test/kotlin/com/ecwid/apiclient/v3/rule/NullablePropertyRules.kt

@@ -110,6 +110,11 @@ val otherNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	AllowNullable(FetchedReportResponse.FetchedAdditionalData.AdditionalInventoryData::thumbnailUrl),
 	AllowNullable(FetchedReportResponse.FetchedAdditionalData.AdditionalInventoryData::exampleOrder),
 
+	AllowNullable(FetchedReportResponse.FetchedAdditionalData.AdditionalProductData::productName),
+	AllowNullable(FetchedReportResponse.FetchedAdditionalData.AdditionalProductData::productSmallThumbnailUrl),
+	AllowNullable(FetchedReportResponse.FetchedAdditionalData.AdditionalProductData::productUrl),
+	AllowNullable(FetchedReportResponse.FetchedAdditionalData.AdditionalProductData::productEditUrl),
+
 	AllowNullable(CreateBatchRequest::groupId),
 	AllowNullable(CreateBatchRequestWithIds::groupId),