Resolved conflicts

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

@@ -1,7 +1,6 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
-import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
 
 import java.time.LocalDateTime;
@@ -19,6 +18,7 @@ public class ApplicationAmendmentRequestResponse {
     private Long protocolNumber;
     private String callName;
     private String beneficiaryName;
+    private String companyName;
     private List<AmendmentFormFieldResponse> formFields;
     private List<ApplicationFormFieldResponseBean> applicationFormFields;
     private List<DocumentResponseBean> amendmentDocuments;
@@ -31,4 +31,5 @@ public class ApplicationAmendmentRequestResponse {
     private List<CommunicationResponseBean> commentsList;
     private String internalNote;
     private ApplicationAmendmentRequestEnum status;
+    private String emailTemplate;
 }

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

@@ -26,6 +26,8 @@ public class ApplicationEvaluationResponse {
     private LocalDateTime createdDate;
     private LocalDateTime updatedDate;
     private String beneficiary;
+    private Long assignedUserId;
+    private String assignedUserName;
     private Long protocolNumber;
     private String callName;
     private String motivation;

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

@@ -33,4 +33,8 @@ public class ApplicationResponse{
 
     private Long protocolNumber;
 
+    private Long assignedUserId;
+
+    private String assignedUserName;
+
 }

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

@@ -0,0 +1,10 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+@Data
+public class EmailContentResponse {
+    private final String subject;
+    private final String body;
+    private final SystemEmailTemplateResponse systemEmailTemplateResponse;
+}

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

@@ -0,0 +1,21 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;
+
+@Data
+public class NotificationResponse extends BaseBean {
+    private Long userId;
+
+    private String title;
+
+    private String message;
+
+    private String status;
+
+    private Long companyId;
+
+    private String redirectUrl;
+
+    private String notificationType;
+}

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

@@ -40,6 +40,7 @@ public class UserResponseBean extends BaseBean {
 
     private List<CompanyResponse> companies;
     private Boolean privacy;
+
     private Boolean terms;
 
     private Boolean marketing;

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

@@ -0,0 +1,12 @@
+package net.gepafin.tendermanagement.model.response;
+import lombok.Getter;
+import lombok.Setter;
+import java.util.Map;
+
+@Getter
+@Setter
+public class VatCheckResponseBean {
+    private Boolean valid;
+    private Map<String, Object> vatCheckResponse;
+    private String message;
+}