Split query into whitespace chunks and search with word boundaries

Author: ml-evs

pydatalab/src/pydatalab/routes/v0_1/items.py

@@ -328,11 +328,14 @@ def search_items():
         pipeline.append({"$match": match_obj})
         pipeline.append({"$sort": {"score": {"$meta": "textScore"}}})
     else:
-        query = re.escape(query)
-        LOGGER.debug("Performing regex search for %s", query)
+        query_parts = [r"\b" + re.escape(part) for part in query.split(" ") if part]
         match_obj = {
-            "$or": [{field: {"$regex": query, "$options": "i"}} for field in ITEMS_FTS_FIELDS]
+            "$or": [
+                {"$and": [{field: {"$regex": query, "$options": "i"}} for query in query_parts]}
+                for field in ITEMS_FTS_FIELDS
+            ]
         }
+        LOGGER.debug("Performing regex search for %s with full search %s", query_parts, match_obj)
         match_obj = {"$and": [get_default_permissions(user_only=False), match_obj]}
         if types is not None:
             match_obj["$and"].append({"type": {"$in": types}})

pydatalab/tests/server/conftest.py

@@ -494,7 +494,7 @@ def example_items(user_id, admin_user_id):
             Sample(
                 **{
                     "item_id": "sample_2",
-                    "chemform": "vanadium (II) oxide",
+                    "chemform": "vanadium(II) oxide",
                     "name": "other_sample",
                     "date": "1970-02-01",
                     "refcode": "grey:TEST3",
@@ -516,7 +516,7 @@ def example_items(user_id, admin_user_id):
                 **{
                     "item_id": "test",
                     "chemform": "NaNiO2",
-                    "name": "NaNiO2-v",
+                    "name": "NaNiO2v",
                     "date": "1970-02-01",
                     "description": "magic",
                     "refcode": "grey:TEST5",

pydatalab/tests/server/test_samples.py

@@ -251,6 +251,23 @@ def test_item_search(client, admin_client, real_mongo_client, example_items):
     assert len(item_ids) == 1
     assert "sample_2" in item_ids
 
+    # Search for two words present in sample in either order
+    response = admin_client.get("/search-items/?query='vanadium oxide'")
+
+    assert response.status_code == 200
+    assert response.json["status"] == "success"
+    item_ids = {item["item_id"] for item in response.json["items"]}
+    assert len(item_ids) == 1
+    assert "sample_2" in item_ids
+
+    response = admin_client.get("/search-items/?query='oxide vanadium'")
+
+    assert response.status_code == 200
+    assert response.json["status"] == "success"
+    item_ids = {item["item_id"] for item in response.json["items"]}
+    assert len(item_ids) == 1
+    assert "sample_2" in item_ids
+
     # Search for single char at start of word
     response = admin_client.get("/search-items/?query='v'")
 
@@ -260,6 +277,14 @@ def test_item_search(client, admin_client, real_mongo_client, example_items):
     assert len(item_ids) == 1
     assert "sample_2" in item_ids
 
+    # Search for word ending that should not return results
+    response = admin_client.get("/search-items/?query='anadium'")
+
+    assert response.status_code == 200
+    assert response.json["status"] == "success"
+    item_ids = {item["item_id"] for item in response.json["items"]}
+    assert len(item_ids) == 0
+
 
 @pytest.mark.dependency(depends=["test_delete_sample"])
 def test_new_sample_with_relationships(client, complicated_sample):