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

Added signed document in evaluation response

Browse Source
This commit is contained in:
rajesh
2025-10-22 15:08:09 +05:30
parent 6d41a044d0
commit 80c7403b64
5 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
View File

@@ -1417,7 +1417,7 @@ public class ApplicationDao {
throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.S3_PATH_GENERATION_ERROR_MSG));
}
}
private ApplicationSignedDocumentResponse convertApplicationSignedDocumentToApplicationSignedDocumentResponse(
public ApplicationSignedDocumentResponse convertApplicationSignedDocumentToApplicationSignedDocumentResponse(
ApplicationSignedDocumentEntity applicationSignedDocument) {
ApplicationSignedDocumentResponse applicationSignedDocumentResponse = new ApplicationSignedDocumentResponse();
applicationSignedDocumentResponse.setId(applicationSignedDocument.getId());

15
src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
View File

@@ -154,6 +154,9 @@ public class ApplicationEvaluationDao {
@Value("${default.hub.uuid}")
private String defaultHubUuid;
@Autowired
private ApplicationSignedDocumentRepository applicationSignedDocumentRepository;
private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) {
ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity();
@@ -1188,6 +1191,7 @@ public class ApplicationEvaluationDao {
}
ApplicationEvaluationEntity entity = entityOptional.get();
ApplicationEvaluationResponse applicationEvaluationResponse = convertToResponse(entity);
applicationEvaluationResponse.setSignedDocument(getApplicationSignedDocument(entity));
applicationEvaluationResponse.setEmailSendResponse(entity.getEmailSendResponse());
return applicationEvaluationResponse;
}
@@ -2417,6 +2421,7 @@ public class ApplicationEvaluationDao {
}
response.setCompanyVatNumber(company.getVatNumber());
response.setCompanyCodiceAteco(company.getCodiceAteco());
response.setSignedDocument(getApplicationSignedDocument(evaluationEntity));
response.setEmailSendResponse(evaluationEntity.getEmailSendResponse());
return response;
}
@@ -2705,5 +2710,15 @@ public class ApplicationEvaluationDao {
}
return new ArrayList<>();
}
public ApplicationSignedDocumentResponse getApplicationSignedDocument(ApplicationEvaluationEntity evaluationEntity){
ApplicationSignedDocumentEntity applicationSignedDocument = applicationSignedDocumentRepository
.findByApplicationIdAndStatus(evaluationEntity.getApplicationId(), ApplicationSignedDocumentStatusEnum.ACTIVE.getValue());
if(applicationSignedDocument == null) {
log.warn("No active signed document found for applicationId: {}", evaluationEntity.getApplicationId());
throw new ResourceNotFoundException(Status.NOT_FOUND,
Translator.toLocale(GepafinConstant.APPLICATION_SIGNED_DOCUMENT_NOT_FOUND));
}
return applicationDao.convertApplicationSignedDocumentToApplicationSignedDocumentResponse(applicationSignedDocument);
}
}

1
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
View File

@@ -49,5 +49,6 @@ public class ApplicationEvaluationFormResponse {
private String companyVatNumber;
private String companyCodiceAteco;
private List<EmailSendResponse> emailSendResponse;
private ApplicationSignedDocumentResponse signedDocument;
}

1
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
View File

@@ -51,5 +51,6 @@ public class ApplicationEvaluationResponse {
private String companyCodiceAteco;
private List<EmailSendResponse> emailSendResponse;
private List<DocumentResponseBean> rejectedDocument;
private ApplicationSignedDocumentResponse signedDocument;
}

3
src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java
View File

@@ -21,4 +21,7 @@ public interface ApplicationSignedDocumentRepository extends JpaRepository<Appli
@Query("SELECT d FROM ApplicationSignedDocumentEntity d WHERE d.status = :status")
List<ApplicationSignedDocumentEntity> findAllByIsStatus(@Param("status")String status);
ApplicationSignedDocumentEntity findByIdAndStatus(Long id, String status);
}