Merge pull request #510 from ror-community/dev

Author: jrhoads

requirements.txt

@@ -13,7 +13,7 @@ sentry-sdk==0.12.2
 python-dotenv==0.10.3
 django-cors-headers==3.1.0
 unidecode==1.1.1
-fuzzywuzzy==0.17.0
+fuzzywuzzy==0.18.0
 python-Levenshtein==0.12.1
 statsmodels==0.10.2
 boto3

rorapi/common/queries.py

@@ -308,6 +308,7 @@ def build_search_query(params, version):
         ]
         # normalize filter values based on casing conventions used in ROR records
         for f in filters:
+            f[1] = " ".join(f[1].split())
             if f[0] == "types":
                 if version == "v2":
                     f[1] = f[1].lower()

rorapi/tests/tests_unit/tests_queries_v2.py

@@ -370,6 +370,20 @@ def test_filter_status_filter(self):
         query = build_search_query({'filter': f}, self.V2_VERSION)
         self.assertEquals(query.to_dict(), expected)
 
+    def test_filter_whitespace_normalization(self):
+        f = 'locations.geonames_details.country_name:South  Africa'
+        expected = {'query': {
+            'bool': {
+                'filter': [
+                    {'terms': {'locations.geonames_details.country_name': ('South Africa',)}},
+                    {'terms': {'status': ['active']}}
+                ],
+            }
+        }}
+        expected.update(self.default_query)
+        query = build_search_query({'filter': f}, self.V2_VERSION)
+        self.assertEquals(query.to_dict(), expected)
+
     def test_filter_all_status(self):
         f = 'key1:val1,k2:value2'
         expected = {'query': {