Concessione : Fixed abstract management

geoportal-client/pom.xml

@@ -17,7 +17,6 @@
 
 	<properties>
 		<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
-		<sis.version>1.0</sis.version>
 	</properties>
 
 	<scm>
@@ -54,16 +53,10 @@
 			<version>[1.0.0,2.0.0)</version>
 		</dependency>
 
-		<!-- TEST -->
-		<dependency>
-			<groupId>org.gcube.application.cms</groupId>
-			<artifactId>cms-test-commons</artifactId>
-			<scope>test</scope>
-		</dependency>
 
 
 		<!-- Client for legacy -->
-		 <!-- jackson java time -->
+		<!-- jackson java time -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
@@ -75,6 +68,13 @@
 			<artifactId>jersey-media-json-jackson</artifactId>
 		</dependency>
 
+		<!-- TEST -->
+		<dependency>
+			<groupId>org.gcube.application.cms</groupId>
+			<artifactId>cms-test-commons</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>

geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManagerI.java

@@ -1,10 +1,6 @@
 package org.gcube.application.geoportal.client.legacy;
 
-import org.gcube.application.geoportal.common.model.legacy.Concessione;
+import org.gcube.application.geoportal.common.model.legacy.*;
-import org.gcube.application.geoportal.common.model.legacy.InputStreamDescriptor;
-import org.gcube.application.geoportal.common.model.legacy.LayerConcessione;
-import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo;
-import org.gcube.application.geoportal.common.model.legacy.UploadedImage;
 import org.gcube.application.geoportal.common.rest.MongoConcessioni;
 import org.gcube.application.geoportal.common.rest.TempFile;
 
@@ -15,14 +11,14 @@ public interface ConcessioniManagerI extends MongoConcessioni{
 	public Concessione addPiantaFineScavo(LayerConcessione toAdd,TempFile...files)throws Exception;
 	public Concessione setPosizionamento(LayerConcessione toSet,TempFile...files)throws Exception;
 	public Concessione setRelazioneScavo(RelazioneScavo toSet,TempFile...files)throws Exception;
-	
+	public Concessione setAbstractRelazioneScavo(AbstractRelazione toSet, TempFile...files)throws Exception;
 	
 	
 	public Concessione addImmagineRappresentativa(UploadedImage toAdd,InputStreamDescriptor f) throws Exception;
 	public Concessione addPiantaFineScavo(LayerConcessione toAdd,InputStreamDescriptor...files)throws Exception;
 	public Concessione setPosizionamento(LayerConcessione toSet,InputStreamDescriptor...files)throws Exception;
 	public Concessione setRelazioneScavo(RelazioneScavo toSet,InputStreamDescriptor f)throws Exception;
-	
+	public Concessione setAbstractRelazioneScavo(AbstractRelazione toSet,InputStreamDescriptor f)throws Exception;
 	
 	public Concessione publish() throws Exception;
 	public void delete() throws Exception;

geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioni.java

@@ -5,13 +5,9 @@ import java.util.ArrayList;
 import javax.ws.rs.client.WebTarget;
 
 import org.gcube.application.geoportal.client.DefaultMongoConcessioni;
+import org.gcube.application.geoportal.common.model.legacy.*;
 import org.gcube.application.geoportal.common.utils.FileSets;
-import org.gcube.application.geoportal.common.model.legacy.Concessione;
 import org.gcube.application.geoportal.common.model.legacy.Concessione.Paths;
-import org.gcube.application.geoportal.common.model.legacy.InputStreamDescriptor;
-import org.gcube.application.geoportal.common.model.legacy.LayerConcessione;
-import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo;
-import org.gcube.application.geoportal.common.model.legacy.UploadedImage;
 import org.gcube.application.geoportal.common.rest.TempFile;
 import org.gcube.application.geoportal.common.utils.StorageUtils;
 import org.gcube.common.clients.delegates.ProxyDelegate;
@@ -107,6 +103,16 @@ public class StatefulMongoConcessioni extends DefaultMongoConcessioni implements
 		return currentC;
 	}
 
+	@Override
+	public Concessione setAbstractRelazioneScavo(AbstractRelazione toSet, TempFile... files) throws Exception {
+		if(currentC==null) throw new Exception("Invalid operation : current Concessione is null.");
+		currentC.setAbstractRelazione(toSet);
+		currentC=replace(currentC);
+
+		currentC=super.registerFileSet(currentC.getMongo_id(),
+				FileSets.build(Paths.ABSTRACT_RELAZIONE,files).getTheRequest());
+		return currentC;
+	}
 
 
 	@Override
