Resolve Conflict

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

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
+
+import java.util.List;
+@Data
+public class ApplicationEvaluationRequest {
+
+    private List<CriteriaRequest> criteria;
+    private List<ChecklistRequest> checklist;
+    private List<FieldRequest> field;
+    private String note;
+}

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

@@ -0,0 +1,9 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class ChecklistRequest {
+    private Long id;
+    private Boolean valid;
+}

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

@@ -2,7 +2,6 @@ package net.gepafin.tendermanagement.model.request;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.List;
 
 import lombok.Data;

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

@@ -0,0 +1,10 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class CriteriaRequest {
+    private Long id;
+    private Long score;
+    private Boolean valid;
+}

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

@@ -0,0 +1,9 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class FieldRequest {
+    private String id;
+    private Boolean valid;
+}

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

@@ -0,0 +1,20 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class S3ConfigReq {
+    @NotNull
+    private String path;
+
+    @NotNull
+    private String type;
+
+    @NotNull
+    private String bucketName;
+
+    @NotNull
+    private String parentFolder;
+}

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

@@ -0,0 +1,2 @@
+package net.gepafin.tendermanagement.model.request;public class UpdateApplicationEvaluationRequest {
+}

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

@@ -0,0 +1,29 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class ApplicationEvaluationResponse {
+
+
+    private Long id;
+    private Long applicationId;
+    private Long assignedApplicationId;
+    private String note;
+    private ApplicationEvaluationStatusTypeEnum status;
+    private Long minScore;
+    private List<CriteriaResponse> criteria;
+    private List<ChecklistResponse> checklist;
+    private List<FieldResponse> files;
+    private LocalDateTime createdDate;
+    private LocalDateTime updatedDate;
+    private String beneficiary;
+    private Long protocolNumber;
+    private String callName;
+    private LocalDateTime submissionDate;
+    private LocalDateTime evaluationDate;
+}

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

@@ -14,6 +14,13 @@ public class AssignedApplicationsResponse extends BaseBean {
     private AssignedApplicationEnum status;
     private String note;
     private LocalDateTime assignedAt;
+    private Long protocolNumber;
+    private String callName;
+    private String beneficiaryName;
+    private LocalDateTime submissionDate;
+    private LocalDateTime callStartDate;
+    private LocalDateTime callEndDate;
+
 }
 
 

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

@@ -20,6 +20,8 @@ public class CallDetailsResponseBean {
 
     private List<LocalDateTime> dates;
 
+    private Boolean confidi;
+
     private CallStatusEnum status;
 
     private Long regionId;

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

@@ -0,0 +1,11 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+public class ChecklistResponse {
+    private Long id;
+    private String label;
+    private Boolean valid;
+}

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

@@ -0,0 +1,10 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+@Data
+public class CriteriaMappedField {
+    private String id;
+    private String fieldLabel;
+    private String fieldValue;
+}

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

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CriteriaResponse {
+    private Long id;
+    private String label;
+    private Long score;
+    private Long maxScore;
+    private List<CriteriaMappedField> criteriaMappedFields;
+    private Boolean valid;
+}

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

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FieldResponse {
+    private String id;
+    private String label;
+    private Boolean valid;
+    private List<DocumentResponseBean> fileDetail ;
+
+}

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

@@ -0,0 +1,11 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+@Data
+public class S3ConfigBean {
+    private String path;
+    private String type;
+    private String bucketName;
+    private String parentFolder;
+}