Fixed test case around Dataset report builder

jpmorganchase · Dec 3, 2024 · 9eac22f · 9eac22f
1 parent a305b27
commit 9eac22f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/src/it/java/io/github/jpmorganchase/fusion/packaging/DatasetOperationsIT.java b/src/it/java/io/github/jpmorganchase/fusion/packaging/DatasetOperationsIT.java
@@ -150,7 +150,7 @@ public void testCreateDatasetOfTypeReport() {
                 .varArg("isRestricted", Boolean.FALSE)
                 .varArg("isRawData", Boolean.FALSE)
                 .varArg("hasSample", Boolean.FALSE)
-                .varArg("applicationId", Application.builder().sealId("12345"))
+                .applicationId(Application.builder().sealId("12345").build())
                 .report(Report.builder().tier("Tier 1").build())
                 .build();
 

diff --git a/src/main/java/io/github/jpmorganchase/fusion/model/Dataset.java b/src/main/java/io/github/jpmorganchase/fusion/model/Dataset.java
@@ -3,6 +3,7 @@
 import com.google.gson.annotations.SerializedName;
 import io.github.jpmorganchase.fusion.api.APIManager;
 import java.util.Map;
+import java.util.Optional;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -25,6 +26,7 @@ public class Dataset extends CatalogResource {
     String frequency;
     String type;
     Report report;
+    Application applicationId;
 
     @Builder(toBuilder = true)
     public Dataset(
@@ -38,14 +40,16 @@ public Dataset(
             String title,
             String frequency,
             String type,
-            Report report) {
+            Report report,
+            Application applicationId) {
         super(identifier, varArgs, apiManager, rootUrl, catalogIdentifier);
         this.description = description;
         this.linkedEntity = linkedEntity;
         this.title = title;
         this.frequency = frequency;
         this.type = type;
         this.report = report;
+        this.applicationId = applicationId;
     }
 
     @Override
@@ -69,8 +73,10 @@ public DatasetBuilder varArgs(Map<String, Object> varArgs) {
         }
 
         public DatasetBuilder report(Report report) {
-            this.type = "Report";
-            this.report = report;
+            Optional.ofNullable(report).ifPresent(val -> {
+                this.type = "Report";
+                this.report = val;
+            });
             return this;
         }
     }

diff --git a/src/main/java/io/github/jpmorganchase/fusion/serializing/adapters/DatasetSerializer.java b/src/main/java/io/github/jpmorganchase/fusion/serializing/adapters/DatasetSerializer.java
@@ -22,6 +22,7 @@ public JsonElement serialize(Dataset src, Type typeOfSrc, JsonSerializationConte
         jsonObject.add("identifier", context.serialize(src.getIdentifier()));
         jsonObject.add("type", context.serialize(src.getType()));
         jsonObject.add("report", context.serialize(src.getReport()));
+        jsonObject.add("applicationId", context.serialize(src.getApplicationId()));
 
         Map<String, Object> varArgs = src.getVarArgs();
         if (varArgs != null) {

diff --git a/...t/java/io/github/jpmorganchase/fusion/parsing/GsonAPIResponseParserDatasetReportTest.java b/...t/java/io/github/jpmorganchase/fusion/parsing/GsonAPIResponseParserDatasetReportTest.java
@@ -50,9 +50,7 @@ public class GsonAPIResponseParserDatasetReportTest {
             .varArg("isRestricted", Boolean.FALSE)
             .varArg("isRawData", Boolean.FALSE)
             .varArg("hasSample", Boolean.FALSE)
-            .varArg(
-                    "applicationId",
-                    Application.builder().sealId("12345").build().toMap())
+            .applicationId(Application.builder().sealId("12345").build())
             .report(Report.builder().tier("Tier 1").build())
             .build();
 
@@ -82,9 +80,7 @@ public class GsonAPIResponseParserDatasetReportTest {
             .varArg("isRestricted", Boolean.FALSE)
             .varArg("isRawData", Boolean.FALSE)
             .varArg("hasSample", Boolean.FALSE)
-            .varArg(
-                    "applicationId",
-                    Application.builder().sealId("12345").build().toMap())
+            .applicationId(Application.builder().sealId("12345").build())
             .report(Report.builder().tier("Tier 2").build())
             .build();
 
@@ -114,9 +110,7 @@ public class GsonAPIResponseParserDatasetReportTest {
             .varArg("isRestricted", Boolean.FALSE)
             .varArg("isRawData", Boolean.FALSE)
             .varArg("hasSample", Boolean.FALSE)
-            .varArg(
-                    "applicationId",
-                    Application.builder().sealId("12345").build().toMap())
+            .applicationId(Application.builder().sealId("12345").build())
             .report(Report.builder().tier("Tier 3").build())
             .build();
 

diff --git a/.../java/io/github/jpmorganchase/fusion/serializing/GsonAPIRequestSerializerDatasetTest.java b/.../java/io/github/jpmorganchase/fusion/serializing/GsonAPIRequestSerializerDatasetTest.java
@@ -45,7 +45,7 @@ public void testDatasetSerializesCorrectly() {
                 .varArg("isRestricted", Boolean.FALSE)
                 .varArg("isRawData", Boolean.FALSE)
                 .varArg("hasSample", Boolean.FALSE)
-                .varArg("applicationId", Application.builder().sealId("12345"))
+                .applicationId(Application.builder().sealId("12345").build())
                 .report(Report.builder().tier("Tier 1").build())
                 .apiManager(Mockito.mock(APIManager.class))
                 .rootUrl("http://foo/bar")

diff --git a/src/test/resources/io/github/jpmorganchase/fusion/serializing/dataset-request.json b/src/test/resources/io/github/jpmorganchase/fusion/serializing/dataset-request.json
@@ -1 +1 @@
-{"description":"Sample dataset description 1","@id":"SD0001/","title":"Sample Dataset 1 | North America","frequency":"Daily","identifier":"SD0001","type":"Report","report":{"tier":"Tier 1"},"subCategory":["Subcategory 1"],"isRawData":false,"isInternalOnlyDataset":false,"language":"English","source":["Source System 1"],"coverageEndDate":"2023-03-08","maintainer":"Maintainer 1","coverageStartDate":"2022-02-05","createdDate":"2022-02-05","isThirdPartyData":false,"modifiedDate":"2023-03-08","publisher":"Publisher 1","tag":["Tag1"],"category":["Category 1"],"region":["North America"],"hasSample":false,"applicationId":{"id":"12345","idType":"SEAL"},"isRestricted":false}
+{"description":"Sample dataset description 1","@id":"SD0001/","title":"Sample Dataset 1 | North America","frequency":"Daily","identifier":"SD0001","type":"Report","report":{"tier":"Tier 1"},"applicationId":{"id":"12345","idType":"SEAL"},"subCategory":["Subcategory 1"],"isRawData":false,"isInternalOnlyDataset":false,"language":"English","source":["Source System 1"],"coverageEndDate":"2023-03-08","maintainer":"Maintainer 1","coverageStartDate":"2022-02-05","createdDate":"2022-02-05","isThirdPartyData":false,"modifiedDate":"2023-03-08","publisher":"Publisher 1","tag":["Tag1"],"category":["Category 1"],"region":["North America"],"hasSample":false,"isRestricted":false}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"description":"Sample dataset description 1","@id":"SD0001/","title":"Sample Dataset 1 \| North America","frequency":"Daily","identifier":"SD0001","type":"Report","report":{"tier":"Tier 1"},"subCategory":["Subcategory 1"],"isRawData":false,"isInternalOnlyDataset":false,"language":"English","source":["Source System 1"],"coverageEndDate":"2023-03-08","maintainer":"Maintainer 1","coverageStartDate":"2022-02-05","createdDate":"2022-02-05","isThirdPartyData":false,"modifiedDate":"2023-03-08","publisher":"Publisher 1","tag":["Tag1"],"category":["Category 1"],"region":["North America"],"hasSample":false,"applicationId":{"id":"12345","idType":"SEAL"},"isRestricted":false}
		{"description":"Sample dataset description 1","@id":"SD0001/","title":"Sample Dataset 1 \| North America","frequency":"Daily","identifier":"SD0001","type":"Report","report":{"tier":"Tier 1"},"applicationId":{"id":"12345","idType":"SEAL"},"subCategory":["Subcategory 1"],"isRawData":false,"isInternalOnlyDataset":false,"language":"English","source":["Source System 1"],"coverageEndDate":"2023-03-08","maintainer":"Maintainer 1","coverageStartDate":"2022-02-05","createdDate":"2022-02-05","isThirdPartyData":false,"modifiedDate":"2023-03-08","publisher":"Publisher 1","tag":["Tag1"],"category":["Category 1"],"region":["North America"],"hasSample":false,"isRestricted":false}