Test case 2

Author: utas-raymondng

server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/DownloadWfsDataService.java

@@ -3,14 +3,18 @@
 import au.org.aodn.ogcapi.server.core.model.ogc.FeatureRequest;
 import au.org.aodn.ogcapi.server.core.util.DatetimeUtils;
 import lombok.extern.slf4j.Slf4j;
+import net.opengis.ows10.ExceptionReportType;
 import net.opengis.wfs.FeatureCollectionType;
 import org.geotools.wfs.v1_1.WFSConfiguration;
 import org.geotools.xsd.Parser;
 import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+import org.xml.sax.SAXException;
 
+import javax.xml.parsers.ParserConfigurationException;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.math.BigInteger;
@@ -23,7 +27,7 @@ public class DownloadWfsDataService {
     protected final RestTemplate restTemplate;
     protected final HttpEntity<?> pretendUserEntity;
     protected final int chunkSize;
-    protected static final WFSConfiguration CONFIG = new WFSConfiguration();
+    protected static final WFSConfiguration WFS_CONFIG = new WFSConfiguration();
     protected static final int SAMPLES_SIZE = 500;    // A not too small sample for download size estimation
 
     public DownloadWfsDataService(
@@ -95,7 +99,7 @@ public BigInteger estimateDownloadSize(
             String endDate,
             Object multiPolygon,
             List<String> fields,
-            String outputFormat) {
+            String outputFormat) throws IllegalArgumentException {
 
         // Just get number of record, the reply will always in XML
         String wfsRequestUrl = prepareWfsRequestUrl(
@@ -105,7 +109,7 @@ public BigInteger estimateDownloadSize(
         ResponseEntity<String> response = restTemplate.exchange(wfsRequestUrl, HttpMethod.GET, pretendUserEntity, String.class);
 
         if(response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
-            Parser parser = new Parser(CONFIG);
+            Parser parser = new Parser(WFS_CONFIG);
             parser.setValidating(false);
             parser.setFailOnValidationError(false);
 
@@ -126,8 +130,11 @@ public BigInteger estimateDownloadSize(
                                 .divide(BigInteger.valueOf(SAMPLES_SIZE));
                     }
                 }
+                else if(o instanceof ExceptionReportType report) {
+                    throw new IllegalArgumentException(String.join(",", report.getException().stream().map(ex -> ex.getExceptionText().toString()).toList()));
+                }
             }
-            catch(Exception e) {
+            catch(IOException | SAXException | ParserConfigurationException e) {
                 log.error("Fail to convert wfs hits result", e);
             }
         }

server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java

@@ -288,22 +288,34 @@ public SseEmitter downloadWfsDataWithSse(String uuid,
                     );
                 }
                 else {
-                    BigInteger est = downloadWfsDataService.estimateDownloadSize(
-                            uuid,
-                            layerName,
-                            startDate,
-                            endDate,
-                            multiPolygon,
-                            fields,
-                            outputFormat
-                    );
-                    emitter.send(SseEmitter.event()
-                            .name(est != null ? "estimate-complete" : "estimate-failed")
-                            .data(Map.of(
-                                    "size", est != null ? est : "",
-                                    "timestamp", System.currentTimeMillis()
-                            )));
-                    emitter.complete();
+                    try {
+                        BigInteger est = downloadWfsDataService.estimateDownloadSize(
+                                uuid,
+                                layerName,
+                                startDate,
+                                endDate,
+                                multiPolygon,
+                                fields,
+                                outputFormat
+                        );
+                        emitter.send(SseEmitter.event()
+                                .name(est != null ? "estimate-complete" : "estimate-failed")
+                                .data(Map.of(
+                                        "size", est != null ? est : "",
+                                        "timestamp", System.currentTimeMillis()
+                                )));
+                    }
+                    catch(IllegalArgumentException iae) {
+                        emitter.send(SseEmitter.event()
+                                .name("estimate-failed")
+                                .data(Map.of(
+                                        "message", iae.getMessage(),
+                                        "timestamp", System.currentTimeMillis()
+                                )));
+                    }
+                    finally {
+                        emitter.complete();
+                    }
                 }
             } catch (Exception e) {
                 WfsErrorHandler.handleError(e, uuid, emitter, cleanupWfsResources);

server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/DownloadWfsDataServiceTest.java

@@ -384,4 +384,52 @@ void shouldReturnEstimatedSizeWhenBothRequestsSucceed() {
         long expected = 227193L * sampleBytes.length / DownloadWfsDataService.SAMPLES_SIZE;
         assertEquals(BigInteger.valueOf(expected), size, "Size match");
     }
+    /**
+     * Expect illegal exception when param is wrong
+     */
+    @Test
+    void throwExceptionWhenHitsRequestFails() {
+
+        String uuid = "lyr-123";
+        String layer = "imos:aatams_sattag_dm_profile_map1";
+        String start = "2024-01-01";
+        String end = "2024-12-31";
+        Object multiPolygon = new Object(); // or real geometry
+        List<String> fields = List.of("name", "area");
+        String format = "application/json";
+
+        // 1. Hits response (XML), indicate error
+        String hitsXml = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <ows:ExceptionReport xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ows="http://www.opengis.net/ows" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0" xsi:schemaLocation="http://www.opengis.net/ows https://geoserver-123.aodn.org.au/geoserver/schemas/ows/1.0.0/owsExceptionReport.xsd">
+                <ows:Exception exceptionCode="InvalidParameterValue" locator="typeName">
+                    <ows:ExceptionText>Feature type imos:aatams_sattag_dm_profile_map1 unknown</ows:ExceptionText>
+                </ows:Exception>
+            </ows:ExceptionReport>
+            """;
+        ResponseEntity<String> hitsResponse = new ResponseEntity<>(hitsXml, HttpStatus.OK);
+        doReturn(hitsResponse)
+                .when(restTemplate).exchange(
+                        argThat((String url) -> url != null && url.contains("resultType=hits")),
+                        eq(HttpMethod.GET),
+                        any(HttpEntity.class),
+                        eq(String.class));
+
+        doReturn(Optional.of("http://dummy.com/wfs"))
+                .when(wfsServer).getFeatureServerUrl(eq(uuid), anyString());
+
+        WfsFields fs = WfsFields.builder()
+                .fields(List.of(
+                        WfsField.builder().type("dateTime").name("time").build()
+                ))
+                .build();
+
+        doReturn(fs)
+                .when(wfsServer).getDownloadableFields(eq(uuid), any(WfsServer.WfsFeatureRequest.class));
+
+        assertThrows(IllegalArgumentException.class,
+                () -> downloadWfsDataService.estimateDownloadSize(
+                    uuid, layer, start, end, multiPolygon, fields, format)
+        );
+    }
 }