contrib: Remove redundant fields from affiliations, funders search

invenio_vocabularies/contrib/affiliations/config.py

@@ -42,12 +42,9 @@ class AffiliationsSearchOptions(SearchOptions):
             # Aliases can sometimes be shorter, so we boost them a bit.
             "aliases^5",
             localized_title,
-            "id^2",
             # Allow to search identifiers directly (e.g. ROR)
             "identifiers.identifier",
-            "country",
             "country_name",
-            "types",
         ],
     )
 

invenio_vocabularies/contrib/funders/config.py

@@ -41,13 +41,10 @@ class FundersSearchOptions(SearchOptions):
             # Aliases can sometimes be shorter, so we boost them a bit.
             "aliases^5",
             localized_title,
-            "id^2",
             # Allow to search identifiers directly (e.g. ROR)
             "identifiers.identifier",
-            "country",
             "country_name",
-            "types",
-        ]
+        ],
     )
 
     sort_default = "bestmatch"

tests/contrib/affiliations/test_affiliations_resource.py

@@ -113,6 +113,24 @@ def _create_affiliations(service, identity):
             "title": {
                 "en": "Northwestern University",
             },
+            "identifiers": [{"identifier": "000e0be47", "scheme": "ror"}],
+        },
+        {
+            "acronym": "NU",
+            "id": "chnu",
+            "name": "Northwestern University",
+            "title": {
+                "en": "Northwestern University",
+            },
+            "country_name": "Switzerland",
+        },
+        {
+            "acronym": "LONG",
+            "id": "LONG",
+            "name": "!!! The Official Global Alliance of the Most Prestigious, Highly-Renowned, and Exceptionally Innovative Solutions for Business, Commerce, Trade, Finance, Investment, Corporate Services, Logistics, and International Market Expansion—Providing Cutting-Edge, World-Class, and State-of-the-Art Consulting, Advisory, and Strategic Development Services for Organizations of All Sizes, Sectors, and Industries Across the Globe, Inc. ???",
+            "title": {
+                "en": "!!! The Official Global Alliance of the Most Prestigious, Highly-Renowned, and Exceptionally Innovative Solutions for Business, Commerce, Trade, Finance, Investment, Corporate Services, Logistics, and International Market Expansion—Providing Cutting-Edge, World-Class, and State-of-the-Art Consulting, Advisory, and Strategic Development Services for Organizations of All Sizes, Sectors, and Industries Across the Globe, Inc. ???"
+            },
         },
     ]
     for aff in affiliations:
@@ -127,10 +145,10 @@ def test_affiliations_prefix_search(
     """Test a successful search."""
     _create_affiliations(service, identity)
 
-    # Should show 1 result
+    # Should show 2 results
     res = client.get(f"{prefix}?q=uni", headers=h)
     assert res.status_code == 200
-    assert res.json["hits"]["total"] == 1
+    assert res.json["hits"]["total"] == 2
 
 
 def test_affiliations_suggest_sort(
@@ -156,6 +174,28 @@ def test_affiliations_suggest_sort(
     # Should show 2 results, but id=nu as first due to acronym
     res = client.get(f"{prefix}?suggest=NU", headers=h)
     assert res.status_code == 200
-    assert res.json["hits"]["total"] == 2
+    assert res.json["hits"]["total"] == 3
     assert res.json["hits"]["hits"][0]["id"] == "nu"
-    assert res.json["hits"]["hits"][1]["id"] == "cern"  # due to nucleaire
+    assert res.json["hits"]["hits"][1]["id"] == "chnu"
+    assert res.json["hits"]["hits"][2]["id"] == "cern"  # due to nucleaire
+
+    # Should show a result and not error out for longer names
+    res = client.get(
+        f"{prefix}?suggest=The%20Official%20Global%20Alliance%20of%20the%20Most%20Prestigious%2C%20Highly-Renowned%2C%20and%20Exceptionally%20Innovative%20Solutions%20for%20Business%2C%20Commerce%2C%20Trade%2C%20Finance%2C%20Investment%2C%20Corporate%20Services%2C%20Logistics%2C%20and%20International%20Market%20Expansion%E2%80%94Providing%20Cutting-Edge%2C%20World-Class%2C%20and%20State-of-the-Art%20Consulting%2C%20Advisory%2C%20and%20Strategic%20Development%20Services%20for%20Organizations%20of%20All%20Sizes%2C%20Sectors%2C%20and%20Industries%20Across%20the%20Globe",
+        headers=h,
+    )
+    assert res.status_code == 200
+    assert res.json["hits"]["total"] == 1
+    assert res.json["hits"]["hits"][0]["id"] == "LONG"
+
+    # Search affiliations with ROR ID
+    res = client.get(f"{prefix}?suggest=000e0be47", headers=h)
+    assert res.status_code == 200
+    assert res.json["hits"]["total"] == 1
+    assert res.json["hits"]["hits"][0]["id"] == "nu"
+
+    # Search affiliations with country
+    res = client.get(f"{prefix}?suggest=Switzerland", headers=h)
+    assert res.status_code == 200
+    assert res.json["hits"]["total"] == 1
+    assert res.json["hits"]["hits"][0]["id"] == "chnu"

tests/contrib/funders/test_funders_resource.py

@@ -80,6 +80,7 @@ def example_funders(service, identity, indexer):
                 "en": "European Organization for Nuclear Research",
                 "fr": "Conseil Européen pour la Recherche Nucléaire",
             },
+            "identifiers": [{"identifier": "01ggx4157", "scheme": "ror"}],
         },
         {"id": "0aaaaaa11", "name": "OTHER", "country": "CH", "title": {"en": "CERN"}},
         {
@@ -144,6 +145,12 @@ def test_funders_suggest_sort(client, h, prefix, example_funders):
     assert res.status_code == 200
     assert res.json["hits"]["total"] == 0
 
+    # Search affiliations with identifier
+    res = client.get(f"{prefix}?suggest=01ggx4157", headers=h)
+    assert res.status_code == 200
+    assert res.json["hits"]["total"] == 1
+    assert res.json["hits"]["hits"][0]["name"] == "CERN"
+
 
 def test_funders_delete(
     client_with_credentials, h, prefix, identity, service, funder_full_data