From 3c5e980e0242e225c98b91f8d60c9affa7524ff5 Mon Sep 17 00:00:00 2001
From: devplant <corina@devplant.ro>
Date: Wed, 13 Apr 2022 14:22:40 +0300
Subject: [PATCH] RED-3834 - On saving attribute values, blank strings should
 be normalized to null

- update after review
---
 .../persistence/DossierAttributePersistenceService.java      | 5 +++--
 .../service/persistence/FileStatusPersistenceService.java    | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributePersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributePersistenceService.java
index 716711607..00bf4de80 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributePersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributePersistenceService.java
@@ -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);
     }
 
 
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
index 5ea123933..abab62024 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
@@ -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());
     }