Merge pull request #636 from opensrp/sanitize-spaces-from-productName

sanitize whitespaces from productName
opensrp · Oct 17, 2024 · 559f317 · 559f317
2 parents 178a3b7 + f60c10f
commit 559f317
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.14.10-SNAPSHOT</version>
+	<version>2.14.11-ALPHA2-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

diff --git a/src/main/java/org/opensrp/repository/postgres/StocksRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/StocksRepositoryImpl.java
@@ -20,6 +20,7 @@
 import org.opensrp.repository.postgres.mapper.custom.CustomStockMetadataMapper;
 import org.opensrp.search.StockSearchBean;
 import org.opensrp.util.RepositoryUtil;
+import org.opensrp.util.Utils;
 import org.smartregister.converters.StockConverter;
 import org.smartregister.domain.PhysicalLocation;
 import org.smartregister.domain.ProductCatalogue;
@@ -453,8 +454,12 @@ public List<StockAndProductDetails> getInventoryWithProductDetailsByStockId(Stri
 	}
 
 	private List<Bundle> convertToFHIR(List<StockAndProductDetails> stockAndProductDetails) {
-		return stockAndProductDetails.stream().map(stockAndProductDetail -> StockConverter.convertStockToBundleResource(stockAndProductDetail))
-				.collect(Collectors.toList());
+        return stockAndProductDetails.stream().map(stockAndProductDetail -> {
+                    String productNameWithProperWhiteSpacing = Utils.replaceConsecutiveSpaces(stockAndProductDetail.getProductCatalogue().getProductName());
+                    stockAndProductDetail.getProductCatalogue().setProductName(productNameWithProperWhiteSpacing);
+                    return StockConverter.convertStockToBundleResource(stockAndProductDetail);
+                })
+                .collect(Collectors.toList());
 	}
 
 }
diff --git a/src/main/java/org/opensrp/service/ProductCatalogueService.java b/src/main/java/org/opensrp/service/ProductCatalogueService.java
@@ -3,6 +3,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensrp.util.Utils;
 import org.smartregister.domain.ProductCatalogue;
 import org.opensrp.repository.ProductCatalogueRepository;
 import org.opensrp.search.ProductCatalogueSearchBean;
@@ -90,6 +91,7 @@ private void validateFields(ProductCatalogue productCatalogue) {
 		} else if (productCatalogue.getAccountabilityPeriod() == null) {
 			throw new IllegalArgumentException("Accountability period was not specified");
 		} else {
+			productCatalogue.setProductName(Utils.replaceConsecutiveSpaces(productCatalogue.getProductName()));
 			logger.info("All validations on fields passed");
 		}
 	}

diff --git a/src/main/java/org/opensrp/service/StockService.java b/src/main/java/org/opensrp/service/StockService.java
@@ -9,6 +9,7 @@
 import org.opensrp.domain.postgres.Structure;
 import org.opensrp.domain.postgres.StructureMetadataExample;
 import org.opensrp.repository.postgres.mapper.custom.CustomStructureMetadataMapper;
+import org.opensrp.util.Utils;
 import org.smartregister.domain.Inventory;
 import org.smartregister.domain.ProductCatalogue;
 import org.smartregister.domain.PhysicalLocation;

diff --git a/src/main/java/org/opensrp/util/Utils.java b/src/main/java/org/opensrp/util/Utils.java
@@ -157,6 +157,11 @@ public static void closeCloseable(Closeable closeable) {
 			logger.error(e.getMessage(), e);
 		}
 	}
+
+	public static String replaceConsecutiveSpaces(String input) {
+		// Use regular expression to replace consecutive spaces with a single space
+		return input.trim().replaceAll("\\s+", " ");
+	}
 
 	public static class DatabaseConnectionParams {
 

diff --git a/src/test/java/org/opensrp/util/UtilTest.java b/src/test/java/org/opensrp/util/UtilTest.java
@@ -70,4 +70,19 @@ public void testGetXlsToJsonForInvalidXls() throws IOException, JSONException {
 		Utils.getXlsToJson(path);
 	}
 
+	@Test
+	public void testReplaceConsecutiveSpaces(){
+		// Test string with spaces in between words
+		String inputString = "Medicines  (PPOS)";
+		String modifiedString = Utils.replaceConsecutiveSpaces(inputString);
+		assertEquals("Medicines (PPOS)", modifiedString);
+		// Test string with space after words
+		inputString = "Medicines (PPOS) ";
+		modifiedString = Utils.replaceConsecutiveSpaces(inputString);
+		assertEquals("Medicines (PPOS)", modifiedString);
+		// Test string with space before words
+		inputString = "Medicines (PPOS)";
+		modifiedString = Utils.replaceConsecutiveSpaces(inputString);
+		assertEquals("Medicines (PPOS)", modifiedString);
+	}
 }