Merge remote-tracking branch 'origin/master' into production
This commit is contained in:
commit
5f7c0d1694
2
pom.xml
2
pom.xml
|
@ -25,7 +25,7 @@
|
|||
<dependency> <!-- this dependency includes dependency to uoa-monitor-service-library -->
|
||||
<groupId>eu.dnetlib</groupId>
|
||||
<artifactId>uoa-monitor-service</artifactId>
|
||||
<version>1.1.9</version>
|
||||
<version>1.1.10</version>
|
||||
<classifier>library</classifier>
|
||||
</dependency>
|
||||
|
||||
|
|
|
@ -8,9 +8,11 @@ import eu.dnetlib.uoamonitorservice.UoaMonitorServiceConfiguration;
|
|||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.cache.annotation.EnableCaching;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.context.annotation.PropertySource;
|
||||
import org.springframework.context.annotation.PropertySources;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
|
||||
@SpringBootApplication(scanBasePackages = {"eu.dnetlib.irishmonitorservice"})
|
||||
@PropertySources({
|
||||
|
@ -21,6 +23,8 @@ import org.springframework.context.annotation.PropertySources;
|
|||
@PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
|
||||
})
|
||||
@EnableConfigurationProperties({GlobalVars.class, APIProperties.class, StatsToolProperties.class})
|
||||
@EnableCaching
|
||||
@EnableScheduling
|
||||
@Import({UoaMonitorServiceConfiguration.class, AuthenticationConfiguration.class})
|
||||
public class IrishMonitorServiceApplication {
|
||||
public static void main(String[] args) {
|
||||
|
|
|
@ -34,17 +34,4 @@ public class StatsToolProperties {
|
|||
public void setRepository(String repository) {
|
||||
this.repository = repository;
|
||||
}
|
||||
|
||||
public String getUrlByType(String type) {
|
||||
switch (type) {
|
||||
case "funder":
|
||||
return this.rfo;
|
||||
case "organization":
|
||||
return this.rpo;
|
||||
case "datasource":
|
||||
return this.repository;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -18,29 +18,40 @@ import java.util.stream.Collectors;
|
|||
@RequestMapping("publications")
|
||||
public class StakeholderPublicationsController {
|
||||
|
||||
@Autowired
|
||||
private StatsToolProperties properties;
|
||||
|
||||
@Autowired
|
||||
private StakeholderService service;
|
||||
|
||||
@Autowired
|
||||
private StatsToolUtils utils;
|
||||
|
||||
@RequestMapping(value = "/{type}", method = RequestMethod.GET)
|
||||
public List<StakeholderPublications> getStakeholders(@PathVariable String type) throws UnsupportedEncodingException {
|
||||
List<Stakeholder> stakeholders = this.service.getStakeholdersByTypeAndRole(type, null, false);
|
||||
String url = this.properties.getUrlByType(type);
|
||||
if (url != null) {
|
||||
List<StakeholderPublications> stakeholderPublications = new ArrayList<>();
|
||||
List<List<String>> data = this.utils.getData(url);
|
||||
data.forEach(entity -> {
|
||||
String id = entity.get(1);
|
||||
stakeholders.stream().filter(stakeholder -> stakeholder.getIndex_id().equals(id)).findFirst().ifPresent(stakeholder -> stakeholderPublications.add(new StakeholderPublications(stakeholder, Integer.parseInt(entity.get(0)))));
|
||||
});
|
||||
return stakeholderPublications;
|
||||
public List<List<String>> getResponse(String type) throws UnsupportedEncodingException {
|
||||
if(type.equals("funder")) {
|
||||
return this.utils.getFunders();
|
||||
} else if(type.equals("organization")) {
|
||||
return this.utils.getOrganizations();
|
||||
} else if(type.equals("datasource")) {
|
||||
return this.utils.getDataSources();
|
||||
} else {
|
||||
return stakeholders.stream().map(stakeholder -> new StakeholderPublications(stakeholder, 0)).collect(Collectors.toList());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/{type}", method = RequestMethod.GET)
|
||||
public List<StakeholderPublications> getStakeholders(@PathVariable String type) throws UnsupportedEncodingException, InterruptedException {
|
||||
List<Stakeholder> stakeholders = this.service.getStakeholdersByTypeAndRole(type, null, false);
|
||||
List<StakeholderPublications> stakeholderPublications = new ArrayList<>();
|
||||
List<List<String>> data = this.getResponse(type);
|
||||
List<Stakeholder> remain = new ArrayList<>(stakeholders);
|
||||
if (data != null) {
|
||||
data.forEach(entity -> {
|
||||
String id = entity.get(1);
|
||||
stakeholders.stream().filter(stakeholder -> stakeholder.getIndex_id().equals(id)).findFirst().ifPresent(stakeholder -> {
|
||||
remain.remove(stakeholder);
|
||||
stakeholderPublications.add(new StakeholderPublications(stakeholder, Integer.parseInt(entity.get(0))));
|
||||
});
|
||||
});
|
||||
}
|
||||
remain.forEach(stakeholder -> stakeholderPublications.add(new StakeholderPublications(stakeholder, 0)));
|
||||
return stakeholderPublications;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,28 +1,73 @@
|
|||
package eu.dnetlib.irishmonitorservice.utils;
|
||||
|
||||
import eu.dnetlib.irishmonitorservice.configuration.properties.StatsToolProperties;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.cache.annotation.CacheEvict;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.client.RestClientException;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
import org.springframework.web.util.UriComponentsBuilder;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URI;
|
||||
import java.net.URLDecoder;
|
||||
import java.net.URLEncoder;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class StatsToolUtils {
|
||||
private final Logger logger = LogManager.getLogger(StatsToolUtils.class);
|
||||
|
||||
@Autowired
|
||||
private StatsToolProperties properties;
|
||||
|
||||
@Autowired
|
||||
private RestTemplate restTemplate;
|
||||
|
||||
public List<List<String>> getData(String url) throws UnsupportedEncodingException {
|
||||
String service = url.substring(0, url.indexOf('=') + 1);
|
||||
String json = URLDecoder.decode(url.substring(url.indexOf('=') + 1), "UTF-8");
|
||||
URI uri = UriComponentsBuilder.fromUriString(service + json).build().encode().toUri();
|
||||
ResponseEntity<Data> data = restTemplate.getForEntity(uri, Data.class);
|
||||
return data.getBody().getData();
|
||||
@Cacheable(value = "funders")
|
||||
public List<List<String>> getFunders() throws UnsupportedEncodingException {
|
||||
String url = this.properties.getRfo();
|
||||
return this.getData(url);
|
||||
}
|
||||
|
||||
@Cacheable(value = "organizations")
|
||||
public List<List<String>> getOrganizations() throws UnsupportedEncodingException {
|
||||
String url = this.properties.getRpo();
|
||||
return this.getData(url);
|
||||
}
|
||||
|
||||
@Cacheable(value = "datasources")
|
||||
public List<List<String>> getDataSources() throws UnsupportedEncodingException {
|
||||
String url = this.properties.getRepository();
|
||||
return this.getData(url);
|
||||
}
|
||||
|
||||
private List<List<String>> getData(String url) throws UnsupportedEncodingException {
|
||||
if(url != null) {
|
||||
String service = url.substring(0, url.indexOf('=') + 1);
|
||||
String json = URLDecoder.decode(url.substring(url.indexOf('=') + 1), "UTF-8");
|
||||
URI uri = UriComponentsBuilder.fromUriString(service + json).build().encode().toUri();
|
||||
try {
|
||||
ResponseEntity<Data> data = restTemplate.getForEntity(uri, Data.class);
|
||||
if(data.getStatusCode() == HttpStatus.OK) {
|
||||
return data.getBody().getData();
|
||||
}
|
||||
} catch (RestClientException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@CacheEvict(allEntries = true, value = {"funders", "organizations", "datasources"})
|
||||
@Scheduled(cron = "0 0 0 * * *") // Reset cache every day at 00:00
|
||||
public void clearCacheAtMidnight() {
|
||||
logger.info("Cache cleared at " + LocalDateTime.now());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue