Merge pull request #25 from imsweb/support-new-fields

Added support for "naaccr_xml_id"

Author: ctmay4

src/main/java/com/imsweb/seerapi/client/staging/StagingSchemaInput.java

@@ -11,13 +11,14 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-@JsonPropertyOrder({"key", "name", "description", "naaccr_item", "values", "default", "table", "used_for_staging", "fail_on_invalid", "unit", "decimal_places", "metadata"})
+@JsonPropertyOrder({"key", "name", "description", "naaccr_item", "naaccr_xml_id", "values", "default", "table", "used_for_staging", "fail_on_invalid", "unit", "decimal_places", "metadata"})
 public class StagingSchemaInput {
 
     private String _key;
     private String _name;
     private String _description;
     private Integer _naaccrItem;
+    private String _naaccrXmlId;
     private String _default;
     private String _table;
     private Boolean _usedForStaging;
@@ -51,6 +52,7 @@ public StagingSchemaInput(StagingSchemaInput other) {
         setName(other.getName());
         setDescription(other.getDescription());
         setNaaccrItem(other.getNaaccrItem());
+        setNaaccrXmlId(other.getNaaccrXmlId());
         setDefault(other.getDefault());
         setTable(other.getTable());
         if (other.getMetadata() != null)
@@ -96,6 +98,15 @@ public void setNaaccrItem(Integer naaccrItem) {
         _naaccrItem = naaccrItem;
     }
 
+    @JsonProperty("naaccr_xml_id")
+    public String getNaaccrXmlId() {
+        return _naaccrXmlId;
+    }
+
+    public void setNaaccrXmlId(String naaccrXmlId) {
+        _naaccrXmlId = naaccrXmlId;
+    }
+
     @JsonProperty("default")
     public String getDefault() {
         return _default;

src/main/java/com/imsweb/seerapi/client/staging/StagingSchemaOutput.java

@@ -6,13 +6,14 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
-@JsonPropertyOrder({"key", "name", "description", "naaccr_item", "table"})
+@JsonPropertyOrder({"key", "name", "description", "naaccr_item", "naaccr_xml_id", "table"})
 public class StagingSchemaOutput {
 
     private String _key;
     private String _name;
     private String _description;
     private Integer _naaccrItem;
+    private String _naaccrXmlId;
     private String _table;
     private String _default;
 
@@ -42,6 +43,7 @@ public StagingSchemaOutput(StagingSchemaOutput other) {
         setName(other.getName());
         setDescription(other.getDescription());
         setNaaccrItem(other.getNaaccrItem());
+        setNaaccrXmlId(other.getNaaccrXmlId());
         setTable(other.getTable());
         setDefault(other.getDefault());
     }
@@ -82,6 +84,15 @@ public void setNaaccrItem(Integer naaccrItem) {
         _naaccrItem = naaccrItem;
     }
 
+    @JsonProperty("naaccr_xml_id")
+    public String getNaaccrXmlId() {
+        return _naaccrXmlId;
+    }
+
+    public void setNaaccrXmlId(String naaccrXmlId) {
+        _naaccrXmlId = naaccrXmlId;
+    }
+
     @JsonProperty("table")
     public String getTable() {
         return _table;

src/test/java/com/imsweb/seerapi/client/ndc/NdcTest.java

@@ -94,7 +94,7 @@ public void testNdcSearch() throws IOException {
         products = _NDC.search(search.paramMap()).execute().body();
         assertThat(products.size()).isGreaterThan(1);
 
-        search.setRemovedSince("2020-01-06");
+        search.setRemovedSince("2020-10-01");
         products = _NDC.search(search.paramMap()).execute().body();
         assertThat(products).isEmpty();
 

src/test/java/com/imsweb/seerapi/client/staging/StagingTest.java

@@ -82,6 +82,25 @@ public void testSchemaById() throws IOException {
         assertThat(schema.getAlgorithm()).isEqualTo("cs");
         assertThat(schema.getVersion()).isEqualTo("02.05.50");
         assertThat(schema.getId()).isEqualTo("brain");
+
+        // verify the inputs
+        StagingSchemaInput input = schema.getInputs().stream().filter(i -> "site".equals(i.getKey())).findFirst().orElse(null);
+        assertThat(input).isNotNull();
+        assertThat(input.getName()).isEqualTo("Primary Site");
+        assertThat(input.getDescription()).isEqualTo("Code for the primary site of the tumor being reported using either ICD-O-2 or ICD-O-3.");
+        assertThat(input.getNaaccrItem()).isEqualTo(400);
+        assertThat(input.getNaaccrXmlId()).isEqualTo("primarySite");
+        assertThat(input.getUsedForStaging()).isTrue();
+        assertThat(input.getTable()).isEqualTo("primary_site");
+
+        // verify the outputs
+        StagingSchemaOutput output = schema.getOutputs().stream().filter(i -> "csver_derived".equals(i.getKey())).findFirst().orElse(null);
+        assertThat(output).isNotNull();
+        assertThat(output.getName()).isEqualTo("CS Version Derived");
+        assertThat(output.getDescription()).isEqualTo("Collaborative Staging (CS) version used to derive the CS output fields.");
+        assertThat(output.getNaaccrItem()).isEqualTo(2936);
+        assertThat(output.getNaaccrXmlId()).isEqualTo("csVersionDerived");
+        assertThat(output.getDefault()).isEqualTo("020550");
     }
 
     @Test