np-47469: allow special characters for organization query

cristin-commons/src/main/java/no/unit/nva/cristin/common/ErrorMessages.java

@@ -59,6 +59,8 @@ public class ErrorMessages {
         "Upstream returned 400 (Bad Request). That might indicate bad query parameters";
     public static final String ERROR_MESSAGE_BACKEND_FAILED_WITH_EXCEPTION =
         "Remote service responded with error when client called uri: %s. Exception from upstream returned: %s";
+    public static final String ERROR_MESSAGE_REQUIRED_PARAM_MISSING =
+        "Required param '%s' is missing";
 
     /**
      * Formats and emits a message with required parameter names.

cristin-commons/src/main/java/no/unit/nva/cristin/common/handler/CristinQueryHandler.java

@@ -6,7 +6,6 @@
 import nva.commons.core.Environment;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
 import static no.unit.nva.cristin.common.ErrorMessages.ALPHANUMERIC_CHARACTERS_DASH_COMMA_PERIOD_AND_WHITESPACE;
@@ -17,7 +16,6 @@
 import static no.unit.nva.cristin.model.Constants.FIRST_PAGE;
 import static no.unit.nva.cristin.model.JsonPropertyNames.NAME;
 import static no.unit.nva.cristin.model.JsonPropertyNames.NUMBER_OF_RESULTS;
-import static no.unit.nva.cristin.model.JsonPropertyNames.ORGANIZATION;
 import static no.unit.nva.cristin.model.JsonPropertyNames.PAGE;
 import static no.unit.nva.cristin.model.JsonPropertyNames.QUERY;
 
@@ -66,11 +64,6 @@ protected String getValidName(RequestInfo requestInfo) throws BadRequestExceptio
                         invalidQueryParametersMessage(NAME, ALPHANUMERIC_CHARACTERS_DASH_COMMA_PERIOD_AND_WHITESPACE)));
     }
 
-    protected Optional<String> getValidOrganization(RequestInfo requestInfo) {
-        return requestInfo.getQueryParameterOpt(ORGANIZATION)
-                .filter(this::isValidQueryString);
-    }
-
     protected boolean isValidQueryString(String str) {
         for (Character c : str.toCharArray()) {
             if (isUnsupportedCharacter(c)) {

cristin-organization/src/main/java/no/unit/nva/cristin/organization/query/QueryCristinOrganizationHandler.java

@@ -18,6 +18,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static no.unit.nva.cristin.common.ErrorMessages.ERROR_MESSAGE_REQUIRED_PARAM_MISSING;
 import static no.unit.nva.cristin.common.ErrorMessages.validQueryParameterNamesMessage;
 import static no.unit.nva.client.ClientProvider.VERSION;
 import static no.unit.nva.cristin.model.Constants.FULL_TREE;
@@ -92,6 +93,12 @@ private ConcurrentHashMap<String, String> extractQueryParameters(RequestInfo req
         return requestQueryParams;
     }
 
+    protected String getValidQuery(RequestInfo requestInfo) throws BadRequestException {
+        return requestInfo.getQueryParameterOpt(QUERY)
+                   .orElseThrow(() -> new BadRequestException(
+                       String.format(ERROR_MESSAGE_REQUIRED_PARAM_MISSING, QUERY)));
+    }
+
     private Optional<String> getSort(RequestInfo requestInfo) {
         return requestInfo.getQueryParameterOpt(SORT);
     }

cristin-organization/src/test/java/no/unit/nva/cristin/organization/organization.feature

@@ -41,7 +41,7 @@ Feature: API tests for Cristin Organization retrieve and search
     Then status 400
     And match response.title == 'Bad Request'
     And match response.status == 400
-    And match response.detail == 'Parameter \'query\' has invalid value. May only contain alphanumeric characters, dash, comma, period, colon, semicolon and whitespace'
+    And match response.detail == 'Required param \'query\' is missing'
 
   Scenario: GET returns 404 status Not found when requesting unknown organization identifier
     Given path '/organization/' + nonExistingOrganizationId

cristin-organization/src/test/java/no/unit/nva/cristin/organization/query/QueryCristinOrganizationHandlerTest.java

@@ -48,9 +48,7 @@
 import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static java.net.HttpURLConnection.HTTP_OK;
-import static no.unit.nva.cristin.common.ErrorMessages.ALPHANUMERIC_CHARACTERS_DASH_COMMA_PERIOD_AND_WHITESPACE;
 import static no.unit.nva.cristin.common.ErrorMessages.ERROR_MESSAGE_DEPTH_INVALID;
-import static no.unit.nva.cristin.common.ErrorMessages.invalidQueryParametersMessage;
 import static no.unit.nva.client.ClientProvider.VERSION_2023_05_26;
 import static no.unit.nva.client.ClientProvider.VERSION_ONE;
 import static no.unit.nva.cristin.model.Constants.FULL;
@@ -88,6 +86,7 @@ class QueryCristinOrganizationHandlerTest {
     public static final String MEDICAL_BIOCHEMISTRY = "Department of Medical Biochemistry";
     public static final String EMPTY_OBJECT = "{}";
     public static final String NOT_FOUND_LOG_MESSAGE = "Organization from search result could not be found in upstream";
+    public static final String PARAM_QUERY_IS_MISSING = "Required param 'query' is missing";
 
     private QueryCristinOrganizationHandler queryCristinOrganizationHandler;
     private DefaultOrgQueryClientProvider clientProvider;
@@ -126,8 +125,7 @@ void shouldReturnBadRequestResponseOnMissingQueryParam() throws IOException {
         var gatewayResponse = GatewayResponse.fromOutputStream(output,Problem.class);
         var actualDetail = getProblemDetail(gatewayResponse);
         assertEquals(HTTP_BAD_REQUEST, gatewayResponse.getStatusCode());
-        assertThat(actualDetail, containsString(invalidQueryParametersMessage(
-            QUERY, ALPHANUMERIC_CHARACTERS_DASH_COMMA_PERIOD_AND_WHITESPACE)));
+        assertThat(actualDetail, containsString(PARAM_QUERY_IS_MISSING));
     }
 
     @Test
@@ -399,6 +397,17 @@ void shouldHaveCorrectEncodingOfNameParam() throws Exception {
         assertThat(gatewayResponse.getStatusCode(), equalTo(HTTP_OK));
     }
 
+    @ParameterizedTest
+    @MethodSource("specialCharacterQueryParamProvider")
+    void shouldAllowSpecialCharactersForQueryString(String query) throws Exception {
+        var input = generateHandlerRequestWithQuery(query);
+        queryCristinOrganizationHandler.handleRequest(input, output, context);
+
+        var gatewayResponse = GatewayResponse.fromOutputStream(output, SearchResponse.class);
+
+        assertThat(gatewayResponse.getStatusCode(), equalTo(HTTP_OK));
+    }
+
     private List<Organization> convertHitsToProperFormat(SearchResponse<?> searchResponse) {
         return OBJECT_MAPPER.convertValue(searchResponse.getHits(), new TypeReference<>() {});
     }
@@ -517,4 +526,20 @@ private FetchCristinOrgClient20230526 mockFetchClientWithOneHitMissingInUpstream
         return fetchClient;
     }
 
+    private InputStream generateHandlerRequestWithQuery(String query) throws JsonProcessingException {
+        return new HandlerRequestBuilder<InputStream>(restApiMapper)
+                   .withHeaders(Map.of(CONTENT_TYPE, APPLICATION_JSON_LD.type()))
+                   .withQueryParameters(Map.of(QUERY, query))
+                   .build();
+    }
+
+    private static Stream<Arguments> specialCharacterQueryParamProvider() {
+        return Stream.of(
+            Arguments.of("Wyższa Szkoła Informatyki i Zarządzania \"COPERNICUS\" we Wrocławiu"),
+            Arguments.of("Yale School of Medicine - Yale Cancer Center (YCC)"),
+            Arguments.of("Hogeschool IPABO Amsterdam/Alkmaar"),
+            Arguments.of("University of Technology, Sydney - Branch: St. Leonards Campus)")
+        );
+    }
+
 }