resolved conflicts

src/main/java/net/gepafin/tendermanagement/enums/CallStatusEnum.java

@@ -1,7 +1,12 @@
 package net.gepafin.tendermanagement.enums;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public enum CallStatusEnum {
 
         DRAFT("DRAFT"),
@@ -19,4 +24,19 @@ public enum CallStatusEnum {
         public String getValue() {
             return value;
         }
+
+    @JsonCreator
+    public static CallStatusEnum fromValue(String value) {
+        for (CallStatusEnum b : CallStatusEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+    public static List<String> getStatusValues() {
+        return Arrays.stream(CallStatusEnum.values())
+                .map(CallStatusEnum::getValue)
+                .collect(Collectors.toList());
+    }
 }

src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java

@@ -0,0 +1,22 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum RoleStatusEnum {
+
+	ROLE_BENEFICIARY("ROLE_BENEFICIARY"),
+	ROLE_SUPER_ADMIN("ROLE_SUPER_ADMIN"),
+	ROLE_PRE_INSTRUCTOR("ROLE_PRE_INSTRUCTOR"),
+	ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR");
+
+    private String value;
+
+    RoleStatusEnum(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+}