Resolved conflicts

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

@@ -4,7 +4,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum ApplicationStatusForEvaluation {
     APPROVED("APPROVED"),
-    REJECTED("REJECTED");
+    REJECTED("REJECTED"),
+    ADMISSIBLE("ADMISSIBLE"),
+    TECHNICAL_EVALUATION("TECHNICAL_EVALUATION");
 
     private String value;
 

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

@@ -15,7 +15,8 @@ public enum ApplicationStatusTypeEnum {
     EVALUATION("EVALUATION"),
     APPOINTMENT("APPOINTMENT"),
     NDG("NDG"),
-    ADMISSIBLE("ADMISSIBLE");
+    ADMISSIBLE("ADMISSIBLE"),
+    TECHNICAL_EVALUATION("TECHNICAL_EVALUATION");
 
     private String value;
 

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

@@ -8,7 +8,7 @@ public enum EmailScenarioTypeEnum {
     APPLICATION_AMENDMENT_REQUESTED("APPLICATION_AMENDMENT_REQUESTED"),
     APPLICATION_AMENDMENT_EXPIRED("APPLICATION_AMENDMENT_EXPIRED"),
     APPLICATION_AMENDMENT_REMINDER("APPLICATION_AMENDMENT_REMINDER"),
-    APPLICATION_APPROVED("APPLICATION_APPROVED"),
+    APPLICATION_ADMISSIBLE("APPLICATION_ADMISSIBLE"),
     USER_CREATION("USER_CREATION"),
     PASSWORD_RESET_REQUEST("PASSWORD_RESET_REQUEST"),
     APPLICATION_REJECTED("APPLICATION_REJECTED");

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

@@ -4,14 +4,14 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 
 public enum MatchModeEnum {
-    STARTSWITH("Starts with"),
-    ENDSWITH("Ends with"),
-    CONTAINS("Contains"),
-    EQUALS("Equals"),
-    DATEIS("Date is"),
-    DATEISNOT("Date is not"),
-    BEFORE("Date is before"),
-    AFTER("Date is after");
+    STARTSWITH("startsWith"),
+    ENDSWITH("endsWith"),
+    CONTAINS("contains"),
+    EQUALS("equals"),
+    DATEIS("dateIs"),
+    DATEISNOT("dateIsNot"),
+    BEFORE("dateBefore"),
+    AFTER("dateAfter");
 
     private String value;
 

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

@@ -213,7 +213,8 @@ public enum UserActionContextEnum {
     GET_ALL_ASSIGNED_APPLICATION_BY_PAGINATION("GET_ALL_ASSIGNED_APPLICATION_BY_PAGINATION"),
      GET_ALL_APPLICATION_AMENDMENT_BY_PAGINATION("GET_ALL_APPLICATION_AMENDMENT_BY_PAGINATION"),
     GET_ALL_USER_ACTION_BY_PAGINATION("GET_ALL_USER_ACTION_BY_PAGINATION"),
-    GET_ALL_USER_BY_PAGINATION("GET_ALL_USER_BY_PAGINATION");
+    GET_ALL_USER_BY_PAGINATION("GET_ALL_USER_BY_PAGINATION"),
+    UPDATE_CALL_END_DATE_AND_TIME("UPDATE_CALL_END_DATE_AND_TIME");
 
     private final String value;