ECWID-135161 Refactoring product reviews methods

Author: kitty-ecwid

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

@@ -299,8 +299,8 @@ interface SlugInfoApiClient {
 
 // Product reviews
 interface ProductReviewsApiClient {
-	fun searchProductReviews(request: ProductReviewsSearchRequest): ProductReviewSearchResult
-	fun searchProductReviewsAsSequence(request: ProductReviewsSearchRequest): Sequence<FetchedProductReview>
+	fun searchProductReviews(request: ProductReviewSearchRequest): ProductReviewSearchResult
+	fun searchProductReviewsAsSequence(request: ProductReviewSearchRequest): Sequence<FetchedProductReview>
 	fun getProductReviewDetails(request: ProductReviewDetailsRequest): FetchedProductReview
 	fun updateProductReviewStatus(request: ProductReviewUpdateStatusRequest): ProductReviewUpdateStatusResult
 	fun deleteProductReview(request: ProductReviewDeleteRequest): ProductReviewDeleteResult

…w/request/ProductReviewsSearchRequest.kt …ew/request/ProductReviewSearchRequest.ktsrc/main/kotlin/com/ecwid/apiclient/v3/dto/productreview/request/ProductReviewsSearchRequest.kt renamed to src/main/kotlin/com/ecwid/apiclient/v3/dto/productreview/request/ProductReviewSearchRequest.kt src/main/kotlin/com/ecwid/apiclient/v3/dto/productreview/request/ProductReviewsSearchRequest.kt renamed to src/main/kotlin/com/ecwid/apiclient/v3/dto/productreview/request/ProductReviewSearchRequest.kt

@@ -8,7 +8,7 @@ import com.ecwid.apiclient.v3.impl.RequestInfo
 import com.ecwid.apiclient.v3.responsefields.ResponseFields
 import java.time.Instant
 
-data class ProductReviewsSearchRequest(
+data class ProductReviewSearchRequest(
 	val reviewId: String? = null,
 	val productId: String? = null,
 	val orderId: String? = null,
@@ -22,7 +22,7 @@ data class ProductReviewsSearchRequest(
 	val limit: Int = 100,
 	override val offset: Int = 0,
 	val responseFields: ResponseFields = ResponseFields.All,
-) : ApiRequest, PagingRequest<ProductReviewsSearchRequest> {
+) : ApiRequest, PagingRequest<ProductReviewSearchRequest> {
 	override fun toRequestInfo() = RequestInfo.createGetRequest(
 		pathSegments = listOf(
 			"reviews"

src/main/kotlin/com/ecwid/apiclient/v3/impl/ProductReviewsApiClientImpl.kt

@@ -8,10 +8,10 @@ import com.ecwid.apiclient.v3.dto.productreview.result.*
 class ProductReviewsApiClientImpl(
 	private val apiClientHelper: ApiClientHelper,
 ) : ProductReviewsApiClient {
-	override fun searchProductReviews(request: ProductReviewsSearchRequest) =
+	override fun searchProductReviews(request: ProductReviewSearchRequest) =
 		apiClientHelper.makeObjectResultRequest<ProductReviewSearchResult>(request)
 
-	override fun searchProductReviewsAsSequence(request: ProductReviewsSearchRequest) =
+	override fun searchProductReviewsAsSequence(request: ProductReviewSearchRequest) =
 		apiClientHelper.makeObjectResultRequest<Sequence<FetchedProductReview>>(request)
 
 	override fun getProductReviewDetails(request: ProductReviewDetailsRequest) =

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

@@ -159,8 +159,8 @@ val nullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	fetchedSlugInfoClassesNullablePropertyRules,
 	slugInfoRequestNullablePropertyRules,
 	fetchedProductReviewNullablePropertyRules,
-	productReviewsMassUpdateRequestNullablePropertyRules,
-	productReviewsSearchRequestNullablePropertyRules,
+	productReviewMassUpdateRequestNullablePropertyRules,
+	productReviewSearchRequestNullablePropertyRules,
 ).flatten()
 
 sealed class NullablePropertyRule<T, R>(

…s/ProductReviewsMasUpdateRequestRules.kt …s/ProductReviewMassUpdateRequestRules.ktsrc/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/ProductReviewsMasUpdateRequestRules.kt renamed to src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/ProductReviewMassUpdateRequestRules.kt src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/ProductReviewsMasUpdateRequestRules.kt renamed to src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/ProductReviewMassUpdateRequestRules.kt

@@ -4,7 +4,7 @@ import com.ecwid.apiclient.v3.dto.productreview.request.ProductReviewMassUpdate
 import com.ecwid.apiclient.v3.rule.NullablePropertyRule
 import com.ecwid.apiclient.v3.rule.NullablePropertyRule.AllowNullable
 
-val productReviewsMassUpdateRequestNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
+val productReviewMassUpdateRequestNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	AllowNullable(ProductReviewMassUpdate.Filters::createdFrom),
 	AllowNullable(ProductReviewMassUpdate.Filters::createdTo),
 	AllowNullable(ProductReviewMassUpdate.Filters::productId),

src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/ProductReviewSearchRequestRules.kt

@@ -0,0 +1,18 @@
+package com.ecwid.apiclient.v3.rule.nullablepropertyrules
+
+import com.ecwid.apiclient.v3.dto.productreview.request.ProductReviewSearchRequest
+import com.ecwid.apiclient.v3.rule.NullablePropertyRule
+import com.ecwid.apiclient.v3.rule.NullablePropertyRule.AllowNullable
+
+val productReviewSearchRequestNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
+	AllowNullable(ProductReviewSearchRequest::createdFrom),
+	AllowNullable(ProductReviewSearchRequest::createdTo),
+	AllowNullable(ProductReviewSearchRequest::orderId),
+	AllowNullable(ProductReviewSearchRequest::productId),
+	AllowNullable(ProductReviewSearchRequest::rating),
+	AllowNullable(ProductReviewSearchRequest::reviewId),
+	AllowNullable(ProductReviewSearchRequest::sortBy),
+	AllowNullable(ProductReviewSearchRequest::status),
+	AllowNullable(ProductReviewSearchRequest::updatedFrom),
+	AllowNullable(ProductReviewSearchRequest::updatedTo),
+)