Add test to check properties overriding

sovity · Feb 26, 2024 · ae34d58 · ae34d58
1 parent 7c374c3
commit ae34d58
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 3 deletions.
diff --git a/...ppers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/utils/UiAssetMapper.java b/...ppers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/utils/UiAssetMapper.java
@@ -257,6 +257,14 @@ private JsonObjectBuilder getAssetProperties(
         return properties;
     }
 
+    private void add(JsonObject overrides, JsonObjectBuilder properties, String key, String value) {
+        val override = JsonLdUtils.string(overrides, key);
+        if (override != null) {
+            properties.add(key, override);
+        }
+        properties.add(key, value);
+    }
+
     private JsonObjectBuilder getAssetPrivateProperties(UiAssetCreateRequest uiAssetCreateRequest) {
         var privateProperties = Json.createObjectBuilder();
 

diff --git a/...n-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/AssetMapperTest.java b/...n-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/AssetMapperTest.java
@@ -104,9 +104,7 @@ void test_buildAssetDto() {
                 .isObject()
                 .containsEntry("http://unknown/some-custom-string", "some-string-value")
                 .containsEntry("http://unknown/some-custom-obj", json("""
-                        {
-                            "http://unknown/a": "b"
-                        }
+                        { "http://unknown/a": "b" }
                         """));
 
         JsonAssertions.assertThatJson(uiAsset.getPrivateCustomJsonAsString())

diff --git a/tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java b/tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java
@@ -323,6 +323,50 @@ void provide_consume_assetMapping_policyMapping_agreements() {
         validateTransferProcessesOk();
     }
 
+    @Test
+    void canOverrideTheWellKnowPropertiesUsingTheCustomProperties() {
+        // arrange
+        var assetId = providerClient.uiApi().createAsset(UiAssetCreateRequest.builder()
+                .id("asset-1")
+                .title("will be overridden")
+                .dataAddressProperties(Map.of(
+                        Prop.Edc.TYPE, "HttpData",
+                        Prop.Edc.METHOD, "GET",
+                        Prop.Edc.BASE_URL, "http://example.com/base"
+                ))
+                .customJsonLdAsString("""
+                        {
+                            "http://purl.org/dc/terms/title": "The real title",
+                            "https://semantic.sovity.io/mds-dcat-ext#nuts-location": ["a", "b", "c"],
+                            "http://example.com/an-actual-custom-property": "custom value"
+                        }
+                        """)
+                .build()).getId();
+        assertThat(assetId).isEqualTo("asset-1");
+
+        // act
+        val assets = providerClient.uiApi().getAssetPage().getAssets();
+        assertThat(assets).hasSize(1);
+        val asset = assets.get(0);
+
+        // assert
+
+        // while the data offer on the consumer side won't contain private properties, the asset page on the provider side should
+        assertThat(asset.getAssetId()).isEqualTo(assetId);
+        // overridden property
+        assertThat(asset.getTitle()).isEqualTo("The real title");
+        // added property
+        assertThat(asset.getNutsLocation()).isEqualTo(List.of("a", "b", "c"));
+        // remaining custom property
+        assertThatJson(asset.getCustomJsonLdAsString()).isEqualTo("""
+                {
+                    "http://example.com/an-actual-custom-property": "custom value"
+                }
+                """);
+    }
+
+    // TODO throw an error if the id is overridden
+
     @Test
     void customTransferRequest() {
         // arrange