diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationContractDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationContractDao.java index 2f31d2dd..704e7b7e 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationContractDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationContractDao.java @@ -94,10 +94,10 @@ public class ApplicationContractDao { VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAssignedApplicationEntity).newData(assignedApplicationsEntity).build()); UserEntity userEntity = userService.validateUser(applicationEntity.getUserId()); emailNotificationDao.sendEmailForApplicationContracted(applicationEntity, applicationContractEntity, userEntity); - return createApplicationContractResponse(applicationContractEntity, documentResponseBeans, null); + return createApplicationContractResponse(applicationContractEntity, documentResponseBeans, null,applicationEntity.getCall().getName()); } - private ApplicationContractResponse createApplicationContractResponse(ApplicationContractEntity applicationContractEntity, List instructorDocuments, List beneficiaryDocuments) { + private ApplicationContractResponse createApplicationContractResponse(ApplicationContractEntity applicationContractEntity, List instructorDocuments, List beneficiaryDocuments,String callName) { ApplicationContractResponse applicationContractResponse = new ApplicationContractResponse(); applicationContractResponse.setId(applicationContractEntity.getId()); applicationContractResponse.setText(applicationContractEntity.getText()); @@ -108,6 +108,8 @@ public class ApplicationContractDao { applicationContractResponse.setBeneficiaryDocuments(beneficiaryDocuments); applicationContractResponse.setCompletionDate(applicationContractEntity.getCompletionDate()); applicationContractResponse.setBeneficiaryUserId(applicationContractEntity.getBeneficiaryUserId()); + applicationContractResponse.setApplicationId(applicationContractEntity.getApplicationId()); + applicationContractResponse.setCallName(callName); return applicationContractResponse; } @@ -177,7 +179,7 @@ public class ApplicationContractDao { placeHolders.put("{{protocol_number}}", protocolNumber); notificationDao.sendNotificationToInstructor(placeHolders, applicationEvaluationEntity, NotificationTypeEnum.CONTRACT_UPLOAD); - return createApplicationContractResponse(applicationContractEntity, documentResponseBeans, beneficiaryContractDocuments1); + return createApplicationContractResponse(applicationContractEntity, documentResponseBeans, beneficiaryContractDocuments1,applicationEntity.getCall().getName()); } public ApplicationContractEntity validateApplicationContract(Long applicationContractId) { @@ -203,21 +205,24 @@ public class ApplicationContractDao { public ApplicationContractResponse getContractById(Long contractId) { ApplicationContractEntity applicationContractEntity = validateApplicationContract(contractId); - return createApplicationContractResponseFromEntity(applicationContractEntity); + ApplicationEntity applicationEntity = applicationDao.validateApplication(applicationContractEntity.getApplicationId()); + return createApplicationContractResponseFromEntity(applicationContractEntity,applicationEntity.getCall().getName()); } - private ApplicationContractResponse createApplicationContractResponseFromEntity(ApplicationContractEntity applicationContractEntity) { + private ApplicationContractResponse createApplicationContractResponseFromEntity(ApplicationContractEntity applicationContractEntity,String callName) { List instructorDocuments = applicationAmendmentRequestDao.getDocumentResponseBean(applicationContractEntity.getInstructorDocument()); List beneficiaryDocuments = applicationAmendmentRequestDao.getDocumentResponseBean(applicationContractEntity.getBeneficiaryDocument()); - return createApplicationContractResponse(applicationContractEntity, instructorDocuments, beneficiaryDocuments); + return createApplicationContractResponse(applicationContractEntity, instructorDocuments, beneficiaryDocuments,callName); } public ApplicationContractResponse getContractByApplicationId(Long applicationId) { ApplicationContractEntity applicationContractEntity = applicationContractRepository.findByApplicationIdAndIsDeletedFalse(applicationId); + ApplicationEntity applicationEntity = applicationDao.validateApplication(applicationContractEntity.getApplicationId()); + if (applicationContractEntity == null) { return null; } - return createApplicationContractResponseFromEntity(applicationContractEntity); + return createApplicationContractResponseFromEntity(applicationContractEntity,applicationEntity.getCall().getName()); } public List getContractByBeneficiaryUserId(UserEntity user) { @@ -228,7 +233,8 @@ public class ApplicationContractDao { } List applicationContractResponses = new ArrayList<>(); for (ApplicationContractEntity applicationContractEntity : applicationContractEntities) { - ApplicationContractResponse applicationContractResponse = createApplicationContractResponseFromEntity(applicationContractEntity); + ApplicationEntity applicationEntity = applicationDao.validateApplication(applicationContractEntity.getApplicationId()); + ApplicationContractResponse applicationContractResponse = createApplicationContractResponseFromEntity(applicationContractEntity,applicationEntity.getCall().getName()); applicationContractResponses.add(applicationContractResponse); } return applicationContractResponses; diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationContractResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationContractResponse.java index d3d19dac..a90d1204 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationContractResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationContractResponse.java @@ -27,4 +27,8 @@ public class ApplicationContractResponse { private LocalDateTime completionDate; + private Long applicationId; + + private String callName; + }