Resolve 5480 Update member-match signature to match the spec (#5481)

* - Changed member-match function param names, and return value - modified existing tests to accomodate for the change * removed tests unsuitable for new return value * resolve code review comments * version bump
hapifhir · Nov 24, 2023 · 9f827a7 · 9f827a7
1 parent a1aa9c4
commit 9f827a7
Show file tree

Hide file tree

Showing 83 changed files with 147 additions and 229 deletions.
diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java
@@ -227,8 +227,8 @@ public class Constants {
 
  public static final String PARAM_MEMBER_IDENTIFIER = "MemberIdentifier";
 
- public static final String PARAM_OLD_COVERAGE = "OldCoverage";
- public static final String PARAM_NEW_COVERAGE = "NewCoverage";
+ public static final String COVERAGE_TO_MATCH = "CoverageToMatch";
+ public static final String COVERAGE_TO_LINK = "CoverageToLink";
  public static final String PARAM_CONSENT = "Consent";
  public static final String PARAM_MEMBER_PATIENT_NAME = PARAM_MEMBER_PATIENT + " Name";
  public static final String PARAM_MEMBER_PATIENT_BIRTHDATE = PARAM_MEMBER_PATIENT + " Birthdate";

diff --git a/hapi-fhir-bom/pom.xml b/hapi-fhir-bom/pom.xml
@@ -4,15 +4,15 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-bom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <packaging>pom</packaging>
  <name>HAPI FHIR BOM</name>
 
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-checkstyle/pom.xml b/hapi-fhir-checkstyle/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-cli</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-client/pom.xml b/hapi-fhir-client/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-docs/pom.xml b/hapi-fhir-docs/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/...a/uhn/hapi/fhir/changelog/7_0_0/5480-update-member-match-signature-to-match-the-spec.yaml b/...a/uhn/hapi/fhir/changelog/7_0_0/5480-update-member-match-signature-to-match-the-spec.yaml
@@ -0,0 +1,4 @@
+---
+type: add
+issue: 5480
+title: "Updated $member-match operation signature to match the latest specification."
diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml
@@ -11,7 +11,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jaxrsserver-base/pom.xml b/hapi-fhir-jaxrsserver-base/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpa/pom.xml b/hapi-fhir-jpa/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/...aserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatchR4ResourceProvider.java b/...aserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatchR4ResourceProvider.java
@@ -59,18 +59,18 @@ public MemberMatchR4ResourceProvider(FhirContext theFhirContext, MemberMatcherR4
  returnParameters = {@OperationParam(name = "MemberIdentifier", typeName = "string")})
  public Parameters patientMemberMatch(
  javax.servlet.http.HttpServletRequest theServletRequest,
- @Description(
- shortDefinition =
- "The target of the operation. Will be returned with Identifier for matched coverage added.")
+ @Description(shortDefinition = "The target of the operation. Contain member Patient demographics.")
  @OperationParam(name = Constants.PARAM_MEMBER_PATIENT, min = 1, max = 1)
  Patient theMemberPatient,
- @Description(shortDefinition = "Old coverage information as extracted from beneficiary's card.")
- @OperationParam(name = Constants.PARAM_OLD_COVERAGE, min = 1, max = 1)
+ @Description(
+ shortDefinition =
+ "Old coverage information as extracted from beneficiary's card. Identifies the coverage to be matched by the receiving payer.")
+ @OperationParam(name = Constants.COVERAGE_TO_MATCH, min = 1, max = 1)
  Coverage oldCoverage,
  @Description(
  shortDefinition =
- "New Coverage information. Provided as a reference. Optionally returned unmodified.")
- @OperationParam(name = Constants.PARAM_NEW_COVERAGE, min = 1, max = 1)
+ "New Coverage information. Identifies the coverage information of the member as they are known by the requesting payer. Provided as a reference.")
+ @OperationParam(name = Constants.COVERAGE_TO_LINK, min = 1, max = 1)
  Coverage newCoverage,
  @Description(
  shortDefinition =
@@ -129,14 +129,14 @@ private Parameters doMemberMatchOperation(
 
  myMemberMatcherR4Helper.addMemberIdentifierToMemberPatient(theMemberPatient, patient.getIdentifierFirstRep());
  myMemberMatcherR4Helper.updateConsentForMemberMatch(theConsent, patient, theMemberPatient, theRequestDetails);
- return myMemberMatcherR4Helper.buildSuccessReturnParameters(theMemberPatient, theCoverageToLink, theConsent);
+ return myMemberMatcherR4Helper.buildSuccessReturnParameters(patient);
  }
 
  private void validateParams(
  Patient theMemberPatient, Coverage theOldCoverage, Coverage theNewCoverage, Consent theConsent) {
  validateParam(theMemberPatient, Constants.PARAM_MEMBER_PATIENT);
- validateParam(theOldCoverage, Constants.PARAM_OLD_COVERAGE);
- validateParam(theNewCoverage, Constants.PARAM_NEW_COVERAGE);
+ validateParam(theOldCoverage, Constants.COVERAGE_TO_MATCH);
+ validateParam(theNewCoverage, Constants.COVERAGE_TO_LINK);
  validateParam(theConsent, Constants.PARAM_CONSENT);
  validateMemberPatientParam(theMemberPatient);
  validateConsentParam(theConsent);

diff --git a/...-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4Helper.java b/...-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4Helper.java
@@ -51,10 +51,7 @@
 import java.util.function.Consumer;
 import javax.annotation.Nullable;
 
-import static ca.uhn.fhir.rest.api.Constants.PARAM_CONSENT;
 import static ca.uhn.fhir.rest.api.Constants.PARAM_MEMBER_IDENTIFIER;
-import static ca.uhn.fhir.rest.api.Constants.PARAM_MEMBER_PATIENT;
-import static ca.uhn.fhir.rest.api.Constants.PARAM_NEW_COVERAGE;
 
 public class MemberMatcherR4Helper {
  static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(MemberMatcherR4Helper.class);
@@ -144,13 +141,13 @@ public void updateConsentForMemberMatch(
  myConsentDao.create(theConsent, theRequestDetails);
  }
 
- public Parameters buildSuccessReturnParameters(Patient theMemberPatient, Coverage theCoverage, Consent theConsent) {
+ public Parameters buildSuccessReturnParameters(Patient thePatient) {
  IBaseParameters parameters = ParametersUtil.newInstance(myFhirContext);
- ParametersUtil.addParameterToParameters(myFhirContext, parameters, PARAM_MEMBER_PATIENT, theMemberPatient);
- ParametersUtil.addParameterToParameters(myFhirContext, parameters, PARAM_NEW_COVERAGE, theCoverage);
- ParametersUtil.addParameterToParameters(myFhirContext, parameters, PARAM_CONSENT, theConsent);
  ParametersUtil.addParameterToParameters(
- myFhirContext, parameters, PARAM_MEMBER_IDENTIFIER, getIdentifier(theMemberPatient));
+ myFhirContext,
+ parameters,
+ PARAM_MEMBER_IDENTIFIER,
+ thePatient.getIdElement().toUnqualifiedVersionless());
  return (Parameters) parameters;
  }
 

diff --git a/...r-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4HelperTest.java b/...r-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4HelperTest.java
@@ -1,7 +1,6 @@
 package ca.uhn.fhir.jpa.provider.r4;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.model.api.IQueryParameterType;
@@ -20,6 +19,7 @@
 import org.hl7.fhir.r4.model.Coverage;
 import org.hl7.fhir.r4.model.DateType;
 import org.hl7.fhir.r4.model.HumanName;
+import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.Identifier;
 import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.Patient;
@@ -40,13 +40,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import static ca.uhn.fhir.rest.api.Constants.PARAM_CONSENT;
 import static ca.uhn.fhir.rest.api.Constants.PARAM_MEMBER_IDENTIFIER;
-import static ca.uhn.fhir.rest.api.Constants.PARAM_MEMBER_PATIENT;
-import static ca.uhn.fhir.rest.api.Constants.PARAM_NEW_COVERAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.startsWith;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -162,38 +158,13 @@ void buildSuccessReturnParameters() {
  identifierType.addCoding(new Coding("", "MB", ""));
  identifier.setType(identifierType);
  Patient patient = new Patient();
- Coverage coverage = new Coverage();
- Consent consent = new Consent();
+ patient.setId("Patient/test123");
  patient.addIdentifier(identifier);
 
- Parameters result = myHelper.buildSuccessReturnParameters(patient, coverage, consent);
-
- assertEquals(PARAM_MEMBER_PATIENT, result.getParameter().get(0).getName());
- assertEquals(patient, result.getParameter().get(0).getResource());
-
- assertEquals(PARAM_NEW_COVERAGE, result.getParameter().get(1).getName());
- assertEquals(coverage, result.getParameter().get(1).getResource());
-
- assertEquals(PARAM_CONSENT, result.getParameter().get(2).getName());
- assertEquals(consent, result.getParameter().get(2).getResource());
+ Parameters result = myHelper.buildSuccessReturnParameters(patient);
 
- assertEquals(PARAM_MEMBER_IDENTIFIER, result.getParameter().get(3).getName());
- assertEquals(identifier, result.getParameter().get(3).getValue());
- }
-
- @Test
- void buildNotSuccessReturnParameters_IncorrectPatientIdentifier() {
- Identifier identifier = new Identifier();
- Patient patient = new Patient();
- Coverage coverage = new Coverage();
- Consent consent = new Consent();
- patient.addIdentifier(identifier);
-
- try {
- myHelper.buildSuccessReturnParameters(patient, coverage, consent);
- } catch (Exception e) {
- assertThat(e.getMessage(), startsWith(Msg.code(2219)));
- }
+ assertEquals(PARAM_MEMBER_IDENTIFIER, result.getParameter().get(0).getName());
+ assertEquals(patient.getId(), ((IdType)(result.getParameter().get(0).getValue())).getValue());
  }
 
  @Test

diff --git a/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml b/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-hfql/pom.xml b/hapi-fhir-jpaserver-hfql/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-ips/pom.xml b/hapi-fhir-jpaserver-ips/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpaserver-mdm/pom.xml b/hapi-fhir-jpaserver-mdm/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-model/pom.xml b/hapi-fhir-jpaserver-model/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpaserver-searchparam/pom.xml b/hapi-fhir-jpaserver-searchparam/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpaserver-subscription/pom.xml b/hapi-fhir-jpaserver-subscription/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-test-dstu2/pom.xml b/hapi-fhir-jpaserver-test-dstu2/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.11.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>