Updated response

src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java

@@ -110,6 +110,8 @@ public class ApplicationAmendmentRequestDao {
 
     @Autowired
     private DocumentRepository documentRepository;
+    @Autowired
+    private CompanyService companyService;
 
     public ApplicationAmendmentRequestResponse getApplicationDataForAmendment(Long applicationEvaluationId) {
         log.info("Fetching the application data for the Amendment process {}", applicationEvaluationId);
@@ -454,7 +456,8 @@ public class ApplicationAmendmentRequestDao {
 
         UserEntity userEntity = userService.validateUser(application.getUserId());
         response.setBeneficiaryName(buildBeneficiaryName(userEntity));
-
+        CompanyEntity company = companyService.validateCompany(application.getCompanyId());
+        response.setCompanyName(company.getCompanyName());
         Long protocolNumber = entity.getProtocol() != null ? entity.getProtocol().getProtocolNumber() : null;
         response.setProtocolNumber(protocolNumber);
 

src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java

@@ -387,6 +387,16 @@ public class ApplicationDao {
         responseBean.setStatus(applicationEntity.getStatus());
         responseBean.setComments(applicationEntity.getComments());
         responseBean.setCompanyId(applicationEntity.getCompanyId());
+        Optional<AssignedApplicationsEntity> assignedApplicationsOptional =
+                assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationEntity.getId());
+        if(assignedApplicationsOptional.isPresent()){
+            responseBean.setAssignedUserId(assignedApplicationsOptional.get().getUserId());
+            UserEntity user = userService.validateUser(assignedApplicationsOptional.get().getUserId());
+            String firstName = user.getFirstName() != null ? user.getFirstName() : "";
+            String lastName = user.getLastName() != null ? user.getLastName() : "";
+            String userName = String.join(" ", firstName, lastName).trim();
+            responseBean.setAssignedUserName(userName);
+        }
         CompanyEntity company=companyService.validateCompany(applicationEntity.getCompanyId());
         responseBean.setCompanyName(company.getCompanyName());
         if(applicationEntity.getProtocol() != null) {

src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java

@@ -558,7 +558,16 @@ public class ApplicationEvaluationDao {
             response.setAssignedAt(assignedApplications.getAssignedAt());
         }
         response.setEvaluationEndDate(entity.getEndDate());
-
+        Optional<AssignedApplicationsEntity> assignedApplicationsOptional =
+                assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(application.getId());
+        if(assignedApplicationsOptional.isPresent()){
+            response.setAssignedUserId(assignedApplicationsOptional.get().getUserId());
+            UserEntity assignedUser = userService.validateUser(assignedApplicationsOptional.get().getUserId());
+            String assignedUserFirstName = assignedUser.getFirstName() != null ? assignedUser.getFirstName() : "";
+            String assignedUserLastName = assignedUser.getLastName() != null ? assignedUser.getLastName() : "";
+            String userName = String.join(" ", assignedUserFirstName, assignedUserLastName).trim();
+            response.setAssignedUserName(userName);
+        }
         LocalDateTime callEndDate = application.getCall().getEndDate();
         response.setCallEndDate(callEndDate);
         if (application.getCompanyId() != null) {

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

@@ -19,6 +19,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;

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;
+
 }