BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added call name and application id in contract API response

Browse Source
This commit is contained in:
rajesh
2025-11-05 19:28:22 +05:30
parent 38fb338cb2
commit 2d6de7cf6d
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/gepafin/tendermanagement/dao/ApplicationContractDao.java
View File

@@ -94,10 +94,10 @@ public class ApplicationContractDao {
VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAssignedApplicationEntity).newData(assignedApplicationsEntity).build()); VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAssignedApplicationEntity).newData(assignedApplicationsEntity).build());
UserEntity userEntity = userService.validateUser(applicationEntity.getUserId()); UserEntity userEntity = userService.validateUser(applicationEntity.getUserId());
emailNotificationDao.sendEmailForApplicationContracted(applicationEntity, applicationContractEntity, userEntity); emailNotificationDao.sendEmailForApplicationContracted(applicationEntity, applicationContractEntity, userEntity);
return createApplicationContractResponse(applicationContractEntity, documentResponseBeans, null); return createApplicationContractResponse(applicationContractEntity, documentResponseBeans, null,applicationEntity.getCall().getName());
} }
private ApplicationContractResponse createApplicationContractResponse(ApplicationContractEntity applicationContractEntity, List<DocumentResponseBean> instructorDocuments, List<DocumentResponseBean> beneficiaryDocuments) { private ApplicationContractResponse createApplicationContractResponse(ApplicationContractEntity applicationContractEntity, List<DocumentResponseBean> instructorDocuments, List<DocumentResponseBean> beneficiaryDocuments,String callName) {
ApplicationContractResponse applicationContractResponse = new ApplicationContractResponse(); ApplicationContractResponse applicationContractResponse = new ApplicationContractResponse();
applicationContractResponse.setId(applicationContractEntity.getId()); applicationContractResponse.setId(applicationContractEntity.getId());
applicationContractResponse.setText(applicationContractEntity.getText()); applicationContractResponse.setText(applicationContractEntity.getText());
@@ -108,6 +108,8 @@ public class ApplicationContractDao {
applicationContractResponse.setBeneficiaryDocuments(beneficiaryDocuments); applicationContractResponse.setBeneficiaryDocuments(beneficiaryDocuments);
applicationContractResponse.setCompletionDate(applicationContractEntity.getCompletionDate()); applicationContractResponse.setCompletionDate(applicationContractEntity.getCompletionDate());
applicationContractResponse.setBeneficiaryUserId(applicationContractEntity.getBeneficiaryUserId()); applicationContractResponse.setBeneficiaryUserId(applicationContractEntity.getBeneficiaryUserId());
applicationContractResponse.setApplicationId(applicationContractEntity.getApplicationId());
applicationContractResponse.setCallName(callName);
return applicationContractResponse; return applicationContractResponse;
} }
@@ -177,7 +179,7 @@ public class ApplicationContractDao {
placeHolders.put("{{protocol_number}}", protocolNumber); placeHolders.put("{{protocol_number}}", protocolNumber);
notificationDao.sendNotificationToInstructor(placeHolders, applicationEvaluationEntity, NotificationTypeEnum.CONTRACT_UPLOAD); 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) { public ApplicationContractEntity validateApplicationContract(Long applicationContractId) {
@@ -203,21 +205,24 @@ public class ApplicationContractDao {
public ApplicationContractResponse getContractById(Long contractId) { public ApplicationContractResponse getContractById(Long contractId) {
ApplicationContractEntity applicationContractEntity = validateApplicationContract(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<DocumentResponseBean> instructorDocuments = applicationAmendmentRequestDao.getDocumentResponseBean(applicationContractEntity.getInstructorDocument()); List<DocumentResponseBean> instructorDocuments = applicationAmendmentRequestDao.getDocumentResponseBean(applicationContractEntity.getInstructorDocument());
List<DocumentResponseBean> beneficiaryDocuments = applicationAmendmentRequestDao.getDocumentResponseBean(applicationContractEntity.getBeneficiaryDocument()); List<DocumentResponseBean> beneficiaryDocuments = applicationAmendmentRequestDao.getDocumentResponseBean(applicationContractEntity.getBeneficiaryDocument());
return createApplicationContractResponse(applicationContractEntity, instructorDocuments, beneficiaryDocuments); return createApplicationContractResponse(applicationContractEntity, instructorDocuments, beneficiaryDocuments,callName);
} }
public ApplicationContractResponse getContractByApplicationId(Long applicationId) { public ApplicationContractResponse getContractByApplicationId(Long applicationId) {
ApplicationContractEntity applicationContractEntity = applicationContractRepository.findByApplicationIdAndIsDeletedFalse(applicationId); ApplicationContractEntity applicationContractEntity = applicationContractRepository.findByApplicationIdAndIsDeletedFalse(applicationId);
ApplicationEntity applicationEntity = applicationDao.validateApplication(applicationContractEntity.getApplicationId());
if (applicationContractEntity == null) { if (applicationContractEntity == null) {
return null; return null;
} }
return createApplicationContractResponseFromEntity(applicationContractEntity); return createApplicationContractResponseFromEntity(applicationContractEntity,applicationEntity.getCall().getName());
} }
public List<ApplicationContractResponse> getContractByBeneficiaryUserId(UserEntity user) { public List<ApplicationContractResponse> getContractByBeneficiaryUserId(UserEntity user) {
@@ -228,7 +233,8 @@ public class ApplicationContractDao {
} }
List<ApplicationContractResponse> applicationContractResponses = new ArrayList<>(); List<ApplicationContractResponse> applicationContractResponses = new ArrayList<>();
for (ApplicationContractEntity applicationContractEntity : applicationContractEntities) { for (ApplicationContractEntity applicationContractEntity : applicationContractEntities) {
ApplicationContractResponse applicationContractResponse = createApplicationContractResponseFromEntity(applicationContractEntity); ApplicationEntity applicationEntity = applicationDao.validateApplication(applicationContractEntity.getApplicationId());
ApplicationContractResponse applicationContractResponse = createApplicationContractResponseFromEntity(applicationContractEntity,applicationEntity.getCall().getName());
applicationContractResponses.add(applicationContractResponse); applicationContractResponses.add(applicationContractResponse);
} }
return applicationContractResponses; return applicationContractResponses;

4
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationContractResponse.java
View File

@@ -27,4 +27,8 @@ public class ApplicationContractResponse {
private LocalDateTime completionDate; private LocalDateTime completionDate;
private Long applicationId;
private String callName;
} }