fix parameter types for GET

Author: barhodes

cqf-fhir-cr-hapi/src/main/java/org/opencds/cqf/fhir/cr/hapi/dstu3/measure/MeasureOperationsProvider.java

@@ -12,6 +12,9 @@
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.provider.ProviderConstants;
 import org.hl7.fhir.dstu3.model.Bundle;
+import org.hl7.fhir.dstu3.model.CodeType;
+import org.hl7.fhir.dstu3.model.DateTimeType;
+import org.hl7.fhir.dstu3.model.DateType;
 import org.hl7.fhir.dstu3.model.Endpoint;
 import org.hl7.fhir.dstu3.model.IdType;
 import org.hl7.fhir.dstu3.model.Measure;
@@ -62,12 +65,12 @@ public MeasureOperationsProvider(IMeasureServiceFactory dstu3MeasureProcessorFac
     @Operation(name = ProviderConstants.CR_OPERATION_EVALUATE_MEASURE, idempotent = true, type = Measure.class)
     public MeasureReport evaluateMeasure(
             @IdParam IdType id,
-            @OperationParam(name = "periodStart") ParametersParameterComponent periodStart,
-            @OperationParam(name = "periodEnd") ParametersParameterComponent periodEnd,
-            @OperationParam(name = "reportType") ParametersParameterComponent reportType,
-            @OperationParam(name = "patient") ParametersParameterComponent patient,
-            @OperationParam(name = "practitioner") ParametersParameterComponent practitioner,
-            @OperationParam(name = "lastReceivedOn") ParametersParameterComponent lastReceivedOn,
+            @OperationParam(name = "periodStart") DateType periodStart,
+            @OperationParam(name = "periodEnd") DateType periodEnd,
+            @OperationParam(name = "reportType") CodeType reportType,
+            @OperationParam(name = "patient") StringType patient,
+            @OperationParam(name = "practitioner") StringType practitioner,
+            @OperationParam(name = "lastReceivedOn") DateTimeType lastReceivedOn,
             @OperationParam(name = "productLine") StringType productLine,
             @OperationParam(name = "additionalData") Bundle additionalData,
             @OperationParam(name = "terminologyEndpoint") ParametersParameterComponent terminologyEndpoint,
@@ -78,12 +81,12 @@ public MeasureReport evaluateMeasure(
                 .create(requestDetails)
                 .evaluateMeasure(
                         id,
-                        getStringValue(fhirVersion, periodStart),
-                        getStringValue(fhirVersion, periodEnd),
-                        getStringValue(fhirVersion, reportType),
-                        getStringOrReferenceValue(fhirVersion, patient),
-                        getStringOrReferenceValue(fhirVersion, practitioner),
-                        getStringValue(fhirVersion, lastReceivedOn),
+                        getStringValue(periodStart),
+                        getStringValue(periodEnd),
+                        getStringValue(reportType),
+                        getStringValue(patient),
+                        getStringValue(practitioner),
+                        getStringValue(lastReceivedOn),
                         getStringValue(productLine),
                         additionalData,
                         parameters,

cqf-fhir-cr-hapi/src/main/java/org/opencds/cqf/fhir/cr/hapi/r4/measure/CareGapsOperationProvider.java

@@ -13,6 +13,7 @@
 import java.util.Optional;
 import org.hl7.fhir.r4.model.BooleanType;
 import org.hl7.fhir.r4.model.CanonicalType;
+import org.hl7.fhir.r4.model.DateType;
 import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.Measure;
 import org.hl7.fhir.r4.model.Parameters;
@@ -84,9 +85,9 @@ public CareGapsOperationProvider(
     @Operation(name = ProviderConstants.CR_OPERATION_CARE_GAPS, idempotent = true, type = Measure.class)
     public Parameters careGapsReport(
             RequestDetails requestDetails,
-            @OperationParam(name = "periodStart") ParametersParameterComponent periodStart,
-            @OperationParam(name = "periodEnd") ParametersParameterComponent periodEnd,
-            @OperationParam(name = "subject") ParametersParameterComponent subject,
+            @OperationParam(name = "periodStart") DateType periodStart,
+            @OperationParam(name = "periodEnd") DateType periodEnd,
+            @OperationParam(name = "subject") StringType subject,
             @OperationParam(name = "status") List<StringType> status,
             @OperationParam(name = "measureId") List<StringType> measureId,
             @OperationParam(name = "measureIdentifier") List<StringType> measureIdentifier,
@@ -96,11 +97,9 @@ public Parameters careGapsReport(
         return r4CareGapsProcessorFactory
                 .create(requestDetails)
                 .getCareGapsReport(
-                        stringTimePeriodHandler.getStartZonedDateTime(
-                                getStringValue(fhirVersion, periodStart), requestDetails),
-                        stringTimePeriodHandler.getEndZonedDateTime(
-                                getStringValue(fhirVersion, periodEnd), requestDetails),
-                        getStringOrReferenceValue(fhirVersion, subject),
+                        stringTimePeriodHandler.getStartZonedDateTime(getStringValue(periodStart), requestDetails),
+                        stringTimePeriodHandler.getEndZonedDateTime(getStringValue(periodEnd), requestDetails),
+                        getStringValue(subject),
                         status == null
                                 ? null
                                 : status.stream()

cqf-fhir-cr-hapi/src/main/java/org/opencds/cqf/fhir/cr/hapi/r4/measure/CollectDataOperationProvider.java

@@ -10,10 +10,12 @@
 import ca.uhn.fhir.rest.annotation.OperationParam;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.server.provider.ProviderConstants;
+import org.hl7.fhir.r4.model.DateType;
 import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.Measure;
 import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.Parameters.ParametersParameterComponent;
+import org.hl7.fhir.r4.model.StringType;
 import org.opencds.cqf.fhir.cr.hapi.common.StringTimePeriodHandler;
 import org.opencds.cqf.fhir.cr.hapi.r4.ICollectDataServiceFactory;
 
@@ -58,20 +60,18 @@ public CollectDataOperationProvider(
     @Operation(name = ProviderConstants.CR_OPERATION_COLLECTDATA, idempotent = true, type = Measure.class)
     public Parameters collectData(
             @IdParam IdType id,
-            @OperationParam(name = "periodStart") ParametersParameterComponent periodStart,
-            @OperationParam(name = "periodEnd") ParametersParameterComponent periodEnd,
-            @OperationParam(name = "subject") ParametersParameterComponent subject,
-            @OperationParam(name = "practitioner") ParametersParameterComponent practitioner,
+            @OperationParam(name = "periodStart") DateType periodStart,
+            @OperationParam(name = "periodEnd") DateType periodEnd,
+            @OperationParam(name = "subject") StringType subject,
+            @OperationParam(name = "practitioner") StringType practitioner,
             RequestDetails requestDetails) {
         return r4CollectDataServiceFactory
                 .create(requestDetails)
                 .collectData(
                         id,
-                        stringTimePeriodHandler.getStartZonedDateTime(
-                                getStringValue(fhirVersion, periodStart), requestDetails),
-                        stringTimePeriodHandler.getEndZonedDateTime(
-                                getStringValue(fhirVersion, periodEnd), requestDetails),
-                        getStringOrReferenceValue(fhirVersion, subject),
-                        getStringOrReferenceValue(fhirVersion, practitioner));
+                        stringTimePeriodHandler.getStartZonedDateTime(getStringValue(periodStart), requestDetails),
+                        stringTimePeriodHandler.getEndZonedDateTime(getStringValue(periodEnd), requestDetails),
+                        getStringValue(subject),
+                        getStringValue(practitioner));
     }
 }

cqf-fhir-cr-hapi/src/main/java/org/opencds/cqf/fhir/cr/hapi/r4/measure/DataRequirementsOperationProvider.java

@@ -8,6 +8,7 @@
 import ca.uhn.fhir.rest.annotation.OperationParam;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.server.provider.ProviderConstants;
+import org.hl7.fhir.r4.model.DateType;
 import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.Library;
 import org.hl7.fhir.r4.model.Measure;
@@ -41,11 +42,11 @@ public DataRequirementsOperationProvider(IDataRequirementsServiceFactory r4DataR
     @Operation(name = ProviderConstants.CR_OPERATION_DATAREQUIREMENTS, idempotent = true, type = Measure.class)
     public Library dataRequirements(
             @IdParam IdType id,
-            @OperationParam(name = "periodStart") ParametersParameterComponent periodStart,
-            @OperationParam(name = "periodEnd") ParametersParameterComponent periodEnd,
+            @OperationParam(name = "periodStart") DateType periodStart,
+            @OperationParam(name = "periodEnd") DateType periodEnd,
             RequestDetails requestDetails) {
         return r4DataRequirementsServiceFactory
                 .create(requestDetails)
-                .dataRequirements(id, getStringValue(fhirVersion, periodStart), getStringValue(fhirVersion, periodEnd));
+                .dataRequirements(id, getStringValue(periodStart), getStringValue(periodEnd));
     }
 }

cqf-fhir-cr-hapi/src/main/java/org/opencds/cqf/fhir/cr/hapi/r4/measure/MeasureOperationsProvider.java

@@ -14,6 +14,7 @@
 import java.util.List;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r4.model.Bundle;
+import org.hl7.fhir.r4.model.DateType;
 import org.hl7.fhir.r4.model.Endpoint;
 import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.Measure;
@@ -75,12 +76,12 @@ public MeasureOperationsProvider(
     @Operation(name = ProviderConstants.CR_OPERATION_EVALUATE_MEASURE, idempotent = true, type = Measure.class)
     public MeasureReport evaluateMeasure(
             @IdParam IdType id,
-            @OperationParam(name = "periodStart") ParametersParameterComponent periodStart,
-            @OperationParam(name = "periodEnd") ParametersParameterComponent periodEnd,
-            @OperationParam(name = "reportType") ParametersParameterComponent reportType,
-            @OperationParam(name = "subject") ParametersParameterComponent subject,
-            @OperationParam(name = "practitioner") ParametersParameterComponent practitioner,
-            @OperationParam(name = "lastReceivedOn") ParametersParameterComponent lastReceivedOn,
+            @OperationParam(name = "periodStart") DateType periodStart,
+            @OperationParam(name = "periodEnd") DateType periodEnd,
+            @OperationParam(name = "reportType") StringType reportType,
+            @OperationParam(name = "subject") StringType subject,
+            @OperationParam(name = "practitioner") StringType practitioner,
+            @OperationParam(name = "lastReceivedOn") StringType lastReceivedOn,
             @OperationParam(name = "productLine") StringType productLine,
             @OperationParam(name = "additionalData") Bundle additionalData,
             @OperationParam(name = "contentEndpoint") ParametersParameterComponent contentEndpoint,
@@ -93,20 +94,18 @@ public MeasureReport evaluateMeasure(
                 .create(requestDetails)
                 .evaluate(
                         Eithers.forMiddle3(id),
-                        stringTimePeriodHandler.getStartZonedDateTime(
-                                getStringValue(fhirVersion, periodStart), requestDetails),
-                        stringTimePeriodHandler.getEndZonedDateTime(
-                                getStringValue(fhirVersion, periodEnd), requestDetails),
-                        getStringValue(fhirVersion, reportType),
-                        getStringOrReferenceValue(fhirVersion, subject),
-                        getStringValue(fhirVersion, lastReceivedOn),
+                        stringTimePeriodHandler.getStartZonedDateTime(getStringValue(periodStart), requestDetails),
+                        stringTimePeriodHandler.getEndZonedDateTime(getStringValue(periodEnd), requestDetails),
+                        getStringValue(reportType),
+                        getStringValue(subject),
+                        getStringValue(lastReceivedOn),
                         (Endpoint) getEndpoint(fhirVersion, contentEndpoint),
                         (Endpoint) getEndpoint(fhirVersion, terminologyEndpoint),
                         (Endpoint) getEndpoint(fhirVersion, dataEndpoint),
                         additionalData,
                         parameters,
                         getStringValue(productLine),
-                        getStringOrReferenceValue(fhirVersion, practitioner));
+                        getStringValue(practitioner));
     }
 
     /**
@@ -142,12 +141,12 @@ public Parameters evaluate(
             @OperationParam(name = "measureUrl") List<StringType> measureUrl,
             @OperationParam(name = "measureIdentifier") List<StringType> measureIdentifier,
             @OperationParam(name = "measure") List<StringType> measure,
-            @OperationParam(name = "periodStart") ParametersParameterComponent periodStart,
-            @OperationParam(name = "periodEnd") ParametersParameterComponent periodEnd,
-            @OperationParam(name = "reportType") ParametersParameterComponent reportType,
-            @OperationParam(name = "subject") ParametersParameterComponent subject,
-            @OperationParam(name = "practitioner") ParametersParameterComponent practitioner,
-            @OperationParam(name = "lastReceivedOn") ParametersParameterComponent lastReceivedOn,
+            @OperationParam(name = "periodStart") DateType periodStart,
+            @OperationParam(name = "periodEnd") DateType periodEnd,
+            @OperationParam(name = "reportType") StringType reportType,
+            @OperationParam(name = "subject") StringType subject,
+            @OperationParam(name = "practitioner") StringType practitioner,
+            @OperationParam(name = "lastReceivedOn") StringType lastReceivedOn,
             @OperationParam(name = "productLine") StringType productLine,
             @OperationParam(name = "additionalData") Bundle additionalData,
             @OperationParam(name = "contentEndpoint") ParametersParameterComponent contentEndpoint,
@@ -171,12 +170,10 @@ public Parameters evaluate(
                                 : measureIdentifier.stream()
                                         .map(ParameterHelper::getStringValue)
                                         .toList(), // List<Identifier>
-                        stringTimePeriodHandler.getStartZonedDateTime(
-                                getStringValue(fhirVersion, periodStart), requestDetails),
-                        stringTimePeriodHandler.getEndZonedDateTime(
-                                getStringValue(fhirVersion, periodEnd), requestDetails),
-                        getStringValue(fhirVersion, reportType),
-                        getStringOrReferenceValue(fhirVersion, subject),
+                        stringTimePeriodHandler.getStartZonedDateTime(getStringValue(periodStart), requestDetails),
+                        stringTimePeriodHandler.getEndZonedDateTime(getStringValue(periodEnd), requestDetails),
+                        getStringValue(reportType),
+                        getStringValue(subject),
                         (Endpoint) getEndpoint(fhirVersion, contentEndpoint),
                         (Endpoint) getEndpoint(fhirVersion, terminologyEndpoint),
                         (Endpoint) getEndpoint(fhirVersion, dataEndpoint),

cqf-fhir-cr-hapi/src/test/java/org/opencds/cqf/fhir/cr/hapi/r4/MeasureOperationProviderIT.java

@@ -39,6 +39,7 @@ public MeasureReport runEvaluateMeasure(
                 .named(ProviderConstants.CR_OPERATION_EVALUATE_MEASURE)
                 .withParameters(parametersEval)
                 .returnResourceType(MeasureReport.class)
+                .useHttpGet()
                 .execute();
     }