Merge pull request #866 from algolia/fix/disjunctive-faceting-helper

fix(search): disjunctive faceting helper

Author: Fluf22

Sources/AlgoliaSearchClient/Helpers/DisjunctiveFacetingHelper.swift

@@ -50,16 +50,28 @@ struct DisjunctiveFacetingHelper {
     var queries = [Query]()
 
     var mainQuery = query
-    mainQuery.filters = buildFilters(excluding: .none)
+    mainQuery.filters = [
+        mainQuery.filters,
+        buildFilters(excluding: .none)
+    ]
+          .compactMap { $0 }
+          .filter { !$0.isEmpty }
+          .joined(separator: " AND ")
 
     queries.append(mainQuery)
 
     disjunctiveFacets
       .sorted(by: { $0.rawValue < $1.rawValue })
       .forEach { disjunctiveFacet in
-      var disjunctiveQuery = query
-      disjunctiveQuery.facets = [disjunctiveFacet]
-      disjunctiveQuery.filters = buildFilters(excluding: disjunctiveFacet)
+        var disjunctiveQuery = query
+          disjunctiveQuery.facets = [disjunctiveFacet]
+          disjunctiveQuery.filters = [
+            disjunctiveQuery.filters,
+            buildFilters(excluding: disjunctiveFacet)
+        ]
+              .compactMap { $0 }
+              .filter { !$0.isEmpty }
+              .joined(separator: " AND ")
       disjunctiveQuery.hitsPerPage = 0
       disjunctiveQuery.attributesToRetrieve = []
       disjunctiveQuery.attributesToHighlight = []

Tests/AlgoliaSearchClientTests/Unit/DisjunctiveFacetingHelperTests.swift

@@ -382,5 +382,92 @@ class DisjunctiveFacetingHelperTests: XCTestCase {
     ])
     XCTAssertTrue(response.exhaustiveFacetsCount!)
   }
+    
+    func testKeepExistingFilters() throws {
+        var query = Query()
+        query.filters = "NOT color:blue"
+        
+        let refinements: [Attribute: [String]] = [
+          "size": ["m", "s"],
+          "color": ["blue", "green", "red"],
+          "brand": ["apple", "samsung", "sony"]
+        ]
+        let disjunctiveFacets: Set<Attribute> = [
+          "color",
+          "size"
+        ]
+        let helper = DisjunctiveFacetingHelper(query: query,
+                                               refinements: refinements,
+                                               disjunctiveFacets: disjunctiveFacets)
+        let queries = helper.makeQueries()
+        XCTAssertEqual(queries.count, 3)
+        XCTAssertEqual(queries.first?.filters, """
+        NOT color:blue AND ("brand":"apple" AND "brand":"samsung" AND "brand":"sony") AND ("color":"blue" OR "color":"green" OR "color":"red") AND ("size":"m" OR "size":"s")
+        """)
+        XCTAssertEqual(queries[1].facets, ["color"])
+        XCTAssertEqual(queries[1].filters, """
+        NOT color:blue AND ("brand":"apple" AND "brand":"samsung" AND "brand":"sony") AND ("size":"m" OR "size":"s")
+        """)
+        XCTAssertEqual(queries[2].facets, ["size"])
+        XCTAssertEqual(queries[2].filters, """
+        NOT color:blue AND ("brand":"apple" AND "brand":"samsung" AND "brand":"sony") AND ("color":"blue" OR "color":"green" OR "color":"red")
+        """)
+    }
+    
+    func testKeepExistingFiltersEmpty() throws {
+        var query = Query()
+        query.filters = ""
+        
+        let refinements: [Attribute: [String]] = [
+          "size": ["m", "s"],
+          "color": ["blue", "green", "red"],
+          "brand": ["apple", "samsung", "sony"]
+        ]
+        let disjunctiveFacets: Set<Attribute> = [
+          "color",
+          "size"
+        ]
+        let helper = DisjunctiveFacetingHelper(query: query,
+                                               refinements: refinements,
+                                               disjunctiveFacets: disjunctiveFacets)
+        let queries = helper.makeQueries()
+        XCTAssertEqual(queries.count, 3)
+        XCTAssertEqual(queries.first?.filters, """
+        ("brand":"apple" AND "brand":"samsung" AND "brand":"sony") AND ("color":"blue" OR "color":"green" OR "color":"red") AND ("size":"m" OR "size":"s")
+        """)
+        XCTAssertEqual(queries[1].facets, ["color"])
+        XCTAssertEqual(queries[1].filters, """
+        ("brand":"apple" AND "brand":"samsung" AND "brand":"sony") AND ("size":"m" OR "size":"s")
+        """)
+        XCTAssertEqual(queries[2].facets, ["size"])
+        XCTAssertEqual(queries[2].filters, """
+        ("brand":"apple" AND "brand":"samsung" AND "brand":"sony") AND ("color":"blue" OR "color":"green" OR "color":"red")
+        """)
+    }
+    
+    func testKeepExistingFiltersNoRefinement() throws {
+        var query = Query()
+        query.filters = "NOT color:blue"
 
+        let disjunctiveFacets: Set<Attribute> = [
+          "color",
+          "size"
+        ]
+        let helper = DisjunctiveFacetingHelper(query: query,
+                                               refinements: [:],
+                                               disjunctiveFacets: disjunctiveFacets)
+        let queries = helper.makeQueries()
+        XCTAssertEqual(queries.count, 3)
+        XCTAssertEqual(queries.first?.filters, """
+        NOT color:blue
+        """)
+        XCTAssertEqual(queries[1].facets, ["color"])
+        XCTAssertEqual(queries[1].filters, """
+        NOT color:blue
+        """)
+        XCTAssertEqual(queries[2].facets, ["size"])
+        XCTAssertEqual(queries[2].filters, """
+        NOT color:blue
+        """)
+    }
 }