Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring

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),
-    Viewer((short) 1),
+    User((short) 1),
     DescriptionContributor((short) 2),
     Reviewer((short) 3);
 

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 Viewer -> m.setRole(DmpUserRole.User);
+                case User -> m.setRole(DmpUserRole.User);
                 case Owner -> m.setRole(DmpUserRole.Owner);
                 case DescriptionContributor -> m.setRole(DmpUserRole.DescriptionContributor);
                 case Reviewer -> m.setRole(DmpUserRole.Reviewer);