Merge pull request #152 from algolia/develop

Version 1.2.1

Author: q-litzler

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.1
+
+- Fixed a bug when using advanced search: Disjunctive filters where flattened and lost proper AND / OR operator from the group #151
+
 # 1.2.0
 
 - Updated Kotlin `1.3.60`

buildSrc/src/main/kotlin/Library.kt

@@ -2,5 +2,5 @@ object Library: Dependency {
 
     override val group = "com.algolia"
     override val artifact = "algoliasearch-client-kotlin"
-    override val version = "1.2.0"
+    override val version = "1.2.1"
 }

src/commonMain/kotlin/com/algolia/search/endpoint/EndpointSearchImpl.kt

@@ -7,6 +7,7 @@ import com.algolia.search.model.Attribute
 import com.algolia.search.model.IndexName
 import com.algolia.search.model.filter.Filter
 import com.algolia.search.model.filter.FilterGroup
+import com.algolia.search.model.filter.FilterGroupsConverter
 import com.algolia.search.model.multipleindex.IndexQuery
 import com.algolia.search.model.request.RequestParams
 import com.algolia.search.model.response.ResponseHitWithPosition
@@ -102,20 +103,19 @@ internal class EndpointSearchImpl(
         val filtersOrFacet = filtersOr.filterIsInstance<Filter.Facet>()
         val filtersOrTag = filtersOr.filterIsInstance<Filter.Tag>()
         val filtersOrNumeric = filtersOr.filterIsInstance<Filter.Numeric>()
-        val queryForResults = query
-            .toIndexQuery()
-            .filters(filtersAnd, filtersOrFacet, filtersOrTag, filtersOrNumeric)
+        val queryForResults = query.toIndexQuery().setFilters(filterGroups)
         val queriesForDisjunctiveFacets = disjunctiveFacets.map { attribute ->
+            val groups = filterGroups.map { group ->
+                if (group is FilterGroup.Or.Facet) {
+                    FilterGroup.Or.Facet(group.filter { filter -> filter.attribute != attribute }.toSet())
+                } else group
+            }
+
             query
                 .toIndexQuery()
-                .filters(
-                    filtersAnd,
-                    filtersOrFacet.filter { it.attribute != attribute },
-                    filtersOrTag,
-                    filtersOrNumeric
-                )
                 .setFacets(attribute)
                 .optimize()
+                .setFilters(groups.toSet())
         }
         val queriesForHierarchicalFacets = filterGroups.filterIsInstance<FilterGroup.And.Hierarchical>().flatMap {
             it.attributes
@@ -139,6 +139,11 @@ internal class EndpointSearchImpl(
         return response.aggregateResult(disjunctiveFacets.size)
     }
 
+    private fun IndexQuery.setFilters(groups: Set<FilterGroup<*>>): IndexQuery {
+        query.filters = FilterGroupsConverter.SQL(groups)
+        return this
+    }
+
     private fun List<ResponseSearch>.aggregateFacets(): Map<Attribute, List<Facet>> {
         return fold(mapOf()) { acc, result ->
             result.facetsOrNull?.let { acc + it } ?: acc
@@ -201,7 +206,6 @@ internal class EndpointSearchImpl(
         return this
     }
 
-
     private fun IndexQuery.setFacets(facet: Attribute?): IndexQuery {
         if (facet != null) query.facets = setOf(facet)
         return this

src/commonMain/kotlin/com/algolia/search/model/filter/FilterGroupsConverter.kt

@@ -14,7 +14,7 @@ public sealed class FilterGroupsConverter<I, O> : (I) -> O {
 
         override fun invoke(groups: Set<FilterGroup<*>>): String? {
             return if (groups.isNotEmpty()) {
-                groups.joinToString(separator = " AND ") { group ->
+                groups.filterNot { it.isEmpty() }.joinToString(separator = " AND ") { group ->
                     val separator = when (group) {
                         is FilterGroup.And -> " AND "
                         is FilterGroup.Or -> " OR "

src/commonMain/kotlin/com/algolia/search/model/multicluster/ClusterName.kt

@@ -11,15 +11,11 @@ import kotlinx.serialization.internal.StringSerializer
 
 
 /**
- * [ClusterName] of a cluster. Can't be a blank or empty string.
+ * [ClusterName] of a cluster.
  */
 @Serializable(ClusterName.Companion::class)
 public data class ClusterName(override val raw: String) : Raw<String> {
 
-    init {
-        if (raw.isBlank()) throw EmptyStringException("ClusterName")
-    }
-
     override fun toString(): String {
         return raw
     }

src/commonTest/kotlin/documentation/methods/multicluster/DocAssignUserID.kt

@@ -14,6 +14,7 @@ internal class DocAssignUserID {
 //    suspend fun ClientSearch.assignUserID(
 //        #{userID}: __UserID__,
 //        #{clusterName}: __ClusterName__,
+//        #{requestOptions}: __RequestOptions?__ = null
 //    ): Creation
 
     @Test

src/commonTest/kotlin/documentation/methods/multicluster/DocHasPendingMapping.kt

@@ -0,0 +1,27 @@
+package documentation.methods.multicluster
+
+import com.algolia.search.model.multicluster.ClusterName
+import com.algolia.search.model.multicluster.UserID
+import com.algolia.search.model.response.ResponseHasPendingMapping
+import com.algolia.search.transport.RequestOptions
+import documentation.client
+import runBlocking
+import kotlin.test.Ignore
+import kotlin.test.Test
+
+
+@Ignore
+internal class DocHasPendingMapping {
+
+//    suspend fun hasPendingMapping(
+//        #{retrieveMapping}: __Boolean__ = false,
+//        #{requestOptions}: __RequestOptions?__ = null
+//    ): ResponseHasPendingMapping
+
+    @Test
+    fun snippet1() {
+        runBlocking {
+            client.hasPendingMapping(retrieveMapping = true)
+        }
+    }
+}

src/commonTest/kotlin/suite/TestSuiteDisjunctive.kt

@@ -56,7 +56,7 @@ internal class TestSuiteDisjunctive {
             )
             val filterGroups = setOf(
                 FilterGroup.Or.Facet(filters),
-                FilterGroup.And.Facet( Filter.Facet(category, "device"))
+                FilterGroup.And.Facet(Filter.Facet(category, "device"))
             )
 
             index.apply {