Resolved conflicts

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

@@ -0,0 +1,22 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum TimePeriodEnum {
+
+    LAST_WEEK ("LAST_WEEK"),
+    LAST_QUARTER("LAST_QUARTER"),
+    LAST_SEMESTER("LAST_SEMESTER"),
+    LAST_YEAR("LAST_YEAR");
+
+    private String value;
+
+    TimePeriodEnum(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+}

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

@@ -168,9 +168,11 @@ public enum UserActionContextEnum {
 
     GET_ALL_NOTIFICATION_BY_PAGINATION("GET_ALL_NOTIFICATION_BY_PAGINATION"),
     GET_ALL_CALL_BY_PAGINATION("GET_ALL_CALL_BY_PAGINATION"),
-    GET_ALL_APPLICATION_BY_PAGINATION("GET_ALL_APPLICATION_BY_PAGINATION");
+    GET_ALL_APPLICATION_BY_PAGINATION("GET_ALL_APPLICATION_BY_PAGINATION"),
 
 
+    GET_USER_ACTION("GET_USER_ACTION"),
+    GET_ACTION_CONTEXT_LABELS("GET_ACTION_CONTEXT_LABELS");
 
     private final String value;