From b9b3fb3e7877a72de91b32fc723891b60fd28484 Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Wed, 22 May 2024 17:45:01 +0300
Subject: [PATCH] rename User to Viewer

---
 .../org/opencdmp/commons/enums/DmpUserRole.java    |  2 +-
 .../commonmodels/DmpUserCommonModelBuilder.java    |  2 +-
 .../org/opencdmp/service/dmp/DmpServiceImpl.java   |  2 +-
 .../web/src/main/resources/config/permissions.yml  | 14 +++++---------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/backend/core/src/main/java/org/opencdmp/commons/enums/DmpUserRole.java b/backend/core/src/main/java/org/opencdmp/commons/enums/DmpUserRole.java
index b641e64d5..f74a633c2 100644
--- a/backend/core/src/main/java/org/opencdmp/commons/enums/DmpUserRole.java
+++ b/backend/core/src/main/java/org/opencdmp/commons/enums/DmpUserRole.java
@@ -8,7 +8,7 @@ import java.util.Map;
 public enum DmpUserRole implements DatabaseEnum<Short> {
 
     Owner((short) 0),
-    User((short) 1),
+    Viewer((short) 1),
     DescriptionContributor((short) 2),
     Reviewer((short) 3);
 
diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DmpUserCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DmpUserCommonModelBuilder.java
index 7ce8ae9bb..e63413c8b 100644
--- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DmpUserCommonModelBuilder.java
+++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DmpUserCommonModelBuilder.java
@@ -59,7 +59,7 @@ public class DmpUserCommonModelBuilder extends BaseCommonModelBuilder<DmpUserMod
         for (DmpUserEntity d : data) {
             DmpUserModel m = new DmpUserModel();
             switch (d.getRole()){
-                case User -> m.setRole(DmpUserRole.User);
+                case Viewer -> m.setRole(DmpUserRole.Viewer);
                 case Owner -> m.setRole(DmpUserRole.Owner);
                 case DescriptionContributor -> m.setRole(DmpUserRole.DescriptionContributor);
                 case Reviewer -> m.setRole(DmpUserRole.Reviewer);
diff --git a/backend/core/src/main/java/org/opencdmp/service/dmp/DmpServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/dmp/DmpServiceImpl.java
index 37f491fdd..ef4c6d24b 100644
--- a/backend/core/src/main/java/org/opencdmp/service/dmp/DmpServiceImpl.java
+++ b/backend/core/src/main/java/org/opencdmp/service/dmp/DmpServiceImpl.java
@@ -2032,7 +2032,7 @@ public class DmpServiceImpl implements DmpService {
 
             switch (model.getRole()){
                 case Owner -> persist.setRole(DmpUserRole.Owner);
-                case User -> persist.setRole(DmpUserRole.User);
+                case Viewer -> persist.setRole(DmpUserRole.Viewer);
                 case DescriptionContributor -> persist.setRole(DmpUserRole.DescriptionContributor);
                 case Reviewer -> persist.setRole(DmpUserRole.Reviewer);
                 default -> throw new MyApplicationException("Unrecognized Type " + model.getRole().getValue());
diff --git a/backend/web/src/main/resources/config/permissions.yml b/backend/web/src/main/resources/config/permissions.yml
index 783899a01..86719eda0 100644
--- a/backend/web/src/main/resources/config/permissions.yml
+++ b/backend/web/src/main/resources/config/permissions.yml
@@ -173,7 +173,7 @@ permissions:
       dmp:
         roles:
           - Owner
-          - User
+          - Viewer
           - DescriptionContributor
           - Reviewer
       clients: [ ]
@@ -185,7 +185,6 @@ permissions:
       dmp:
         roles:
           - Owner
-          - User
           - DescriptionContributor
           - Reviewer
       clients: [ ]
@@ -292,7 +291,7 @@ permissions:
       dmp:
         roles:
           - Owner
-          - User
+          - Viewer
           - DescriptionContributor
           - Reviewer
       claims: [ ]
@@ -408,7 +407,7 @@ permissions:
       dmp:
         roles:
           - Owner
-          - User
+          - Viewer
           - DescriptionContributor
           - Reviewer
       clients: [ ]
@@ -420,9 +419,6 @@ permissions:
       dmp:
         roles:
           - Owner
-          - User
-          - DescriptionContributor
-          - Reviewer
       clients: [ ]
       allowAnonymous: false
       allowAuthenticated: false
@@ -840,7 +836,7 @@ permissions:
       dmp:
         roles:
           - Owner
-          - User
+          - Viewer
           - DescriptionContributor
           - Reviewer
       clients: [ ]
@@ -852,7 +848,7 @@ permissions:
       dmp:
         roles:
           - Owner
-          - User
+          - Viewer
           - DescriptionContributor
           - Reviewer
       claims: [ ]