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/ExpirationTypeEnum.java

@@ -0,0 +1,20 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum ExpirationTypeEnum {
+
+    AMENDMENT("AMENDMENT"),
+    EVALUATION("EVALUATION");
+
+    private String value;
+
+    ExpirationTypeEnum(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+}

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

@@ -11,7 +11,9 @@ public enum NotificationTypeEnum {
     AMENDMENT_CLOSED("AMENDMENT_CLOSED"),
     NDG_GENERATION("NDG_GENERATION"),
     EVALUATION_CREATION("EVALUATION_CREATION"),
-    EVALUATION_EXPIRED("EVALUATION_EXPIRED");
+    EVALUATION_EXPIRED("EVALUATION_EXPIRED"),
+    AMENDMENT_EXPIRATION_REMINDER("AMENDMENT_EXPIRATION_REMINDER"),
+    EVALUATION_EXPIRATION_REMINDER("EVALUATION_EXPIRATION_REMINDER");
 
     private final String 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"),
@@ -134,6 +136,7 @@ public enum UserActionContextEnum {
     /** Dashboard action context **/
     GET_DASHBOARD_WIDGET_FOR_SUPER_ADMIN("GET_DASHBOARD_WIDGET_FOR_SUPER_ADMIN"),
     GET_DASHBOARD_WIDGET_FOR_BENEFICIARY("GET_DASHBOARD_WIDGET_FOR_BENEFICIARY"),
+    GET_APPLICATION_DETAILS("GET_APPLICATION_DETAILS"),
 
     /** Evaluation criteria action context **/
     GET_EVALUATION_CRITERIA("GET_EVALUATION_CRITERIA"),