Resolved conflicts for GEPAFINBE-31.

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/request/EmailConfig.java

@@ -13,6 +13,7 @@ public class EmailConfig {
     private String domain;
     private String mailgunApiUrl;
     private String pecApiUrl;
+    private String url;
 }
 
 

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

@@ -0,0 +1,40 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.EmailScenarioTypeEnum;
+import net.gepafin.tendermanagement.enums.EmailEntityTypeEnum;
+import net.gepafin.tendermanagement.enums.EmailServiceTypeEnum;
+import net.gepafin.tendermanagement.enums.RecipientTypeEnum;
+
+@Data
+public class EmailLogRequest {
+
+    private EmailScenarioTypeEnum emailType;
+
+    private RecipientTypeEnum recipientType;
+
+    private Long recipientId;
+
+    private String emailSubject;
+
+    private String emailBody;
+
+    private String sendStatus;
+
+    private String errorMessage;
+
+    private Long userId;
+
+    private String emailServiceResponse;
+
+    private EmailServiceTypeEnum emailServiceType;
+
+    private String recipientEmails;
+
+    private Long applicatioId;
+
+    private Long amendmentId;
+
+    private Long callId;
+
+}

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

@@ -0,0 +1,16 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.entities.EmailLogEntity;
+
+@Data
+public class EmailTrackingRequest {
+
+    private EmailLogEntity emailLogEntity;
+
+    private Long userId;
+
+    private Long entityId;
+
+    private String entityType;
+}

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/AssignedApplicationsResponse.java

@@ -20,6 +20,7 @@ public class AssignedApplicationsResponse extends BaseBean {
     private LocalDateTime submissionDate;
     private LocalDateTime callStartDate;
     private LocalDateTime callEndDate;
+    private String companyName;
 
 }
 

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

@@ -16,6 +16,10 @@ public class CommunicationResponseBean {
 
     private LocalDateTime updatedDate;
 
+    private Long senderUserId;
+
+    private Long receiverUserId;
+
     private Long amendmentId;
     public CommunicationResponseBean(LocalDateTime commentedDate, String comment, String title, LocalDateTime createdDate, LocalDateTime updatedDate, Long amendmentId) {
 

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

@@ -3,10 +3,13 @@ package net.gepafin.tendermanagement.model.response;
 import java.util.Map;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.enums.EmailScenarioTypeEnum;
 
 @Data
 public class SystemEmailTemplateResponse {
 
+    EmailScenarioTypeEnum emailScenario;
+
     String htmlContent;
 
     String subject;