Resolved conflicts

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

@@ -9,6 +9,8 @@ public enum EmailScenarioTypeEnum {
     APPLICATION_AMENDMENT_EXPIRED("APPLICATION_AMENDMENT_EXPIRED"),
     APPLICATION_AMENDMENT_REMINDER("APPLICATION_AMENDMENT_REMINDER"),
     APPLICATION_APPROVED("APPLICATION_APPROVED"),
+    USER_CREATION("USER_CREATION"),
+    PASSWORD_RESET_REQUEST("PASSWORD_RESET_REQUEST"),
     APPLICATION_REJECTED("APPLICATION_REJECTED");
 
     private final String value;

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

@@ -0,0 +1,27 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum NotificationEnum {
+    //status
+    READ("READ"), UNREAD("UNREAD");
+
+    private final String value;
+
+    NotificationEnum(String value) {
+
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+
+        return value;
+    }
+
+    @Override
+    public String toString() {
+
+        return String.valueOf(value);
+    }
+}

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

@@ -0,0 +1,34 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum NotificationTypeEnum {
+    CALL_CREATED("CALL_CREATED"),
+    APPLICATION_SUBMISSION("APPLICATION_SUBMISSION"),
+    AMENDMENT_CREATION("AMENDMENT_CREATION"),
+    EVALUATION_RESULT("EVALUATION_RESULT"),
+    AMENDMENT_EXPIRED("AMENDMENT_EXPIRED"),
+    AMENDMENT_CLOSED("AMENDMENT_CLOSED"),
+    NDG_GENERATION("NDG_GENERATION"),
+    EVALUATION_CREATION("EVALUATION_CREATION"),
+    EVALUATION_EXPIRED("EVALUATION_EXPIRED");
+
+    private final String value;
+
+    NotificationTypeEnum(String value) {
+
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+
+        return value;
+    }
+
+    @Override
+    public String toString() {
+
+        return String.valueOf(value);
+    }
+}

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

@@ -24,7 +24,9 @@ public enum UserActionContextEnum {
     VALIDATE_EXISTING_USER_WITH_SPID_TOKEN("VALIDATE_EXISTING_USER_WITH_SPID_TOKEN"),
     GET_VALID_USER_DETAILS("GET_VALID_USER_DETAILS"),
     GET_ALL_USERS_BY_ROLE("GET_ALL_USERS_BY_ROLE"),
-
+    CHANGE_USER_PASSWORD("CHANGE_USER_PASSWORD"),
+    INITIATE_PASSWORD_RESET_REQUEST("INITIATE_PASSWORD_RESET_REQUEST"),
+    RESET_USER_PASSWORD("RESET_USER_PASSWORD"),
     /** application action context **/
     GET_APPLICATION("GET_APPLICATION"),
     CREATE_UPDATE_APPLICATION_FORM("CREATE_UPDATE_APPLICATION_FORM"),