diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java index c6096360..7cc89cc7 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java @@ -2,6 +2,7 @@ import au.org.aodn.ogcapi.features.model.*; import au.org.aodn.ogcapi.server.core.model.CitationModel; +import au.org.aodn.ogcapi.server.core.model.AssetModel; import au.org.aodn.ogcapi.server.core.model.ExtendedCollection; import au.org.aodn.ogcapi.server.core.model.ExtendedLink; import au.org.aodn.ogcapi.server.core.model.StacCollectionModel; @@ -10,7 +11,6 @@ import au.org.aodn.ogcapi.server.core.parser.stac.GeometryVisitor; import au.org.aodn.ogcapi.server.core.util.ConstructUtils; import au.org.aodn.ogcapi.server.core.util.GeometryUtils; -import au.org.aodn.ogcapi.server.core.util.LinkUtils; import lombok.Builder; import lombok.Getter; import lombok.Setter; diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java index 26ec9290..8251b319 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java @@ -19,10 +19,7 @@ import org.springframework.boot.test.context.SpringBootTest; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.*; import static au.org.aodn.ogcapi.server.BaseTestClass.readResourceFile; @@ -97,6 +94,14 @@ public void verifyAddingPropertyWorks() { ConceptModel.builder().id("id").url("url").description("description").title("title").build() )) .build(); + var asset = AssetModel.builder() + .role(AssetModel.Role.SUMMARY) + .href("/collections/test-uuid/items/summary") + .type("application/x-zarr") + .title("vessel_satellite_radiance_derived_product.zarr") + .build(); + Map assets = new HashMap<>(); + assets.put("vessel_satellite_radiance_derived_product.zarr", asset); var citationString = "{\"suggestedCitation\":\"this is suggested Citation\",\"useLimitations\":[\"this is useLimitations1\",\"this is useLimitations2\"],\"otherConstraints\":[\"this is otherConstraints1\",\"this is otherConstraints2\"]}"; var statement = "This is the statement of this record"; var datasetGroup = "group_test"; @@ -119,6 +124,7 @@ public void verifyAddingPropertyWorks() { ) .license("Attribution 4.0") .contacts(Collections.singletonList(contact)) + .assets(assets) .links(Arrays.asList(link1, link2)) .themes(Collections.singletonList(theme)) .citation(citationString) @@ -142,7 +148,7 @@ public void verifyAddingPropertyWorks() { Assertions.assertEquals(datasetGroup, collection.getProperties().get(CollectionProperty.datasetGroup)); Assertions.assertEquals(aiDescription, collection.getProperties().get(CollectionProperty.aiDescription)); Assertions.assertNotNull(collection.getLinks()); - Assertions.assertEquals(2, collection.getLinks().size()); + Assertions.assertEquals(3, collection.getLinks().size()); } @Test