CHANGELOG.md

@@ -2,6 +2,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for org.gcube.application.geoportal-common
 
+# [v1.0.3] - 2020-12-4
+Project model update
+
+
+# [v1.0.2-SNAPSHOT] - 2020-12-4
+Model update
+
 ## [v1.0.1] - 2020-11-11
 
 Model update

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-common</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.3</version>
 	<name>Geoportal Common</name>
 
 

src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java

@@ -22,7 +22,7 @@ public class LayerConcessione extends SDILayerDescriptor{
 	//layer
 	private String layerName;
 	private String wmsLink;
-	
+	private String workspace;
 	
 	
 	//1.Identificazione

src/main/java/org/gcube/application/geoportal/common/model/legacy/SDILayerDescriptor.java

@@ -18,5 +18,8 @@ public abstract class SDILayerDescriptor extends AssociatedContent{
 	public abstract String getWmsLink();
 	public abstract void setWmsLink(String wmsLink);
 	
-	
+	public abstract void setWorkspace(String workspace);
+	public abstract String getWorkspace();
+	public abstract BBOX getBbox();
+	public abstract void setBbox(BBOX toSet);
 }

src/main/java/org/gcube/application/geoportal/common/model/project/Project.java

@@ -31,17 +31,13 @@ public class Project {
 
  * 
  */
-
-	public static enum Status{
-		VALID,INVALID,PUBLISHED
-	}
 	
 	private String _id;
 	private String profile_id;
-	private PublicationDetails publication;
 	private Status status;
-	private BasicJSONObject document;
+	private Object document;
 	private Centroid centroid;
+	private PublicationDetails publication;
 	
-		
+	private String json;
 }

src/main/java/org/gcube/application/geoportal/common/model/project/Status.java

@@ -0,0 +1,11 @@
+package org.gcube.application.geoportal.common.model.project;
+
+import java.util.List;
+
+public class Status {
+
+	
+	private StatusPhase phase;
+	private List<String> messages;
+	
+}

src/main/java/org/gcube/application/geoportal/common/model/project/StatusPhase.java

@@ -0,0 +1,13 @@
+package org.gcube.application.geoportal.common.model.project;
+
+public enum StatusPhase {
+
+	DRAFT,
+	UNDER_VALIDATION,
+	INVALID,
+	VALID,
+	UNDER_PUBLICATION,
+	PUBLICATION_ERROR,
+	PUBLISHED
+	
+}