Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #193: removed dumb condition

Browse Source 
Merge in RED/persistence-service from dossier-validation-rules-xd to master

* commit '87932175271b6dda4e59f2893888fa0f850547ec':
  removed dumb condition
This commit is contained in:
Timo Bejan 2022-01-25 12:00:55 +01:00
commit 5ce1596844
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java
View File

@ -6,9 +6,7 @@ import com.iqser.red.service.persistence.management.v1.processor.exception.Confl
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.CreateOrUpdateDossierTemplateRequest;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplateStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -38,7 +36,7 @@ public class DossierTemplatePersistenceService {
Optional<DossierTemplateEntity> dossierTemplate = dossierTemplateRepository.findById(createOrUpdateDossierRequest.getDossierTemplateId());
if (dossierTemplate.isPresent()) {
if(!dossierTemplate.get().getName().equals(createOrUpdateDossierRequest.getName())){
if (!dossierTemplate.get().getName().equals(createOrUpdateDossierRequest.getName())) {
validateDossierTemplateNameIsUnique(createOrUpdateDossierRequest.getName());
}
@ -71,18 +69,18 @@ public class DossierTemplatePersistenceService {
private DossierTemplateStatus computeDossierTemplateStatus(DossierTemplateEntity dossierTemplate) {
var legalBasis = legalBasisMappingPersistenceService.getLegalBasisMapping(dossierTemplate.getId());
if (legalBasis==null || legalBasis.isEmpty()) {
if (legalBasis == null || legalBasis.isEmpty()) {
return DossierTemplateStatus.INCOMPLETE;
}
var rules = rulesPersistenceService.getRules(dossierTemplate.getId());
if (rules==null || rules.getVersion()==1) {
if (rules == null) {
return DossierTemplateStatus.INCOMPLETE;
}
var now = OffsetDateTime.now();
boolean isNotInRange = !now.isAfter(dossierTemplate.getValidFrom()!=null ? dossierTemplate.getValidFrom() : OffsetDateTime.MIN) || !now.isBefore(dossierTemplate.getValidTo()!=null ? dossierTemplate.getValidTo() : OffsetDateTime.MAX);
if(isNotInRange) {
boolean isNotInRange = !now.isAfter(dossierTemplate.getValidFrom() != null ? dossierTemplate.getValidFrom() : OffsetDateTime.MIN) || !now.isBefore(dossierTemplate.getValidTo() != null ? dossierTemplate.getValidTo() : OffsetDateTime.MAX);
if (isNotInRange) {
return DossierTemplateStatus.INACTIVE;
}
@ -90,9 +88,9 @@ public class DossierTemplatePersistenceService {
}
public void validateDossierTemplateNameIsUnique(String templateName){
public void validateDossierTemplateNameIsUnique(String templateName) {
getAllDossierTemplates().forEach(existing -> {
if(existing.getName().equals(templateName)){
if (existing.getName().equals(templateName)) {
throw new ConflictException("DossierTemplate name must be unique");
}
});