@@ -129,4 +135,8 @@ public class StatefulMongoConcessioni extends DefaultMongoConcessioni implements
 		return setRelazioneScavo(toSet,FileSets.asTemp(storage,f));
 	}
 
+	@Override
+	public Concessione setAbstractRelazioneScavo(AbstractRelazione toSet, InputStreamDescriptor f) throws Exception {
+		return setAbstractRelazioneScavo(toSet,FileSets.asTemp(storage,f));
+	}
 }

geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatefulClientTests.java

@@ -34,8 +34,11 @@ public class StatefulClientTests extends BasicVreTests{
 		Concessione toRegister= TestModel.prepareEmptyConcessione();
 		toRegister.setNome("Mock module");
 		manager.createNew(toRegister);
-		
+
-		UploadedImage toRegisterImg= TestModel.prepareConcessione().getImmaginiRappresentative().get(0);
+		Concessione source=TestModel.prepareConcessione();
+
+
+		UploadedImage toRegisterImg= source.getImmaginiRappresentative().get(0);
 		
 		// TEMP Files are hosted in INFRASTRUCTURE's VOLATILE AREA
 		TempFile toUpload=storage.putOntoStorage(
@@ -52,16 +55,23 @@ public class StatefulClientTests extends BasicVreTests{
 
 
 		//Relazione
-		manager.setRelazioneScavo(TestModel.prepareConcessione().getRelazioneScavo(),
+		manager.setRelazioneScavo(source.getRelazioneScavo(),
 				storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "relazione_it.pdf"),
 				storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "relazione_en.pdf"));
-		
+
+		//Abstract
+		manager.setAbstractRelazioneScavo(
+				source.getAbstractRelazione(),
+				storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "abstract_relazione_it.pdf"),
+				storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "abstract_relazione_en.pdf"));
+
+
 		// Posizionamento scavo
-		manager.setPosizionamento(TestModel.prepareConcessione().getPosizionamentoScavo(),
+		manager.setPosizionamento(source.getPosizionamentoScavo(),
 				storage.putOntoStorage(new File(TestModel.getBaseFolder(),"pos.shp"), "pos.shp"));
 		
 		// Piante 
-		manager.addPiantaFineScavo(TestModel.prepareConcessione().getPianteFineScavo().get(0),
+		manager.addPiantaFineScavo(source.getPianteFineScavo().get(0),
 				storage.putOntoStorage(new File(TestModel.getBaseFolder(),"pianta.shp"), "pianta.shp"),
 				storage.putOntoStorage(new File(TestModel.getBaseFolder(),"pianta.shx"), "pianta.shx"));
 		

geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java

@@ -93,7 +93,10 @@ public class StatelessClientTests extends BasicVreTests{
 
 		client.registerFileSet(mongoId,
 				FileSets.prepareRequest(storage,Paths.RELAZIONE,new File(TestModel.getBaseFolder(),"relazione.pdf")));
-		
+
+		client.registerFileSet(mongoId,
+				FileSets.prepareRequest(storage,Paths.RELAZIONE,new File(TestModel.getBaseFolder(),"relazione.pdf")));
+
 		client.registerFileSet(mongoId,
 				FileSets.prepareRequest(storage,Paths.imgByIndex(0),new File(TestModel.getBaseFolder(),"immagine.png")));
 

pom.xml

@@ -33,9 +33,10 @@
 		<module>geoportal-client</module>
 		<module>geoportal-common</module>
 		<module>cms-test-commons</module>
+        <module>use-cases</module>
 
 
-	</modules>
+    </modules>
 
 
 
@@ -70,7 +71,11 @@
 				<artifactId>cms-test-commons</artifactId>
 				<version>[1.0.0-SNAPSHOT,2.0.0)</version>
 			</dependency>
-
+			<dependency>
+				<groupId>org.gcube.application.cms</groupId>
+				<artifactId>use-cases</artifactId>
+				<version>[1.0.0-SNAPSHOT,2.0.0)</version>
+			</dependency>
 
 			<dependency>
 				<groupId>org.projectlombok</groupId>