From 06272c79daa3f4ee60b61266c77452d4cf16121d Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Thu, 23 Nov 2017 17:34:35 +0200
Subject: [PATCH] --

---
 dmp-backend/src/main/java/rest/entities/DMPs.java      | 10 +++++++++-
 dmp-backend/src/main/java/rest/entities/Projects.java  |  6 ++++--
 .../src/test/resources/applicationContextTEST.xml      |  3 +--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dmp-backend/src/main/java/rest/entities/DMPs.java b/dmp-backend/src/main/java/rest/entities/DMPs.java
index 254dbf304..ebfe19a82 100644
--- a/dmp-backend/src/main/java/rest/entities/DMPs.java
+++ b/dmp-backend/src/main/java/rest/entities/DMPs.java
@@ -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(){
diff --git a/dmp-backend/src/main/java/rest/entities/Projects.java b/dmp-backend/src/main/java/rest/entities/Projects.java
index 88101c696..e2966a77d 100644
--- a/dmp-backend/src/main/java/rest/entities/Projects.java
+++ b/dmp-backend/src/main/java/rest/entities/Projects.java
@@ -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));
 		}
diff --git a/dmp-backend/src/test/resources/applicationContextTEST.xml b/dmp-backend/src/test/resources/applicationContextTEST.xml
index 91f49658e..2052784bf 100644
--- a/dmp-backend/src/test/resources/applicationContextTEST.xml
+++ b/dmp-backend/src/test/resources/applicationContextTEST.xml
@@ -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>