Resolved conflicts

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

@@ -0,0 +1,19 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationStatusForEvaluation;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ApplicationEvaluationFormRequestBean {
+    private List<FieldRequest> files;
+    private List<EvaluationDocumentRequest> evaluationDocument;
+    private List<AmendmentDetailsRequest> amendmentDetails;
+    private String note;
+    private ApplicationStatusForEvaluation applicationStatus;
+    private List<ApplicationFormFieldRequestBean> formFields;
+    private String motivation;
+    private BigDecimal amountAccepted;
+}

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

@@ -10,5 +10,7 @@ public class ApplicationPageableRequestBean {
 
     private GlobalFilters globalFilters;
 
+    private Integer daysRange;
+
     private List<ApplicationStatusTypeEnum> status;
 }

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

@@ -6,5 +6,4 @@ import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 @Data
 public class AssignedApplicationsRequest {
     private String note;
-    private AssignedApplicationEnum status;
 }

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

@@ -5,6 +5,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 
 @Data
 public class CreateCallRequestStep1 {
@@ -23,6 +24,10 @@ public class CreateCallRequestStep1 {
 
     private BigDecimal amountMax;
 
+    private Long numberOfCheck;
+
+    private Long productId;
+
     private List<LookUpDataReq> aimedTo;
 
     private String documentationRequested;
@@ -41,4 +46,5 @@ public class CreateCallRequestStep1 {
 
     private List<FaqReq> faq;
 
+    private EvaluationVersionEnum evaluationVersion;
 }

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

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CreateCallRequestStep2EvaluationV2 {
+
+    private List<DocumentReq> docs;
+
+    private List<DocumentReq> images;
+
+}

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

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EvaluationFormRequest {
+
+    private String label;
+
+    private List<ContentRequestBean> content;
+
+}

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

@@ -6,6 +6,7 @@ import java.time.LocalTime;
 import java.util.List;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 
 @Data
 public class UpdateCallRequestStep1 {
@@ -40,4 +41,10 @@ public class UpdateCallRequestStep1 {
 
 	private List<FaqReq> faq;
 
+	private Long numberOfCheck;
+
+	private Long productId;
+
+	private EvaluationVersionEnum evaluationVersion;
+
 }

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

@@ -0,0 +1,18 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class UpdateUserReqForBeneficiary {
+    private String firstName;
+    private String lastName;
+    private String email;
+    private String phoneNumber;
+    private String organization;
+    private String address;
+    private String city;
+    private String country;
+    private LocalDateTime dateOfBirth;
+}