Resolved conflicts

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

@@ -0,0 +1,19 @@
+package net.gepafin.tendermanagement.enums;
+
+
+public enum CompanyDocSourceTypeEnum {
+
+    DELETED_PERSONAL_DOCUMENT("DELETED_PERSONAL_DOCUMENT"),
+    DELETED_COMPANY_DOCUMENT("DELETED_COMPANY_DOCUMENT");
+
+
+    private String value;
+
+    CompanyDocSourceTypeEnum(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

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

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.enums;
+
+public enum CompanyDocumentStatusEnum {
+    VALID("VALID"),
+    DUE("DUE"),
+    EXPIRED("EXPIRED");
+
+    private String value;
+
+    CompanyDocumentStatusEnum(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

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

@@ -0,0 +1,16 @@
+package net.gepafin.tendermanagement.enums;
+
+public enum CompanyDocumentTypeEnum {
+    COMPANY_DOCUMENT("COMPANY_DOCUMENT"),
+    PERSONAL_DOCUMENT("PERSONAL_DOCUMENT");
+
+    private String value;
+
+    CompanyDocumentTypeEnum(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

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

@@ -5,7 +5,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum ExpirationTypeEnum {
 
     AMENDMENT("AMENDMENT"),
-    EVALUATION("EVALUATION");
+    EVALUATION("EVALUATION"),
+    COMPANY_DOCUMENT("COMPANY_DOCUMENT");
 
     private String value;
 

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

@@ -13,7 +13,8 @@ public enum NotificationTypeEnum {
     EVALUATION_CREATION("EVALUATION_CREATION"),
     EVALUATION_EXPIRED("EVALUATION_EXPIRED"),
     AMENDMENT_EXPIRATION_REMINDER("AMENDMENT_EXPIRATION_REMINDER"),
-    EVALUATION_EXPIRATION_REMINDER("EVALUATION_EXPIRATION_REMINDER");
+    EVALUATION_EXPIRATION_REMINDER("EVALUATION_EXPIRATION_REMINDER"),
+    COMPANY_DOCUMENT_EXPIRATION_REMINDER("COMPANY_DOCUMENT_EXPIRATION_REMINDER");
 
     private final String value;
 

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

@@ -192,7 +192,27 @@ public enum UserActionContextEnum {
 
 
     GET_USER_ACTION("GET_USER_ACTION"),
-    GET_ACTION_CONTEXT_LABELS("GET_ACTION_CONTEXT_LABELS");
+    GET_ACTION_CONTEXT_LABELS("GET_ACTION_CONTEXT_LABELS"),
+
+    GET_COMPANY_DOCUMENT("GET_COMPANY_DOCUMENT"),
+    DELETE_COMPANY_DOCUMENT("DELETE_COMPANY_DOCUMENT"),
+    UPLOAD_COMPANY_DOCUMENT("UPLOAD_COMPANY_DOCUMENT"),
+    UPLOAD_COMPANY_PERSONAL_DOCUMENT("UPLOAD_COMPANY_PERSONAL_DOCUMENT"),
+    GET_ALL_COMPANY_DOCUMENT("GET_ALL_COMPANY_DOCUMENT"),
+    UPDATE_COMPANY_DOCUMENT("UPDATE_COMPANY_DOCUMENT"),
+    DUPLICATE_COMPANY_DOCUMENT("DUPLICATE_COMPANY_DOCUMENT"),
+
+    CREATE_DOCUMENT_CATEGORY("CREATE_DOCUMENT_CATEGORY"),
+    GET_DOCUMENT_CATEGORY("GET_DOCUMENT_CATEGORY"),
+    DELETE_DOCUMENT_CATEGORY("DELETE_DOCUMENT_CATEGORY"),
+    UPDATE_DOCUMENT_CATEGORY("UPDATE_DOCUMENT_CATEGORY"),
+    COMPANY_DOCUMENT_EXPIRATION_SCHEDULER("COMPANY_DOCUMENT_EXPIRATION_SCHEDULER"),
+    GET_ALL_DOCUMENT_CATEGORY("GET_ALL_DOCUMENT_CATEGORY"),
+
+    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");
 
     private final String value;