From b8977669c64732bec716047df8cd1652c69f48b8 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Mon, 24 Jun 2019 17:01:24 +0300
Subject: [PATCH] Renames DMP and Dataset columns.

---
 .../main/java/eu/eudat/data/entities/DMP.java | 28 +++++++++----------
 .../java/eu/eudat/data/entities/Dataset.java  | 14 +++++-----
 ...nameDMPColumnsFinalizedDatPublishedDat.sql |  5 ++++
 .../01/RenameDatasetColumnFinalizedDat.sql    |  2 ++
 4 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 dmp-db-scema/updates/01/RenameDMPColumnsFinalizedDatPublishedDat.sql
 create mode 100644 dmp-db-scema/updates/01/RenameDatasetColumnFinalizedDat.sql

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java
index e9e26da2b..091e87205 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java
@@ -156,16 +156,16 @@ public class DMP implements DataEntity<DMP, UUID> {
     @Column(name = "\"Description\"")
     private String description;
 
-    @Column(name= "\"FinalizedDat\"")
+    @Column(name= "\"FinalizedAt\"")
     @Convert(converter = DateToUTCConverter.class)
-    private Date finalizedDat;
+    private Date finalizedAt;
 
     @Column(name = "\"isPublic\"", nullable = false)
     private boolean isPublic;
 
-    @Column(name= "\"PublishedDat\"")
+    @Column(name= "\"PublishedAt\"")
     @Convert(converter = DateToUTCConverter.class)
-    private Date publishedDat;
+    private Date publishedAt;
 
 
     public String getDescription() {
@@ -294,11 +294,11 @@ public class DMP implements DataEntity<DMP, UUID> {
         this.dmpProperties = dmpProperties;
     }
 
-    public Date getFinalizedDat() {
-        return finalizedDat;
+    public Date getFinalizedAt() {
+        return finalizedAt;
     }
-    public void setFinalizedDat(Date finalizedDat) {
-        this.finalizedDat = finalizedDat;
+    public void setFinalizedAt(Date finalizedAt) {
+        this.finalizedAt = finalizedAt;
     }
 
     public boolean isPublic() {
@@ -308,11 +308,11 @@ public class DMP implements DataEntity<DMP, UUID> {
         isPublic = aPublic;
     }
 
-    public Date getPublishedDat() {
-        return publishedDat;
+    public Date getPublishedAt() {
+        return publishedAt;
     }
-    public void setPublishedDat(Date publishedDat) {
-        this.publishedDat = publishedDat;
+    public void setPublishedAt(Date publishedAt) {
+        this.publishedAt = publishedAt;
     }
 
     @Override
@@ -330,8 +330,8 @@ public class DMP implements DataEntity<DMP, UUID> {
         this.dmpProperties = entity.getDmpProperties();
         this.isPublic = entity.isPublic;
         this.setModified(new Date());
-        if (entity.getStatus().equals(DMPStatus.FINALISED.getValue())) this.setFinalizedDat(new Date());
-        if (entity.isPublic) this.setPublishedDat(new Date());
+        if (entity.getStatus().equals(DMPStatus.FINALISED.getValue())) this.setFinalizedAt(new Date());
+        if (entity.isPublic) this.setPublishedAt(new Date());
         if (entity.getUsers() != null) this.users = entity.getUsers();
     }
 
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java
index c9638ee6d..ef2e40ed2 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java
@@ -140,9 +140,9 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 	@Column(name = "\"Description\"")
 	private String description;
 
-	@Column(name= "\"FinalizedDat\"")
+	@Column(name= "\"FinalizedAt\"")
 	@Convert(converter = DateToUTCConverter.class)
-	private Date finalizedDat;
+	private Date finalizedAt;
 
 
 	public String getDescription() {
@@ -267,11 +267,11 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 		this.datasetExternalDatasets = datasetExternalDatasets;
 	}
 
-	public Date getFinalizedDat() {
-		return finalizedDat;
+	public Date getFinalizedAt() {
+		return finalizedAt;
 	}
-	public void setFinalizedDat(Date finalizedDat) {
-		this.finalizedDat = finalizedDat;
+	public void setFinalizedAt(Date finalizedAt) {
+		this.finalizedAt = finalizedAt;
 	}
 
 	@Override
@@ -300,7 +300,7 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 		this.setStatus(entity.getStatus());
 		this.setProfile(entity.getProfile());
 		this.setModified(new Date());
-		if (entity.getStatus().equals(Status.FINALISED.getValue())) this.setFinalizedDat(new Date());
+		if (entity.getStatus().equals(Status.FINALISED.getValue())) this.setFinalizedAt(new Date());
 		if (entity.getCreator() != null) this.creator = entity.getCreator();
 	}
 
diff --git a/dmp-db-scema/updates/01/RenameDMPColumnsFinalizedDatPublishedDat.sql b/dmp-db-scema/updates/01/RenameDMPColumnsFinalizedDatPublishedDat.sql
new file mode 100644
index 000000000..b0e4e02fc
--- /dev/null
+++ b/dmp-db-scema/updates/01/RenameDMPColumnsFinalizedDatPublishedDat.sql
@@ -0,0 +1,5 @@
+ALTER TABLE public."DMP"
+  RENAME COLUMN "FinalizedDat" TO "FinalizedAt";
+  
+ALTER TABLE public."DMP"
+  RENAME COLUMN "PublishedDat" TO "PublishedAt";
\ No newline at end of file
diff --git a/dmp-db-scema/updates/01/RenameDatasetColumnFinalizedDat.sql b/dmp-db-scema/updates/01/RenameDatasetColumnFinalizedDat.sql
new file mode 100644
index 000000000..e983e21dd
--- /dev/null
+++ b/dmp-db-scema/updates/01/RenameDatasetColumnFinalizedDat.sql
@@ -0,0 +1,2 @@
+ALTER TABLE public."Dataset"
+  RENAME COLUMN "FinalizedDat" TO "FinalizedAt";
\ No newline at end of file