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

RED-3834 - On saving attribute values, blank strings should be normalized to null

Browse Source 
- update after review
This commit is contained in:
devplant 2022-04-13 14:22:40 +03:00
parent 1873fc9ed4
commit 3c5e980e02
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.apache.commons.lang3.StringUtils;
import javax.transaction.Transactional;
import java.util.List;
@ -25,7 +26,7 @@ public class DossierAttributePersistenceService {
DossierAttributeEntity dossierAttribute = new DossierAttributeEntity();
dossierAttribute.setId(new DossierAttributeEntity.DossierAttributeEntityId(dossierId, dossierAttributeId));
dossierAttribute.setValue(dossierAttributeValue != null && dossierAttributeValue.trim().isEmpty()? null: dossierAttributeValue);
dossierAttribute.setValue(StringUtils.isBlank(dossierAttributeValue)? null: dossierAttributeValue);
dossierAttributeRepository.saveAndFlush(dossierAttribute);
}
@ -33,7 +34,7 @@ public class DossierAttributePersistenceService {
public void updateDossierAttribute(String dossierId, String dossierAttributeId, String dossierAttributeValue) {
dossierAttributeRepository.updateDossierAttribute(new DossierAttributeEntity.DossierAttributeEntityId(dossierId, dossierAttributeId),
dossierAttributeValue != null && dossierAttributeValue.trim().isEmpty() ? null: dossierAttributeValue);
StringUtils.isBlank(dossierAttributeValue) ? null: dossierAttributeValue);
}

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

@ -10,6 +10,7 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity;
@ -328,7 +329,7 @@ public class FileStatusPersistenceService {
.findAny().map(FileAttributeConfigEntity::getId)
.orElseThrow(() -> new BadRequestException("Invalid File Attribute Id")));
fa.setFileAttributeId(id);
fa.setValue(entry.getValue()!= null && entry.getValue().trim().isEmpty()? null : entry.getValue());
fa.setValue(StringUtils.isBlank(entry.getValue())? null : entry.getValue());
return fa;
}).collect(Collectors.toList());
}