added condition to filter nonwhitelisted files before calling upload new endpoint

Author: BarathaAberathne

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

@@ -175,7 +175,7 @@ private boolean doApproval() throws Exception {
             info().data("user", session.getEmail()).data("collectionId", collection.getDescription().getId())
                     .log("approve task: collection approve task completed successfully");
 
-            if (Configuration.isUploadNewEndpointEnabled()) {
+            if (Configuration.isUploadNewEndpointEnabled() && DatasetWhitelistChecker.isURIWhitelisted(collectionReader)) {
                 uploadNewEndpoint(collection, collectionReader);
             }
 

zebedee-cms/src/main/java/com/github/onsdigital/zebedee/util/DatasetWhitelistChecker.java

@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
+import com.github.onsdigital.zebedee.reader.CollectionReader;
 
 public class DatasetWhitelistChecker {
     public static final String REG_EX_STR = "(?i)(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)20[2-9][0-9]";
@@ -34,4 +35,16 @@ public static boolean isWhitelisted(String filename) {
 
         return whitelist.contains(baseFilename);
     }
+
+    public static boolean isURIWhitelisted(CollectionReader collectionReader) {
+        for (String uri : collectionReader.getReviewed().listUris()) {
+            String fileName = uri.substring(uri.lastIndexOf('/') + 1);
+            
+            if (isWhitelisted(fileName)) {
+                return true; 
+            }
+        }
+
+        return false;
+    }
 }

zebedee-cms/src/test/java/com/github/onsdigital/zebedee/util/DatasetWhitelistCheckerTest.java

@@ -2,14 +2,38 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
 
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import com.github.onsdigital.zebedee.reader.CollectionReader;
+import com.github.onsdigital.zebedee.reader.ContentReader;
+
 @RunWith(MockitoJUnitRunner.class)
 public class DatasetWhitelistCheckerTest {
 
+    @Mock
+    private CollectionReader collectionReader;
+
+    @Mock
+    private ContentReader reviewedContentReader;
+
+    @InjectMocks
+    private DatasetWhitelistChecker checker;
+    
+    @Before
+    public void setUp() {
+        when(collectionReader.getReviewed()).thenReturn(reviewedContentReader);
+    }
+
     @Test
     public void testIsWhitelistedWithValidFilename() {
         assertTrue(DatasetWhitelistChecker.isWhitelisted("upload-mm22.csv"));
@@ -70,4 +94,19 @@ public void testIsWhitelistedWithrtisa() {
         assertTrue(DatasetWhitelistChecker.isWhitelisted("rtisa.csv"));
     }
 
+    @Test
+    public void testIsURIWhitelisted_WithWhitelistedURI() {
+        List<String> uris = Arrays.asList("/path/to/upload-mm22.csv");
+        when(reviewedContentReader.listUris()).thenReturn(uris);
+
+        assertTrue("Expected URI to be whitelisted", DatasetWhitelistChecker.isURIWhitelisted(collectionReader));
+    }
+
+    @Test
+    public void testIsURIWhitelisted_WithNonWhitelistedURI() {
+        List<String> uris = Arrays.asList("/visualisations/dvc3069/Occupation%2520graphics%2520for%2520data%2520vis.xlsx");
+        when(reviewedContentReader.listUris()).thenReturn(uris);
+
+        assertFalse("Expected URI to not be whitelisted", DatasetWhitelistChecker.isURIWhitelisted(collectionReader));
+    }
 }