From f87860160901972d835359d18256f4c2f09c1827 Mon Sep 17 00:00:00 2001
From: Thomas Georgios Giannos <thgiannos@cite.gr>
Date: Tue, 7 Nov 2023 12:28:40 +0200
Subject: [PATCH] Added missing converter annotations on entity enums

---
 dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java    | 3 ++-
 .../core/src/main/java/eu/eudat/data/DmpUserEntity.java        | 3 ++-
 .../core/src/main/java/eu/eudat/data/EntityDoiEntity.java      | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java
index bb26c7b87..27bd32e3e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java
@@ -4,6 +4,7 @@ import eu.eudat.commons.enums.DmpAccessType;
 import eu.eudat.commons.enums.DmpStatus;
 import eu.eudat.commons.enums.IsActive;
 import eu.eudat.data.converters.DateToUTCConverter;
+import eu.eudat.data.converters.enums.DmpStatusConverter;
 import eu.eudat.data.converters.enums.IsActiveConverter;
 import jakarta.persistence.*;
 
@@ -30,8 +31,8 @@ public class DmpEntity {
 
     public static final String _version = "version";
 
-    @Enumerated(EnumType.STRING)
     @Column(name = "status", nullable = false)
+    @Convert(converter = DmpStatusConverter.class)
     private DmpStatus status;
 
     public static final String _status = "status";
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DmpUserEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpUserEntity.java
index 45037d81a..39c0dc146 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/DmpUserEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpUserEntity.java
@@ -2,6 +2,7 @@ package eu.eudat.data;
 
 import eu.eudat.commons.enums.DmpUserRole;
 import eu.eudat.commons.enums.IsActive;
+import eu.eudat.data.converters.enums.DmpUserRoleConverter;
 import eu.eudat.data.converters.enums.IsActiveConverter;
 import jakarta.persistence.*;
 
@@ -27,8 +28,8 @@ public class DmpUserEntity {
 
     public static final String _user = "user";
 
-    @Enumerated(EnumType.STRING)
     @Column(name = "status", nullable = false)
+    @Convert(converter = DmpUserRoleConverter.class)
     private DmpUserRole role;
 
     public static final String _role = "role";
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java
index 3637bee88..2fd0edb7a 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java
@@ -3,6 +3,7 @@ package eu.eudat.data;
 import eu.eudat.commons.enums.EntityType;
 import eu.eudat.commons.enums.IsActive;
 import eu.eudat.data.converters.DateToUTCConverter;
+import eu.eudat.data.converters.enums.EntityTypeConverter;
 import eu.eudat.data.converters.enums.IsActiveConverter;
 import eu.eudat.data.old.DMP;
 import jakarta.persistence.*;
@@ -21,8 +22,8 @@ public class EntityDoiEntity {
 
     public static final String _id = "id";
 
-    @Enumerated(EnumType.STRING)
     @Column(name = "entity_type", nullable = false)
+    @Convert(converter = EntityTypeConverter.class)
     private EntityType entityType;
 
     public static final String _entityType = "entityType";