Resolved conflicts

src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentPaginationRequestBean.java

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
+
+import java.util.List;
+
+@Data
+public class ApplicationAmendmentPaginationRequestBean {
+
+    private GlobalFilters globalFilters;
+
+    private List<ApplicationAmendmentRequestEnum> status;
+}

src/main/java/net/gepafin/tendermanagement/model/request/AssignedApplicationPageableRequestBean.java

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
+
+import java.util.List;
+
+@Data
+public class AssignedApplicationPageableRequestBean {
+
+
+    private GlobalFilters globalFilters;
+
+    private List<AssignedApplicationEnum> status;
+}

src/main/java/net/gepafin/tendermanagement/model/request/CompanyDocumentRequest.java

@@ -0,0 +1,12 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+@Data
+public class CompanyDocumentRequest {
+    private Long categoryId;
+    private LocalDateTime expirationDate;
+}

src/main/java/net/gepafin/tendermanagement/model/request/DocumentCategoryRequest.java

@@ -0,0 +1,9 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class DocumentCategoryRequest {
+    private String categoryName;
+    private String description;
+}

src/main/java/net/gepafin/tendermanagement/model/request/FieldValidatorBean.java

@@ -11,6 +11,10 @@ public class FieldValidatorBean {
 
     private Long maxLength;
 
+    private Long min;
+
+    private Long max;
+
     private String pattern;
 
     private String custom;

src/main/java/net/gepafin/tendermanagement/model/request/UserActionPaginationRequest.java

@@ -0,0 +1,21 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.TimePeriodEnum;
+import net.gepafin.tendermanagement.enums.UserActionContextEnum;
+import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
+
+import java.util.List;
+
+@Data
+public class UserActionPaginationRequest {
+
+   private GlobalFilters globalFilters;
+
+   private TimePeriodEnum timeFilter;
+
+   private List<UserActionContextEnum> actionContext;
+
+   private List<UserActionLogsEnum> actionType;
+
+}

src/main/java/net/gepafin/tendermanagement/model/request/UserPaginationRequestBean.java

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.RoleStatusEnum;
+import net.gepafin.tendermanagement.enums.UserStatusEnum;
+
+import java.util.List;
+
+@Data
+public class UserPaginationRequestBean {
+
+    private GlobalFilters globalFilters;
+
+    private List<UserStatusEnum> status;
+
+    private List<RoleStatusEnum> role;
+}

src/main/java/net/gepafin/tendermanagement/model/response/CompanyDocumentResponseBean.java

@@ -0,0 +1,29 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.CompanyDocumentTypeEnum;
+import net.gepafin.tendermanagement.model.BaseBean;
+import java.time.LocalDateTime;
+
+@Data
+public class CompanyDocumentResponseBean extends BaseBean {
+
+    private String name;
+
+    private String filePath;
+
+    private CompanyDocumentTypeEnum type;
+
+    private Long companyId;
+
+    private String status;
+
+    private LocalDateTime expirationDate;
+
+    private Long uploadedBy;
+
+    private Long userWithCompanyId;
+
+    private DocumentCategoryResponse category;
+
+}

src/main/java/net/gepafin/tendermanagement/model/response/DocumentCategoryResponse.java

@@ -0,0 +1,11 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;
+
+@Data
+public class DocumentCategoryResponse extends BaseBean {
+    private String categoryName;
+    private String description;
+
+}

src/main/java/net/gepafin/tendermanagement/model/response/SummaryPageResponseBean.java

@@ -14,5 +14,4 @@ public class SummaryPageResponseBean {
     private LocalDateTime registrationDate;
     private Long numberOfLoginAttempts;
     private Long applicationsProcessed;
-    private List<UserActionResponseBean> userActions;
 }

src/main/java/net/gepafin/tendermanagement/model/response/SuperAdminWidgetResponseBean.java

@@ -1,5 +1,6 @@
 package net.gepafin.tendermanagement.model.response;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import net.gepafin.tendermanagement.entities.UserActionEntity;
 import org.springframework.data.domain.Page;
@@ -12,6 +13,12 @@ public class SuperAdminWidgetResponseBean {
 
     private  Widget1 widget1;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String pecUsage;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String pecLimit;
+
     private Map<String, Object>  widgetBars;
 
 }