Resolved conflicts for GEPAFINBE-31.

src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java

@@ -28,6 +28,9 @@ public class ApplicationEvaluationEntity extends BaseEntity{
 
     @Column(name = "status")
     private String status;
+    
+    @Column(name = "MOTIVATION")
+    private String motivation;
 
     @Column(name="IS_DELETED")
     private Boolean isDeleted;

src/main/java/net/gepafin/tendermanagement/entities/CommunicationEntity.java

@@ -26,6 +26,12 @@ public class CommunicationEntity extends BaseEntity {
     @Column(name = "COMMENTED_DATE")
     private LocalDateTime commentedDate;
 
+    @Column(name = "SENDER_USER_ID")
+    private Long senderUserId;
+
+    @Column(name = "RECEIVER_USER_ID")
+    private Long receiverUserId;
+
     @ManyToOne
     @JoinColumn(name = "AMENDMENT_ID", referencedColumnName = "id", nullable = false)
     private ApplicationAmendmentRequestEntity applicationAmendmentRequest;

src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java

@@ -0,0 +1,60 @@
+package net.gepafin.tendermanagement.entities;
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Data
+@Table(name = "email_log")
+public class EmailLogEntity extends BaseEntity{
+
+    @Column(name = "email_type", nullable = false, length = 255)
+    private String emailType;
+
+    @Column(name = "recipient_type", nullable = false, columnDefinition = "TEXT")
+    private String recipientType;
+
+    @Column(name = "recipient_id", nullable = false)
+    private Long recipientId;
+
+    @Column(name = "email_subject", columnDefinition = "TEXT")
+    private String emailSubject;
+
+    @Column(name = "email_body", columnDefinition = "TEXT")
+    private String emailBody;
+
+    @Column(name = "send_status", length = 255)
+    private String sendStatus;
+
+    @Column(name = "send_date_time")
+    private LocalDateTime sendDateTime;
+
+    @Column(name = "error_message", columnDefinition = "TEXT")
+    private String errorMessage;
+
+    @Column(name = "email_service_response")
+    private String emailServiceResponse;
+
+    @Column(name = "email_service_type")
+    private String emailServiceType;
+
+    @Column(name = "recipient_emails")
+    private String recipientEmails;
+
+    @Column(name = "user_id")
+    private Long userId;
+
+    @Column(name = "application_id")
+    private Long applicationId;
+
+    @Column(name = "amendment_id")
+    private Long amendmentId;
+
+    @Column(name = "call_id")
+    private Long callId;
+
+    @Column(name = "is_deleted")
+    private Boolean isDeleted;
+}
+

src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java

@@ -35,6 +35,9 @@ public class SystemEmailTemplatesEntity extends BaseEntity {
 	
     @Column(name ="IS_DELETED", nullable = false)
     private Boolean isDeleted = false;
+
+	@Column(name = "email_scenario")
+	private String emailScenario;
     
 	public enum SystemEmailTemplatesEntityTypeEnum {