hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 06:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CST-5246] Added integration tests for search topics by source

Browse Source
This commit is contained in:
Luca Giamminonni
2022-02-17 15:04:38 +01:00
parent d856cf31f2
commit 4219a69f70
3 changed files with 132 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dspace-api/src/main/java/org/dspace/app/nbevent/service/impl/NBEventServiceImpl.java
View File

@@ -107,8 +107,7 @@ public class NBEventServiceImpl implements NBEventService {
solrQuery.setRows(0);
solrQuery.setQuery("*:*");
solrQuery.setFacet(true);
// we would like to get eventually topic that has no longer active nb events
solrQuery.setFacetMinCount(0);
solrQuery.setFacetMinCount(1);
solrQuery.addFacetField(TOPIC);
QueryResponse response;
try {
@@ -125,8 +124,7 @@ public class NBEventServiceImpl implements NBEventService {
solrQuery.setRows(0);
solrQuery.setQuery("*:*");
solrQuery.setFacet(true);
// we would like to get eventually topic that has no longer active nb events
solrQuery.setFacetMinCount(0);
solrQuery.setFacetMinCount(1);
solrQuery.addFacetField(TOPIC);
solrQuery.addFilterQuery("source:" + source);
QueryResponse response;
@@ -164,8 +162,7 @@ public class NBEventServiceImpl implements NBEventService {
solrQuery.setRows(0);
solrQuery.setQuery(TOPIC + ":" + topicId.replaceAll("!", "/"));
solrQuery.setFacet(true);
// we would like to get eventually topic that has no longer active nb events
solrQuery.setFacetMinCount(0);
solrQuery.setFacetMinCount(1);
solrQuery.addFacetField(TOPIC);
QueryResponse response;
try {
@@ -194,16 +191,20 @@ public class NBEventServiceImpl implements NBEventService {
@Override
public List<NBTopic> findAllTopicsBySource(String source, long offset, long count) {
if (source != null && isNotSupportedSource(source)) {
return null;
}
SolrQuery solrQuery = new SolrQuery();
solrQuery.setRows(0);
solrQuery.setQuery("*:*");
solrQuery.setFacet(true);
// we would like to get eventually topic that has no longer active nb events
solrQuery.setFacetMinCount(0);
solrQuery.setFacetMinCount(1);
solrQuery.setFacetLimit((int) (offset + count));
solrQuery.addFacetField(TOPIC);
if (source != null) {
solrQuery.addFilterQuery("source:" + source);
solrQuery.addFilterQuery(SOURCE + ":" + source);
}
QueryResponse response;
List<NBTopic> nbTopics = null;
@@ -236,7 +237,7 @@ public class NBEventServiceImpl implements NBEventService {
UpdateRequest updateRequest = new UpdateRequest();
String topic = dto.getTopic();
if (!ArrayUtils.contains(getSupportedSources(), dto.getSource())) {
if (isNotSupportedSource(dto.getSource())) {
throw new IllegalArgumentException("The source of the given event is not supported: " + dto.getSource());
}
@@ -374,7 +375,7 @@ public class NBEventServiceImpl implements NBEventService {
@Override
public NBSource findSource(String sourceName) {
if (!ArrayUtils.contains(getSupportedSources(), sourceName)) {
if (isNotSupportedSource(sourceName)) {
return null;
}
@@ -382,7 +383,7 @@ public class NBEventServiceImpl implements NBEventService {
solrQuery.setRows(0);
solrQuery.addFilterQuery(SOURCE + ":" + sourceName);
solrQuery.setFacet(true);
solrQuery.setFacetMinCount(0);
solrQuery.setFacetMinCount(1);
solrQuery.addFacetField(SOURCE);
QueryResponse response;
@@ -424,6 +425,10 @@ public class NBEventServiceImpl implements NBEventService {
return getSupportedSources().length;
}
private boolean isNotSupportedSource(String source) {
return !ArrayUtils.contains(getSupportedSources(), source);
}
private String[] getSupportedSources() {
return configurationService.getArrayProperty("nbevent.sources", new String[] { NBEvent.OPENAIRE_SOURCE });
}