From a06a92ab722c15aa2b48288f5ff25048aedae59b Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Mon, 7 Dec 2020 17:08:06 +0100
Subject: [PATCH] Model update

---
 CHANGELOG.md                                        |  4 ++++
 pom.xml                                             |  2 +-
 .../geoportal/common/model/project/Project.java     | 10 +++-------
 .../geoportal/common/model/project/Status.java      | 11 +++++++++++
 .../geoportal/common/model/project/StatusPhase.java | 13 +++++++++++++
 5 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/org/gcube/application/geoportal/common/model/project/Status.java
 create mode 100644 src/main/java/org/gcube/application/geoportal/common/model/project/StatusPhase.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28f3042..0c3326e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for org.gcube.application.geoportal-common
 
+# [v1.0.3-SNAPSHOT] - 2020-12-4
+Project model update
+
+
 # [v1.0.2-SNAPSHOT] - 2020-12-4
 Model update
 
diff --git a/pom.xml b/pom.xml
index c5445bd..47b2a56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-common</artifactId>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.3-SNAPSHOT</version>
 	<name>Geoportal Common</name>
 
 
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/project/Project.java b/src/main/java/org/gcube/application/geoportal/common/model/project/Project.java
index fbb0a66..c1801f8 100644
--- a/src/main/java/org/gcube/application/geoportal/common/model/project/Project.java
+++ b/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;
 }
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/project/Status.java b/src/main/java/org/gcube/application/geoportal/common/model/project/Status.java
new file mode 100644
index 0000000..0783b0a
--- /dev/null
+++ b/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;
+	
+}
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/project/StatusPhase.java b/src/main/java/org/gcube/application/geoportal/common/model/project/StatusPhase.java
new file mode 100644
index 0000000..522532c
--- /dev/null
+++ b/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
+	
+}