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

Merge pull request #174 from Kitzanos/requested-amount-validation-prod

Browse Source 
Cherry pick (Added validation for the requested amount in the application)
This commit is contained in:
Rinaldo
2025-01-29 10:20:22 +01:00
committed by GitHub
parent 71eb5f41de a9fdfed85a
commit 2d089d7768
4 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
View File

@@ -368,5 +368,6 @@ public class GepafinConstant {
public static final String APPLICATION_PER_CALL="applicationPerCall"; public static final String APPLICATION_PER_CALL="applicationPerCall";
public static final String APPLICATION_PER_STATUS="applicationPerStatus"; public static final String APPLICATION_PER_STATUS="applicationPerStatus";
public static final String CALL_EXPIRED="call.expired"; public static final String CALL_EXPIRED="call.expired";
public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero";
} }

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

@@ -1258,6 +1258,9 @@ public class ApplicationDao {
if (Boolean.FALSE.equals(ApplicationStatusTypeEnum.DRAFT.getValue().equals(applicationEntity.getStatus()))) { if (Boolean.FALSE.equals(ApplicationStatusTypeEnum.DRAFT.getValue().equals(applicationEntity.getStatus()))) {
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_NOT_IN_DRAFT_STATUS)); throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_NOT_IN_DRAFT_STATUS));
} }
if (applicationEntity.getAmountRequested() == null || applicationEntity.getAmountRequested().compareTo(BigDecimal.ZERO) <= 0 ) {
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO));
}
List<FlowEdgesEntity> flowEdgesList = flowEdgesRepository.findByCallId(applicationEntity.getCall().getId()); List<FlowEdgesEntity> flowEdgesList = flowEdgesRepository.findByCallId(applicationEntity.getCall().getId());
Long totalSteps = flowFormDao.calculateTotalSteps(flowEdgesList); Long totalSteps = flowFormDao.calculateTotalSteps(flowEdgesList);
Integer completedSteps = flowFormDao.getCompletedSteps(applicationEntity); Integer completedSteps = flowFormDao.getCompletedSteps(applicationEntity);

1
src/main/resources/message_en.properties
View File

@@ -348,3 +348,4 @@ notification.updated.successfully=Notification updated successfully.
user.with.company.not.found = User with company not found for user or company. user.with.company.not.found = User with company not found for user or company.
amount.accepted.required=Amount accepted is required while approving the application. amount.accepted.required=Amount accepted is required while approving the application.
call.expired=Call has been expired. call.expired=Call has been expired.
amount.request.should.greated.then.zero=Requested amount should not be empty and should be greater than zero.

1
src/main/resources/message_it.properties
View File

@@ -343,3 +343,4 @@ user.action.fetched.successfully = Dettagli sull'azione dell'utente recuperati c
action.context.labels.fetched.successfully = Etichette del contesto dell'azione recuperate correttamente. action.context.labels.fetched.successfully = Etichette del contesto dell'azione recuperate correttamente.
amount.accepted.required=L'importo accettato <20> obbligatorio durante l'approvazione della domanda. amount.accepted.required=L'importo accettato <20> obbligatorio durante l'approvazione della domanda.
call.expired=La chiamata <20> scaduta. call.expired=La chiamata <20> scaduta.
amount.request.should.greated.then.zero=L'importo richiesto non deve essere vuoto e deve essere maggiore di zero.