Refactoring - Version stable
This commit is contained in:
@@ -210,10 +210,7 @@ public class AdhesionService {
|
||||
"Seules les adhésions approuvées peuvent receive un paiement");
|
||||
}
|
||||
|
||||
BigDecimal nouveauMontant = adhesion.getMontantPaye() != null
|
||||
? adhesion.getMontantPaye().add(montantPaye)
|
||||
: montantPaye;
|
||||
adhesion.setMontantPaye(nouveauMontant);
|
||||
adhesion.setMontantPaye(adhesion.getMontantPaye().add(montantPaye));
|
||||
|
||||
if (adhesion.isPayeeIntegralement()) {
|
||||
adhesion.setStatut("APPROUVEE");
|
||||
@@ -283,9 +280,6 @@ public class AdhesionService {
|
||||
}
|
||||
|
||||
private AdhesionResponse convertToDTO(DemandeAdhesion adhesion) {
|
||||
if (adhesion == null)
|
||||
return null;
|
||||
|
||||
AdhesionResponse response = new AdhesionResponse();
|
||||
response.setId(adhesion.getId());
|
||||
response.setNumeroReference(adhesion.getNumeroReference());
|
||||
@@ -328,21 +322,12 @@ public class AdhesionService {
|
||||
}
|
||||
|
||||
private DemandeAdhesion convertToEntity(CreateAdhesionRequest request) {
|
||||
if (request == null)
|
||||
return null;
|
||||
|
||||
return DemandeAdhesion.builder()
|
||||
.numeroReference(
|
||||
request.numeroReference() != null
|
||||
? request.numeroReference()
|
||||
: DemandeAdhesion.genererNumeroReference())
|
||||
.dateDemande(
|
||||
request.dateDemande() != null
|
||||
? request.dateDemande().atStartOfDay()
|
||||
: LocalDateTime.now())
|
||||
.fraisAdhesion(request.fraisAdhesion() != null ? request.fraisAdhesion() : BigDecimal.ZERO)
|
||||
.numeroReference(request.numeroReference())
|
||||
.dateDemande(request.dateDemande().atStartOfDay())
|
||||
.fraisAdhesion(request.fraisAdhesion())
|
||||
.montantPaye(BigDecimal.ZERO)
|
||||
.codeDevise(request.codeDevise() != null ? request.codeDevise() : defaultsService.getDevise())
|
||||
.codeDevise(request.codeDevise())
|
||||
.statut("EN_ATTENTE")
|
||||
.observations(request.observations())
|
||||
.build();
|
||||
|
||||
Reference in New Issue
Block a user