Updated MPH API to reflect changes in SEER*API.

Still need more unit tests for histology match mode.

Author: ctmay4

src/main/java/com/imsweb/seerapi/client/mph/MphInput.java

@@ -4,6 +4,16 @@
 
 public class MphInput {
 
+    /**
+     * How to consider histology match, if it is strict 8000 is considered a different histology than 8010-9999
+     * for rule : Do the tumors have ICD-O-3 histology codes that are different at the first (Xxxx), second (Xxxx), or third (xxXx) number?
+     * If lenient mode is on 8000 is considered as NOS and be considered to match any 8nnn histologies.
+     */
+    public enum MpHistologyMatchMode {
+        STRICT,
+        LENIENT
+    }
+
     @JsonProperty("primary_site")
     private String _primarySite;
     @JsonProperty("histology_icd_o3")

src/main/java/com/imsweb/seerapi/client/mph/MphOutput.java

@@ -0,0 +1,72 @@
+package com.imsweb.seerapi.client.mph;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class MphOutput {
+
+    // The possible results of determining if two tumors are single or multiple primaries.
+    public enum Result {
+        // indicates the two tumors are the same primary
+        SINGLE_PRIMARY,
+        // indicates the two tumors are different primaries
+        MULTIPLE_PRIMARIES,
+        // indicates there is not enough information to make a proper determination
+        QUESTIONABLE
+    }
+
+    @JsonProperty("result")
+    private Result _result;
+    @JsonProperty("reason")
+    private String _reason;
+    @JsonProperty("applied_rules")
+    private List<MphRule> _appliedRules;
+    @JsonProperty("group_id")
+    private String _groupId;
+    @JsonProperty("step")
+    private String _step;
+
+    public MphOutput() {
+    }
+
+    public Result getResult() {
+        return _result;
+    }
+
+    public void setResult(Result result) {
+        _result = result;
+    }
+
+    public String getReason() {
+        return _reason;
+    }
+
+    public void setReason(String reason) {
+        _reason = reason;
+    }
+
+    public List<MphRule> getAppliedRules() {
+        return _appliedRules;
+    }
+
+    public void setAppliedRules(List<MphRule> appliedRules) {
+        _appliedRules = appliedRules;
+    }
+
+    public String getGroupId() {
+        return _groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        _groupId = groupId;
+    }
+
+    public String getStep() {
+        return _step;
+    }
+
+    public void setStep(String step) {
+        _step = step;
+    }
+}

src/main/java/com/imsweb/seerapi/client/mph/MphResult.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2013 Information Management Services, Inc.
+ */
+package com.imsweb.seerapi.client.mph;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class MphRule {
+
+    @JsonProperty("group_id")
+    private String _groupId;
+    @JsonProperty("step")
+    private String _step;
+    @JsonProperty("question")
+    private String _question;
+    @JsonProperty("reason")
+    private String _reason;
+    @JsonProperty("notes")
+    private List<String> _notes;
+    @JsonProperty("examples")
+    private List<String> _examples;
+
+    public MphRule() {
+    }
+
+    public String getGroupId() {
+        return _groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        _groupId = groupId;
+    }
+
+    public String getStep() {
+        return _step;
+    }
+
+    public void setStep(String step) {
+        _step = step;
+    }
+
+    public String getQuestion() {
+        return _question;
+    }
+
+    public void setQuestion(String question) {
+        _question = question;
+    }
+
+    public String getReason() {
+        return _reason;
+    }
+
+    public void setReason(String reason) {
+        _reason = reason;
+    }
+
+    public List<String> getNotes() {
+        return _notes;
+    }
+
+    public void setNotes(List<String> notes) {
+        _notes = notes;
+    }
+
+    public List<String> getExamples() {
+        return _examples;
+    }
+
+    public void setExamples(List<String> examples) {
+        _examples = examples;
+    }
+}

src/main/java/com/imsweb/seerapi/client/mph/MphRule.java

@@ -6,15 +6,27 @@
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.POST;
+import retrofit2.http.Query;
+
+import com.imsweb.seerapi.client.mph.MphInput.MpHistologyMatchMode;
 
 public interface MphService {
 
+    /**
+     * Uses multiple primary rules to compare two diseases using strict histology matching mode
+     * @param pair a pair of diseases
+     * @return a result indicating whether the two diseases are the same primary
+     */
+    @POST("mph")
+    Call<MphOutput> mph(@Body MphInputPair pair);
+
     /**
      * Uses multiple primary rules to compare two diseases
      * @param pair a pair of diseases
+     * @param matchMode
      * @return a result indicating whether the two diseases are the same primary
      */
     @POST("mph")
-    Call<MphResult> mph(@Body MphInputPair pair);
+    Call<MphOutput> mph(@Body MphInputPair pair, @Query("histology-matching-mode") MpHistologyMatchMode matchMode);
 
 }

src/main/java/com/imsweb/seerapi/client/mph/MphService.java

@@ -9,6 +9,7 @@
 import com.imsweb.seerapi.client.SeerApi;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class MphTest {
 
@@ -24,7 +25,7 @@ public void testMissingAllInput() throws IOException {
         _MPH.mph(new MphInputPair()).execute();
     }
 
-    @Test(expected = BadRequestException.class)
+    @Test
     public void testMissingSite() throws IOException {
         MphInput input1 = new MphInput();
         // site is missing
@@ -40,7 +41,11 @@ public void testMissingSite() throws IOException {
         input2.setDateOfDiagnosisYear("2016");
         input2.setLaterality("1");
 
-        _MPH.mph(new MphInputPair(input1, input2)).execute();
+        MphOutput result = _MPH.mph(new MphInputPair(input1, input2)).execute().body();
+        assertEquals(MphOutput.Result.QUESTIONABLE, result.getResult());
+        assertEquals(
+                "Unable to identify cancer group for first set of parameters. Valid primary site (C000-C999 excluding C809), histology (8000-9999), behavior (0-3, 6) and diagnosis year are required.",
+                result.getReason());
     }
 
     @Test
@@ -60,13 +65,23 @@ public void testResults() throws IOException {
         input2.setLaterality("1");
 
         // first test single primary (only differs by site code)
-        MphResult result = _MPH.mph(new MphInputPair(input1, input2)).execute().body();
-        assertEquals(MphResult.Result.SINGLE_PRIMARY, result.getResult());
+        MphOutput result = _MPH.mph(new MphInputPair(input1, input2)).execute().body();
+        assertEquals(MphOutput.Result.SINGLE_PRIMARY, result.getResult());
+        assertEquals("mp_2007_breast", result.getGroupId());
+        assertEquals("M13", result.getStep());
+        assertEquals("Tumors that do not meet any of the criteria are abstracted as a single primary.", result.getReason());
+        assertEquals(10, result.getAppliedRules().size());
+        assertTrue(result.getAppliedRules().get(0).getQuestion().startsWith("Are there tumors in sites with ICD-O-3 topography codes"));
 
         // next test questionable (setting laterality to unknown for one of the diseases)
         input2.setLaterality("9");
         result = _MPH.mph(new MphInputPair(input1, input2)).execute().body();
-        assertEquals(MphResult.Result.QUESTIONABLE, result.getResult());
+        assertEquals(MphOutput.Result.QUESTIONABLE, result.getResult());
+        assertEquals("mp_2007_breast", result.getGroupId());
+        assertEquals("M7", result.getStep());
+        assertEquals("Unable to apply Rule M7 of mp_2007_breast. Valid and known laterality should be provided.", result.getReason());
+        assertEquals(4, result.getAppliedRules().size());
+        assertEquals("Is there a tumor(s) in each breast?", result.getAppliedRules().get(3).getQuestion());
 
         // finally test difffernt diseases; set everything the same except for the DX year
         input1.setPrimarySite("C501");
@@ -80,7 +95,12 @@ public void testResults() throws IOException {
         input2.setDateOfDiagnosisYear("1998");
         input2.setLaterality("1");
         result = _MPH.mph(new MphInputPair(input1, input2)).execute().body();
-        assertEquals(MphResult.Result.MULTIPLE_PRIMARIES, result.getResult());
+        assertEquals(MphOutput.Result.MULTIPLE_PRIMARIES, result.getResult());
+        assertEquals("mp_2007_breast", result.getGroupId());
+        assertEquals("M5", result.getStep());
+        assertEquals("Tumors diagnosed more than five (5) years apart are multiple primaries.", result.getReason());
+        assertEquals(2, result.getAppliedRules().size());
+        assertEquals("Are there tumors diagnosed more than five (5) years apart?", result.getAppliedRules().get(1).getQuestion());
     }
 
 }