diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java index faf0f9ea..ebdb46a0 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java @@ -96,15 +96,20 @@ public class AssignedApplicationsDao { assignedApplicationsResponse.setApplicationId(assignedApplications.getApplication().getId()); ApplicationEntity application = applicationService.validateApplication(assignedApplications.getApplication().getId()); - String callName = application.getCall().getName(); - Long protocolNumber = application.getProtocol().getProtocolNumber(); + String callName = application.getCall() != null ? application.getCall().getName() : ""; + Long protocolNumber = (application.getProtocol() != null && application.getProtocol().getProtocolNumber() != null) + ? application.getProtocol().getProtocolNumber() + : 0; LocalDateTime submissionDate = application.getSubmissionDate(); - UserEntity userEntity = userService.validateUser(assignedApplications.getUserId()); - String firstName = userEntity.getBeneficiary().getFirstName(); - String lastName = userEntity.getBeneficiary().getLastName(); - String beneficiaryName = - (firstName != null ? firstName : "") + - (lastName != null ? " " + lastName : ""); + UserEntity userEntity = userService.validateUser(application.getUserId()); + + String firstName = userEntity.getBeneficiary() != null ? userEntity.getBeneficiary().getFirstName() : null; + String lastName = userEntity.getBeneficiary() != null ? userEntity.getBeneficiary().getLastName() : null; + + String beneficiaryName = (firstName != null && !firstName.isBlank() ? firstName : "") + + (lastName != null && !lastName.isBlank() ? " " + lastName : ""); + + beneficiaryName = beneficiaryName.isBlank() ? "" : beneficiaryName; assignedApplicationsResponse.setAssignedBy(assignedApplications.getAssignedBy()); assignedApplicationsResponse.setUserId(assignedApplications.getUserId());