Unit tests added, configuration.java updated

Author: BarathaAberathne

zebedee-cms/src/main/java/com/github/onsdigital/zebedee/configuration/Configuration.java

@@ -44,7 +44,8 @@ public class Configuration {
     private static final String KEYRING_SECRET_KEY = "KEYRING_SECRET_KEY";
     private static final String KEYRING_INIT_VECTOR = "KEYRING_INIT_VECTOR";
     private static final String DATASET_WHITELIST = "drsi,mm23,mm22,ppi,dataset1,pusf,a01,x09,cla01,pn2,mgdp,diop,ios1,mret,mq10,rtisa";
-    private static final String NON_TS_DATASET_WHITELIST = "dataset1, a01, x09, cla01, rtisa";
+    private static final String NON_TS_DATASET_WHITELIST = "dataset1,a01,x09,cla01,rtisa";
+    private static final String EXPECTED_DATASET1_PATH = "economy/inflationandpriceindices/datasets/growthratesofoutputandinputproducerpriceinflation";
 
     private static final int VERIFY_RETRY_DELAY = 5000; // milliseconds
     private static final int VERIFY_RETRY_COUNT = 10;
@@ -268,6 +269,11 @@ public static String getNonTsDatasetWhitelist() {
         return StringUtils.defaultIfBlank(getValue("NON_TS_DATASET_WHITELIST"), NON_TS_DATASET_WHITELIST);
     }
 
+    // Get dataset1 path from dp-configs
+    public static String getDataset1ExpectedPath() {
+        return StringUtils.defaultIfBlank(getValue("EXPECTED_DATASET1_PATH"), EXPECTED_DATASET1_PATH);
+    }
+
     // Changeable upload-new endpoint parameters
     public static String getResumableType() {
         return StringUtils.defaultIfBlank(getValue("RESUMABLE_TYPE"), RESUMABLE_TYPE);

zebedee-cms/src/main/java/com/github/onsdigital/zebedee/model/approval/ApproveTask.java

@@ -403,7 +403,8 @@ protected void uploadFile(Resource myFile, String fileName, String collectionId)
         String nonTsDatasetWhitelist = Configuration.getNonTsDatasetWhitelist();
         Set<String> nonTsDatasetWhitelistSet = Arrays.stream(nonTsDatasetWhitelist.split(","))
                 .collect(Collectors.toSet());
-        String expectedDataset1Path = "economy/inflationandpriceindices/datasets/growthratesofoutputandinputproducerpriceinflation";
+
+        String expectedDataset1Path = Configuration.getDataset1ExpectedPath();
         if (nonTsDatasetWhitelistSet.contains(baseFilename)) {
             if (baseFilename.contains("dataset1")) {
                 // identify if its the PPI dataset

zebedee-cms/src/test/java/com/github/onsdigital/zebedee/model/approval/ApproveTaskTest.java

@@ -17,7 +17,6 @@
 import com.github.onsdigital.zebedee.session.model.Session;
 import com.github.onsdigital.zebedee.util.slack.Notifier;
 import org.apache.hc.core5.http.NameValuePair;
-import org.joda.time.LocalDate;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -29,7 +28,6 @@
 import java.nio.file.Path;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -520,4 +518,22 @@ public void testfilePathGenerator(){
         assertEquals(task.filePathGenerator("rtisa", publishDate, "v123"), "ts-datasets/other/2024-07-18");
         assertEquals(task.filePathGenerator("cla01", publishDate, "v123"), "ts-datasets/other/2024-07-18");
     }
+
+    @Test
+    public void testfilePathGenerator_check_default_value_dataset1() {
+        String actual = Configuration.getDataset1ExpectedPath();
+        String expected = "economy/inflationandpriceindices/datasets/growthratesofoutputandinputproducerpriceinflation";
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testfilePathGenerator_check_configured_value_dataset1() {
+        System.setProperty("EXPECTED_DATASET1_PATH", "economy/inflationandpriceindices/datasets/");
+        String actual = Configuration.getDataset1ExpectedPath();
+        String expected = "economy/inflationandpriceindices/datasets/";
+
+        assertEquals(expected, actual);
+    }
+
 }