Merge pull request DSpace#9239 from toniprieto/vocabularies-search-by…

…-metadata-and-collection

Correct response of get controlled vocabulary by metadata and collection when NO controlled vocabulary is available for the specified metadata and collection

dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyRestRepository.java

@@ -100,6 +100,9 @@ public VocabularyRest findByMetadataAndCollection(
         }
 
         String authorityName = cas.getChoiceAuthorityName(tokens[0], tokens[1], tokens[2], collection);
+        if (authorityName == null) {
+            return null;
+        }
         ChoiceAuthority source = cas.getChoiceAuthorityByAuthorityName(authorityName);
         return authorityUtils.convertAuthority(source, authorityName, utils.obtainProjection());
     }

dspace-server-webapp/src/test/java/org/dspace/app/rest/VocabularyRestRepositoryIT.java

@@ -394,6 +394,20 @@ public void findByMetadataAndCollectionTest() throws Exception {
                         )));
     }
 
+    @Test
+    public void findByMetadataAndCollectionWithMetadataWithoutVocabularyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Test collection")
+            .build();
+        context.restoreAuthSystemState();
+        String token = getAuthToken(admin.getEmail(), password);
+        getClient(token).perform(get("/api/submission/vocabularies/search/byMetadataAndCollection")
+                .param("metadata", "dc.title")
+                .param("collection", collection.getID().toString()))
+                .andExpect(status().isNoContent());
+    }
+
     @Test
     public void findByMetadataAndCollectionUnprocessableEntityTest() throws Exception {
         context.turnOffAuthorisationSystem();