Resolved conflicts

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

@@ -0,0 +1,33 @@
+package net.gepafin.tendermanagement.model.request;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import lombok.Data;
+
+@Data
+public class AmendmentFormField {
+	
+    private String fieldId;
+
+    private String fieldValue;
+    
+    private String isUploadedBy;
+    
+    
+    public enum AmendmentIsUploadedByEnum {
+    	PRE_INSTRUCTOR("PRE_INSTRUCTOR"),
+    	BENEFICIARY("BENEFICIARY");
+
+        private String value;
+
+        AmendmentIsUploadedByEnum(String value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public String getValue() {
+            return value;
+        }
+    }
+
+}

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

@@ -1,9 +1,11 @@
 package net.gepafin.tendermanagement.model.request;
 
+import java.util.List;
+
 import lombok.Data;
 
 @Data
 public class ApplicationAmendmentRequestBean {
     private String note;
-    private ApplicationFormFieldRequestBean applicationFormFields;
+    private List<ApplicationFormFieldRequestBean> applicationFormFields;
 }

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

@@ -12,4 +12,5 @@ public class ApplicationEvaluationRequest {
     private List<FieldRequest> files;
     private String note;
     private ApplicationStatusForEvaluation applicationStatus;
+    private String motivation;
 }

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

@@ -26,6 +26,7 @@ public class ApplicationEvaluationResponse {
     private String beneficiary;
     private Long protocolNumber;
     private String callName;
+    private String motivation;
     private LocalDateTime submissionDate;
     private LocalDateTime evaluationDate;
     private LocalDateTime callEndDate;

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

@@ -31,6 +31,18 @@ public class CommunicationResponseBean {
         this.amendmentId = amendmentId;
     }
 
+    public CommunicationResponseBean(LocalDateTime commentedDate, String comment, String title, LocalDateTime createdDate, LocalDateTime updatedDate, Long amendmentId,Long senderUserId,Long receiverUserId) {
+
+        this.commentedDate = commentedDate;
+        this.comment = comment;
+        this.title = title;
+        this.createdDate = createdDate;
+        this.updatedDate = updatedDate;
+        this.amendmentId = amendmentId;
+        this.senderUserId = senderUserId;
+        this.receiverUserId = receiverUserId;
+    }
+
     public CommunicationResponseBean() {
 
     }