diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/DatasetDownloadEnums.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/DatasetDownloadEnums.java index 15865171..935567ea 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/DatasetDownloadEnums.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/DatasetDownloadEnums.java @@ -8,16 +8,28 @@ public class DatasetDownloadEnums { @Getter - public enum Condition { + public enum Parameter { UUID("uuid"), START_DATE("start_date"), END_DATE("end_date"), MULTI_POLYGON("multi_polygon"), - RECIPIENT("recipient"); + RECIPIENT("recipient"), + TYPE("type"), + ; private final String value; - Condition(String value) { + Parameter(String value) { + this.value = value; + } + } + + @Getter + public enum Type { + SUB_SETTING("sub_setting"), + ; + private final String value; + Type(String value) { this.value = value; } } diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestApi.java b/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestApi.java index 7da4067a..b145c420 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestApi.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestApi.java @@ -47,11 +47,11 @@ public ResponseEntity execute( try { - var uuid = (String) body.getInputs().get(DatasetDownloadEnums.Condition.UUID.getValue()); - var startDate = (String) body.getInputs().get(DatasetDownloadEnums.Condition.START_DATE.getValue()); - var endDate = (String) body.getInputs().get(DatasetDownloadEnums.Condition.END_DATE.getValue()); - var multiPolygon = body.getInputs().get(DatasetDownloadEnums.Condition.MULTI_POLYGON.getValue()); - var recipient = (String) body.getInputs().get(DatasetDownloadEnums.Condition.RECIPIENT.getValue()); + var uuid = (String) body.getInputs().get(DatasetDownloadEnums.Parameter.UUID.getValue()); + var startDate = (String) body.getInputs().get(DatasetDownloadEnums.Parameter.START_DATE.getValue()); + var endDate = (String) body.getInputs().get(DatasetDownloadEnums.Parameter.END_DATE.getValue()); + var multiPolygon = body.getInputs().get(DatasetDownloadEnums.Parameter.MULTI_POLYGON.getValue()); + var recipient = (String) body.getInputs().get(DatasetDownloadEnums.Parameter.RECIPIENT.getValue()); // move the notify user email from data-access-service to here to make the first email faster restServices.notifyUser(recipient, uuid, startDate, endDate); diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java b/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java index 6df90e15..f79f021f 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java @@ -62,12 +62,16 @@ public ResponseEntity downloadData( ) throws JsonProcessingException { Map parameters = new HashMap<>(); - parameters.put(DatasetDownloadEnums.Condition.UUID.getValue(), id); - parameters.put(DatasetDownloadEnums.Condition.START_DATE.getValue(), startDate); - parameters.put(DatasetDownloadEnums.Condition.END_DATE.getValue(), endDate); - parameters.put(DatasetDownloadEnums.Condition.MULTI_POLYGON.getValue(), objectMapper.writeValueAsString(polygons)); - parameters.put(DatasetDownloadEnums.Condition.RECIPIENT.getValue(), recipient); - + parameters.put(DatasetDownloadEnums.Parameter.UUID.getValue(), id); + parameters.put(DatasetDownloadEnums.Parameter.START_DATE.getValue(), startDate); + parameters.put(DatasetDownloadEnums.Parameter.END_DATE.getValue(), endDate); + parameters.put(DatasetDownloadEnums.Parameter.MULTI_POLYGON.getValue(), objectMapper.writeValueAsString(polygons)); + parameters.put(DatasetDownloadEnums.Parameter.RECIPIENT.getValue(), recipient); + + parameters.put( + DatasetDownloadEnums.Parameter.TYPE.getValue(), + DatasetDownloadEnums.Type.SUB_SETTING.getValue() + ); String jobId = submitJob( "generating-data-file-for-" + recipient.replaceAll("[^a-zA-Z0-9-_]", "-"), diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/processes/RestApiTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/processes/RestApiTest.java index 9f2d8948..a0ea52db 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/processes/RestApiTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/processes/RestApiTest.java @@ -39,11 +39,12 @@ public class RestApiTest { public void setUp() { executeRequest = new Execute(); Map inputs = new HashMap<>(); - inputs.put(DatasetDownloadEnums.Condition.UUID.getValue(), "test-uuid"); - inputs.put(DatasetDownloadEnums.Condition.START_DATE.getValue(), "2023-01-01"); - inputs.put(DatasetDownloadEnums.Condition.END_DATE.getValue(), "2023-01-31"); - inputs.put(DatasetDownloadEnums.Condition.MULTI_POLYGON.getValue(), "test-multipolygon"); - inputs.put(DatasetDownloadEnums.Condition.RECIPIENT.getValue(), "test@example.com"); + inputs.put(DatasetDownloadEnums.Parameter.UUID.getValue(), "test-uuid"); + inputs.put(DatasetDownloadEnums.Parameter.START_DATE.getValue(), "2023-01-01"); + inputs.put(DatasetDownloadEnums.Parameter.END_DATE.getValue(), "2023-01-31"); + inputs.put(DatasetDownloadEnums.Parameter.MULTI_POLYGON.getValue(), "test-multipolygon"); + inputs.put(DatasetDownloadEnums.Parameter.RECIPIENT.getValue(), "test@example.com"); + inputs.put(DatasetDownloadEnums.Parameter.TYPE.getValue(), DatasetDownloadEnums.Type.SUB_SETTING.getValue()); executeRequest.setInputs(inputs); }