Resolved conflicts

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

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum ApplicationEvaluationStatusTypeEnum {
     OPEN ("OPEN"),
     SOCCORSO("SOCCORSO"),
+    EXPIRED("EXPIRED"),
     CLOSE("CLOSE");
 
     private String value;

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

@@ -12,7 +12,10 @@ public enum ApplicationStatusTypeEnum {
     SOCCORSO("SOCCORSO"),
     APPROVED("APPROVED"),
     REJECTED("REJECTED"),
-    EVALUATION("EVALUATION");
+    EVALUATION("EVALUATION"),
+    APPOINTMENT("APPOINTMENT"),
+    NDG("NDG"),
+    ADMISSIBLE("ADMISSIBLE");
 
     private String value;
 

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

@@ -3,7 +3,12 @@ package net.gepafin.tendermanagement.enums;
 public enum DocOtherSourceTypeEnum {
     USER_SIGNED_DOCUMENT("USER_SIGNED_DOCUMENT"),
     USER_DELEGATION("USER_DELEGATION"),
-    TEMPLATE("TEMPLATE");
+    TEMPLATE("TEMPLATE"),
+    DELETED_USER_DELEGATION("DELETED_USER_DELEGATION"),
+    DELETED_APPLICATION("DELETED_APPLICATION"),
+    DELETED_EVALUATION("DELETED_EVALUATION"),
+    DELETED_CALL("DELETED_CALL"),
+    DELETED_AMENDMENT("DELETED_AMENDMENT");
 
     private String value;
 

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

@@ -3,7 +3,9 @@ package net.gepafin.tendermanagement.enums;
 public enum DocumentSourceTypeEnum {
     CALL("CALL"),
 
-    APPLICATION("APPLICATION");
+    APPLICATION("APPLICATION"),
+    EVALUATION("EVALUATION"),
+    AMENDMENT("AMENDMENT");
 
     private 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/ProtocolTypeEnum.java

@@ -0,0 +1,24 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum ProtocolTypeEnum {
+    INPUT("INPUT"),
+    OUTPUT("OUTPUT");
+
+    private String value;
+
+    ProtocolTypeEnum(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/RecipientTypeEnum.java

@@ -7,7 +7,8 @@ public enum RecipientTypeEnum {
     BENEFICIARY ("BENEFICIARY"),
     USER("USER"),
     COMPANY("COMPANY"),
-    PROPERTIES("PROPERTIES");
+    PROPERTIES("PROPERTIES"),
+    INSTRUCTOR("INSTRUCTOR");
 
     private String value;
 

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

@@ -7,7 +7,8 @@ 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");
+	ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR"),
+    ROLE_INSTRUCTOR_MANAGER("ROLE_INSTRUCTOR_MANAGER");
 
     private String value;
 

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

@@ -120,6 +120,10 @@ public enum UserActionContextEnum {
     UPDATE_DOCUMENT("UPDATE_DOCUEMENT"),
     UPDATE_IMAGES("UPDATE_IMAGES"),
     GET_DOCUMENT("GET_DOCUMENT"),
+    UPLOAD_AMENDMENT_DOCUMENT("UPLOAD_AMENDMENT_DOCUMENT"),
+    UPLOAD_AMENDMENT_IMAGES("UPLOAD_AMENDMENT_IMAGES"),
+    UPLOAD_EVALUATION_DOCUMENT("UPLOAD_EVALUATION_DOCUMENT"),
+    UPLOAD_EVALUATION_IMAGES("UPLOAD_EVALUATION_IMAGES"),
     
     /** Assigned flow context  **/
     CREATE_UPDATE_FLOW("CREATE_UPDATE_FLOW"),
@@ -138,6 +142,7 @@ public enum UserActionContextEnum {
     UPDATE_EVALUATION_CRITERIA("UPDATE_EVALUATION_CRITERIA"),
     DELETE_EVALUATION_CRITERIA("DELETE_EVALUATION_CRITERIA"),
     CREATE_EVALUATION_CRITERIA("CREATE_EVALUATION_CRITERIA"),
+    UPLOAD_EVALUATION_DOC("UPLOAD_EVALUATION_DOC"),
 
     /** communication action context **/
     ADD_COMMENT_TO_AMENDMENT_REQUEST("ADD_COMMENT_TO_AMENDMENT_REQUEST"),
@@ -149,7 +154,16 @@ public enum UserActionContextEnum {
     GET_FORM("GET_FORM"),
     CREATE_FORM("CREATE_FORM"),
     UPDATE_FORM("UPDATE_FORM"),
-    DELETE_FORM("DELETE_FORM");
+    DELETE_FORM("DELETE_FORM"),
+    
+    /** scheduler action context **/
+    AMENDMENT_EXPIRATION_SCHEDULER("AMENDMENT_EXPIRATION_SCHEDULER"),
+    EVALUATION_EXPIRATION_SCHEDULER("EVALUATION_EXPIRATION_SCHEDULER"),
+
+    /** appointment action context **/
+    CHECK_OR_CREATE_NDG_CODE("CHECK_OR_CREATE_NDG_CODE"),
+    CREATE_APPOINTMENT("CREATE_APPOINTMENT"),
+    UPLOAD_DOCUMENT_TO_EXTERNAL_SYSTEM("UPLOAD_DOCUMENT_TO_EXTERNAL_SYSTEM");
 
     private final String value;
 

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

@@ -10,7 +10,9 @@ public enum UserActionLogsEnum {
     VIEW("VIEW"),
     INSERT("INSERT"),
     DOWNLOAD("DOWNLOAD"),
-    UPLOAD("UPLOAD");
+    UPLOAD("UPLOAD"),
+    SCHEDULER("SCHEDULER"),
+    SCRIPT("SCRIPT");
 
     private final String value;