MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

--

This commit is contained in:
Nikolaos Laskaris 2017-11-23 17:34:35 +02:00
parent a00eec68d8
commit 06272c79da
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dmp-backend/src/main/java/rest/entities/DMPs.java
View File

@ -48,7 +48,9 @@ import entities.DMPProfile;
import entities.Dataset;
import entities.DatasetProfile;
import entities.DatasetProfileRuleset;
import entities.Organisation;
import entities.Project;
import entities.Researcher;
import entities.UserInfo;
import entities.responses.IDLabelPair;
import helpers.SerializerProvider;
@ -91,9 +93,14 @@ public class DMPs {
}
@RequestMapping(method = RequestMethod.GET, value = { "/dmps/{id}" }, produces="application/json")
public @ResponseBody ResponseEntity<Object> getDMP(@PathVariable("id") String id){
public @ResponseBody ResponseEntity<Object> getDMP(@PathVariable("id") String id, @RequestParam(value="eager", defaultValue="false") boolean eager){
try {
DMP dmp = dMPDao.read(UUID.fromString(id));
if(eager) {
dmp.getOrganisations().size(); //used only for lazy load trigger...
dmp.getResearchers().size(); //used only for lazy load trigger...
dmp.getUsers().size(); //used only for lazy load trigger...
}
return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(dmp));
}
catch(Exception ex) {
@ -101,6 +108,7 @@ public class DMPs {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage());
}
}
@RequestMapping(method = RequestMethod.GET, value = { "/dmp/listDMPLabelID" }, produces="text/plain")
public @ResponseBody ResponseEntity<Object> listDmpLabelID(){

6
dmp-backend/src/main/java/rest/entities/Projects.java
View File

@ -117,11 +117,13 @@ public class Projects {
}
@RequestMapping(method = RequestMethod.GET, value = { "/projects/{id}" }, produces="application/json")
public @ResponseBody ResponseEntity<Object> getProject(@PathVariable("id") String id) {
public @ResponseBody ResponseEntity<Object> getProject(@PathVariable("id") String id, @RequestParam(value="eager", defaultValue="false") boolean eager) {
try {
Project project = projectDao.read(UUID.fromString(id));
System.out.println(project.getId().toString());
if(eager) {
project.getDmps().size(); //used only for lazy load trigger...
}
return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(project));
}

3
dmp-backend/src/test/resources/applicationContextTEST.xml
View File

@ -35,9 +35,8 @@
<constructor-arg type = "String" value = "${proxy.allowed.host}"/>
</bean>
<bean id="externalUrlLoader" class="proxy.config.ConfigLoader">
<constructor-arg type="java.lang.String" value = "classpath:ExternalUrlsTEST.xml"/>
<constructor-arg type="java.lang.String" value = "file:///home/nikolas/git/OpenAIRE-EUDAT-DMP/dmp-backend/src/test/resources/ExternalUrlsTEST.xml"/>
</bean>