This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 2f94fad5 authored by Eduard Frankford's avatar Eduard Frankford
Browse files

merged michaels changes to my branch

parents 94effc4d a8252505
2 merge requests!17Initial Merge to Prepare Release 1.0.0,!1Resolve "Metadaten konsolideren"
......@@ -223,9 +223,15 @@ public class MetaDataRepository {
term ->
queryBuilder.must(QueryBuilders.prefixQuery(SearchRepositoryConstants.METADATA_KEYWORDS, term)));
forEachTerm(searchInputDTO.getMetadata().getAuthor(),
term ->
queryBuilder.must(QueryBuilders.prefixQuery(SearchRepositoryConstants.METADATA_CREATOR, term)));
if(searchInputDTO.getMetadata().getAuthor()!=null)
queryBuilder.must(QueryBuilders.multiMatchQuery(searchInputDTO.getMetadata().getAuthor(),
SearchRepositoryConstants.METADATA_CREATOR,
SearchRepositoryConstants.METADATA_CONTRIBUTOR,
SearchRepositoryConstants.METADATA_PUBLISHER).type(MultiMatchQueryBuilder.Type.PHRASE_PREFIX));
// forEachTerm(searchInputDTO.getMetadata().getAuthor(),
// term ->
// queryBuilder.must(QueryBuilders.prefixQuery(SearchRepositoryConstants.METADATA_CREATOR, term)));
forEachTerm(searchInputDTO.getMetadata().getLicense(),
term ->
......
......@@ -21,5 +21,6 @@ public final class SearchRepositoryConstants {
public static final String METADATA_PROJECT_ID = "project.project_id";
public static final String METADATA_CREATOR = "metadata.creator.name";
public static final String METADATA_CONTRIBUTOR = "metadata.contributor.name";
public static final String METADATA_PUBLISHER = "metadata.publisher.name";
public static final String METADATA_LICENSE = "metadata.license";
}
......@@ -56,6 +56,23 @@ public class SearchServiceIT {
}
@Test
public void testSearchByAutor() throws Exception {
final String PODLIPNIG = "Stefan Podlipnig";
final SearchInputMetadataDTO searchMetadata =
new SearchInputMetadataDTO(null, null, null, null, PODLIPNIG);
SearchInputDTO searchQuery =
new SearchInputDTO(null, searchMetadata, null, null, null, 0);
SearchResultsDTO searchResultPage =
searchService.searchResultPage(searchQuery, 0, SearchInputDTO.PAGE_SIZE);
org.junit.Assert.assertNotNull(searchResultPage.getSearchResult());
org.junit.Assert.assertTrue("At least one test hit", searchResultPage.getHitCount() >= 1);
org.junit.Assert.assertThat(searchResultPage.getSearchResult(), everyItem(
hasProperty("creator", hasProperty("name", containsString(PODLIPNIG))))
);
}
@Test
public void testProgrammingLanguageSearch() throws Exception {
final SearchInputMetadataDTO searchMetadata =
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment