Merge pull request #223 from Ecwid/additional-product-search-parameters

Add baseUrl, cleanUrls and lang parameters to ProductsSearchRequest.ByIds

Author: juvirez

build.gradle.kts

@@ -13,6 +13,7 @@ plugins {
 	id("nebula.release") version "15.2.0"
 	id("maven-publish")
 	id("io.gitlab.arturbosch.detekt") version "1.17.1"
+	id("org.gradle.test-retry") version "1.4.1"
 }
 
 repositories {
@@ -57,6 +58,9 @@ tasks.withType<Test> {
 		slowThreshold = Consts.SLOW_TESTS_LOGGING_THRESHOLD_MS
 		theme = ThemeType.STANDARD
 	}
+	retry {
+		maxRetries.set(Consts.MAX_TEST_RETRIES_COUNT)
+	}
 }
 
 tasks.withType<Detekt>().configureEach {
@@ -66,7 +70,6 @@ tasks.withType<Detekt>().configureEach {
 val settingsProvider = SettingsProvider()
 
 tasks {
-
 	// All checks were already made by workflow "On pull request" => no checks here
 	if (gradle.startParameter.taskNames.contains("final")) {
 		named("build").get().apply {
@@ -324,6 +327,6 @@ object PublicationSettings {
 }
 
 object Consts {
-
 	const val SLOW_TESTS_LOGGING_THRESHOLD_MS = 30_000L
+	const val MAX_TEST_RETRIES_COUNT = 3
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/product/request/ProductsSearchRequest.kt

@@ -87,7 +87,10 @@ sealed class ProductsSearchRequest : ApiRequest {
 
 	data class ByIds(
 		val productIds: List<Int> = listOf(),
+		val baseUrl: String? = null,
+		val cleanUrls: Boolean? = null,
 		val sortBy: SortOrder? = null,
+		val lang: String? = null,
 	) : ProductsSearchRequest() {
 		override fun toRequestInfo() = RequestInfo.createGetRequest(
 			pathSegments = listOf(
@@ -103,7 +106,10 @@ sealed class ProductsSearchRequest : ApiRequest {
 			val request = this
 			return mutableMapOf<String, String>().apply {
 				put("productId", request.productIds.joinToString(","))
+				request.baseUrl?.let { put("baseUrl", it) }
+				request.cleanUrls?.let { put("cleanUrls", it.toString()) }
 				request.sortBy?.let { put("sortBy", it.name) }
+				request.lang?.let { put("lang", it) }
 			}.toMap()
 		}
 	}

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

@@ -5,7 +5,7 @@ import com.ecwid.apiclient.v3.rule.NullablePropertyRule
 import com.ecwid.apiclient.v3.rule.NullablePropertyRule.AllowNullable
 
 val productsSearchRequestNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
-    AllowNullable(ProductsSearchRequest.ByFilters::attributes),
+	AllowNullable(ProductsSearchRequest.ByFilters::attributes),
 	AllowNullable(ProductsSearchRequest.ByFilters::baseUrl),
 	AllowNullable(ProductsSearchRequest.ByFilters::categories),
 	AllowNullable(ProductsSearchRequest.ByFilters::cleanUrls),
@@ -30,5 +30,8 @@ val productsSearchRequestNullablePropertyRules: List<NullablePropertyRule<*, *>>
 	AllowNullable(ProductsSearchRequest.ByFilters::discountsAllowed),
 	AllowNullable(ProductsSearchRequest.ByFilters::isCustomerSetPrice),
 	AllowNullable(ProductsSearchRequest.ByFilters::visibleInStorefront),
+	AllowNullable(ProductsSearchRequest.ByIds::baseUrl),
+	AllowNullable(ProductsSearchRequest.ByIds::cleanUrls),
 	AllowNullable(ProductsSearchRequest.ByIds::sortBy),
+	AllowNullable(ProductsSearchRequest.ByIds::lang),
 )