Resolved conflicts

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

@@ -0,0 +1,12 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class AmendmentDetailsResponseBean {
+    private String amendmentDocuments;
+    private String amendmentNotes;
+    private Boolean valid;
+
+}

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

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

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,8 +18,12 @@ 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;
+    private String amendmentNotes;
+    private Boolean valid;
     private Long applicationId;
     private Long applicationEvaluationId;
     private LocalDateTime evaluationEndDate;
@@ -28,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

@@ -21,13 +21,21 @@ public class ApplicationEvaluationResponse {
     private List<CriteriaResponse> criteria;
     private List<ChecklistResponse> checklist;
     private List<FieldResponse> files;
+    private List<EvaluationDocumentResponse> evaluationDocument;
+    private List<AmendmentDocumentResponseBean> amendmentDetails;
     private LocalDateTime createdDate;
     private LocalDateTime updatedDate;
     private String beneficiary;
+    private Long assignedUserId;
+    private String assignedUserName;
     private Long protocolNumber;
     private String callName;
     private String motivation;
     private LocalDateTime submissionDate;
     private LocalDateTime evaluationEndDate;
     private LocalDateTime callEndDate;
+    private String companyName;
+    private LocalDateTime assignedAt;
+    private String ndg;
+    private String appointmentId;
 }

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

@@ -0,0 +1,8 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+@Data
+public class AppointmentCreationResponse {
+    private String appointmentId;
+}

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

@@ -0,0 +1,16 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+@Data
+public class AppointmentLoginResponse {
+
+    private String tokenId;
+    private String areaCode;
+    private Long companyId;
+    private String codecFiscale;
+    private String vatNumber;
+    private String ndg;
+    private String message;
+    private String idVisura;
+}

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

@@ -25,4 +25,6 @@ public class DocumentResponseBean {
     private LocalDateTime createdDate;
 
     private LocalDateTime updatedDate;
+
+    private String documentAttachmentId;
 }

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

@@ -0,0 +1,8 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+@Data
+public class DocumentUploadResponse {
+    private String documentAttachmentId;
+}

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

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EvaluationDocumentResponse {
+    private String fieldId;
+    private String nameValue;
+    private Boolean valid;
+    private List<DocumentResponseBean> fileValue ;
+
+}

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

@@ -0,0 +1,8 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+@Data
+public class NdgResponse {
+    private String ndg;
+}

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;