diff --git a/README.md b/README.md index 2850ee4f..87d10ae2 100644 --- a/README.md +++ b/README.md @@ -52,21 +52,53 @@ Builds the application: cd service mvn spring-boot:run + +## Build a development docker image + +Your local docker image will be used in the integration deployment described below. + + mvn spring-boot:build-image + ## View Swagger UI Go to http://localhost:8080 + +## Integration deployment + +You can deploy the registry-api together with all other components of the registry (harvest, opensearch, ...) and reference datasets. + +Clone the `registry` repository, and launch the docker compose script as described in https://github.com/NASA-PDS/registry/tree/main/docker + +For example, launch: + + docker compose --profile int-registry-batch-loader up + +The integration tests will be automatically applied. Check the results, update/complete them as necessary + + ## Tests +**Important note:** As a developer you are asked to complete the postman test suite according to the new feature you are developing. Do a pull request in the `registry` project to submit the updates. + Integration test are maintained in postman. -In the `registry` project: +### Edit/Run of the integration tests in postman GUI + +Install the postman desktop, from https://www.postman.com/downloads/ + +Download and open the test suite found in https://github.com/NASA-PDS/registry/tree/main/docker/postman + +### Run the integration tests in command line + +In the `registry` project. + +Launch the test in command line: npm install newman newman run docker/postman/postman_collection.json --env-var baseUrl=http://localhost:8080 - Important note: As a developer you are asked to complete the postman test suite according to the new feature you are developing. Do a pull request in the `registry` project to submit the updates. diff --git a/service/pom.xml b/service/pom.xml index 499a2578..9f2f08d7 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -71,9 +71,15 @@ gov.nasa.pds.api.registry.SpringBootMain + nasapds/registry-api-service + + + 11 + + - - + + org.apache.maven.plugins maven-assembly-plugin 3.1.1 diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/EntityProduct.java b/service/src/main/java/gov/nasa/pds/api/registry/model/EntityProduct.java index 0d4aef23..c0e1d935 100644 --- a/service/src/main/java/gov/nasa/pds/api/registry/model/EntityProduct.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/model/EntityProduct.java @@ -37,11 +37,15 @@ public class EntityProduct { @JsonProperty("product_class") private String productClass; + // for compliance with data loaded with version of harvest < 3.7.4 + @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) @JsonProperty("pds:Time_Coordinates/pds:start_date_time") - private List start_date_time; //test + private List start_date_time; + // for compliance with data loaded with version of harvest < 3.7.4 + @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) @JsonProperty("pds:Time_Coordinates/pds:stop_date_time") - private List stop_date_time; //test + private List stop_date_time; @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) @JsonProperty("pds:Modification_Detail/pds:modification_date") @@ -70,8 +74,10 @@ public class EntityProduct { @JsonProperty("vid") private String version; + // for compliance with data loaded with version of harvest < 3.7.4 + @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) @JsonProperty("ops:Label_File_Info/ops:file_ref") - private List pds4FileReference; //test + private List pds4FileReference; @JsonProperty("ops:Tracking_Meta/ops:archive_status")