Merge branch 'main' into issue-105/add-ucum-conversion-support

Author: evan-gordon

CONTRIBUTING.md

@@ -23,6 +23,29 @@ sign a new one.
 This project follows
 [Google's Open Source Community Guidelines](https://opensource.google/conduct/).
 
+### Coding Guidelines
+
+**Note**: Code may be automatically formatted per the guidelines when merged.
+
+#### Go specific
+
+All Go code should comply with the
+[Go Code Review Comments](https://go.dev/wiki/CodeReviewComments) and
+[Effective Go](https://go.dev/doc/effective_go) guides, as well as the
+additional guidelines described here.
+
+#### Early exit
+
+All code, unless it substantially increases the line count or complexity, should
+use early exits from loops and functions where possible.
+
+### Bug IDs
+
+Some `TODO`s and `NOTE`s sprinkled throughout the code have associated IDs of
+the form `b/1234`. These correspond to bugs in our internal bug tracker.
+Eventually these bugs will be moved to the GitHub Issues, but until then they
+can simply be ignored.
+
 ## Contribution process
 
 ### Code reviews

beam/main_test.go

@@ -60,28 +60,28 @@ func TestPipeline(t *testing.T) {
 				EvaluationTimestamp: time.Date(2023, time.January, 1, 0, 0, 0, 0, time.UTC),
 			},
 			wantOutput: []*cbpb.BeamResult{
-				&cbpb.BeamResult{
+				{
 					Id:                  proto.String("1"),
 					EvaluationTimestamp: timestamppb.New(time.Date(2023, time.January, 1, 0, 0, 0, 0, time.UTC)),
 					Result: &crpb.Libraries{
 						Libraries: []*crpb.Library{
-							&crpb.Library{
+							{
 								Name:    proto.String("BeamMetadata"),
 								Version: proto.String("1.0.0"),
 								ExprDefs: map[string]*crpb.Value{
-									"ID": &crpb.Value{
+									"ID": {
 										Value: &crpb.Value_StringValue{StringValue: "1"},
 									},
 								},
 							},
-							&crpb.Library{
+							{
 								Name:    proto.String("EvalTest"),
 								Version: proto.String("1.0"),
 								ExprDefs: map[string]*crpb.Value{
-									"HasDiabetes": &crpb.Value{
+									"HasDiabetes": {
 										Value: &crpb.Value_BooleanValue{BooleanValue: true},
 									},
-									"DiabetesVS": &crpb.Value{
+									"DiabetesVS": {
 										Value: &crpb.Value_ValueSetValue{
 											ValueSetValue: &crpb.ValueSet{Id: proto.String("https://example.com/vs/glucose"), Version: proto.String("")},
 										},
@@ -109,7 +109,7 @@ func TestPipeline(t *testing.T) {
 			},
 			wantOutput: []*cbpb.BeamResult{},
 			wantError: []*cbpb.BeamError{
-				&cbpb.BeamError{
+				{
 					ErrorMessage: proto.String("failed during CQL evaluation: EvalTest 1.0, could not find ValueSet{urn:example:nosuchvalueset, } resource not loaded"),
 					SourceUri:    proto.String("bundle:bundle1"),
 				},

beam/transforms/eval_test.go

@@ -84,38 +84,38 @@ func TestCQLEvalFn(t *testing.T) {
 				 ]
 			}`).GetBundle(),
 			wantResult: []*cbpb.BeamResult{
-				&cbpb.BeamResult{
+				{
 					Id:                  proto.String("1"),
 					EvaluationTimestamp: timestamppb.New(time.Date(2023, time.January, 1, 0, 0, 0, 0, time.UTC)),
 					Result: &crpb.Libraries{
 						Libraries: []*crpb.Library{
-							&crpb.Library{
+							{
 								Name:    proto.String("EvalTest"),
 								Version: proto.String("1.0"),
 								ExprDefs: map[string]*crpb.Value{
-									"HasDiabetes": &crpb.Value{
+									"HasDiabetes": {
 										Value: &crpb.Value_BooleanValue{BooleanValue: true},
 									},
-									"HasHypertension": &crpb.Value{
+									"HasHypertension": {
 										Value: &crpb.Value_BooleanValue{BooleanValue: true},
 									},
-									"DiabetesVS": &crpb.Value{
+									"DiabetesVS": {
 										Value: &crpb.Value_ValueSetValue{
 											ValueSetValue: &crpb.ValueSet{Id: proto.String("urn:example:diabetes"), Version: proto.String("")},
 										},
 									},
-									"HypertensionVS": &crpb.Value{
+									"HypertensionVS": {
 										Value: &crpb.Value_ValueSetValue{
 											ValueSetValue: &crpb.ValueSet{Id: proto.String("urn:example:hypertension"), Version: proto.String("")},
 										},
 									},
 								},
 							},
-							&crpb.Library{
+							{
 								Name:    proto.String("BeamMetadata"),
 								Version: proto.String("1.0.0"),
 								ExprDefs: map[string]*crpb.Value{
-									"ID": &crpb.Value{
+									"ID": {
 										Value: &crpb.Value_StringValue{StringValue: "1"},
 									},
 								},
@@ -159,7 +159,7 @@ func TestCQLEvalFn(t *testing.T) {
 				 ]
 			}`).GetBundle(),
 			wantError: []*cbpb.BeamError{
-				&cbpb.BeamError{
+				{
 					ErrorMessage: proto.String("failed during CQL evaluation: EvalTest 1.0, could not find ValueSet{urn:example:nosuchvalueset, } resource not loaded"),
 					SourceUri:    proto.String("bundle:bundle1"),
 				},

beam/transforms/sink_test.go

@@ -37,39 +37,39 @@ func TestNDJSONSink(t *testing.T) {
 		{
 			name: "Successful Rows",
 			outputs: []*cbpb.BeamResult{
-				&cbpb.BeamResult{
+				{
 					Id:                  proto.String("1"),
 					EvaluationTimestamp: timestamppb.New(time.Date(2023, time.November, 1, 1, 20, 30, 1e8, time.UTC)),
 					Result: &crpb.Libraries{
 						Libraries: []*crpb.Library{
-							&crpb.Library{
+							{
 								Name:    proto.String("TESTLIB"),
 								Version: proto.String("1.0.0"),
 								ExprDefs: map[string]*crpb.Value{
-									"HasDiabetes": &crpb.Value{
+									"HasDiabetes": {
 										Value: &crpb.Value_BooleanValue{BooleanValue: false},
 									},
-									"HasHypertension": &crpb.Value{
+									"HasHypertension": {
 										Value: &crpb.Value_BooleanValue{BooleanValue: false},
 									},
 								},
 							},
 						},
 					},
 				},
-				&cbpb.BeamResult{
+				{
 					Id:                  proto.String("2"),
 					EvaluationTimestamp: timestamppb.New(time.Date(2023, time.December, 2, 1, 20, 30, 1e8, time.UTC)),
 					Result: &crpb.Libraries{
 						Libraries: []*crpb.Library{
-							&crpb.Library{
+							{
 								Name:    proto.String("TESTLIB"),
 								Version: proto.String("1.0.0"),
 								ExprDefs: map[string]*crpb.Value{
-									"HasDiabetes": &crpb.Value{
+									"HasDiabetes": {
 										Value: &crpb.Value_BooleanValue{BooleanValue: true},
 									},
-									"HasHypertension": &crpb.Value{
+									"HasHypertension": {
 										Value: &crpb.Value_BooleanValue{BooleanValue: true},
 									},
 								},

cmd/cli/cli_test.go

@@ -252,7 +252,7 @@ func TestParseFHIRParameters(t *testing.T) {
 				]
 			}`,
 			want: map[result.DefKey]string{
-				result.DefKey{Name: "boolean value"}: "true",
+				{Name: "boolean value"}: "true",
 			},
 		},
 		{
@@ -268,7 +268,7 @@ func TestParseFHIRParameters(t *testing.T) {
 				]
 			}`,
 			want: map[result.DefKey]string{
-				result.DefKey{Name: "decimal value"}: "1.1",
+				{Name: "decimal value"}: "1.1",
 			},
 		},
 		{
@@ -284,7 +284,7 @@ func TestParseFHIRParameters(t *testing.T) {
 				]
 			}`,
 			want: map[result.DefKey]string{
-				result.DefKey{Name: "integer value"}: "42",
+				{Name: "integer value"}: "42",
 			},
 		},
 		{
@@ -300,7 +300,7 @@ func TestParseFHIRParameters(t *testing.T) {
 				]
 			}`,
 			want: map[result.DefKey]string{
-				result.DefKey{Name: "positive integer value"}: "42",
+				{Name: "positive integer value"}: "42",
 			},
 		},
 		{
@@ -316,7 +316,7 @@ func TestParseFHIRParameters(t *testing.T) {
 				]
 			}`,
 			want: map[result.DefKey]string{
-				result.DefKey{Name: "unsigned integer value"}: "43",
+				{Name: "unsigned integer value"}: "43",
 			},
 		},
 		// This currently isn't particularly useful but we will need to support it properly in the future.
@@ -333,7 +333,7 @@ func TestParseFHIRParameters(t *testing.T) {
 				]
 			}`,
 			want: map[result.DefKey]string{
-				result.DefKey{Name: "code value"}: "value: 'code_value'",
+				{Name: "code value"}: "value: 'code_value'",
 			},
 		},
 	}

cql_test.go

@@ -70,7 +70,7 @@ func TestCQL(t *testing.T) {
 			wantSourceExpression: &model.Query{
 				Expression: model.ResultType(&types.List{ElementType: &types.Named{TypeName: "FHIR.Encounter"}}),
 				Source: []*model.AliasedSource{
-					&model.AliasedSource{
+					{
 						Alias:      "E",
 						Expression: model.ResultType(&types.List{ElementType: &types.Named{TypeName: "FHIR.Encounter"}}),
 						Source: &model.Retrieve{
@@ -186,7 +186,7 @@ func TestCQL_ParseErrors(t *testing.T) {
 				LibKey: result.LibKey{Name: "Unnamed Library", IsUnnamed: true /* Version is ignored*/},
 				Errors: []*parser.ParsingError{
 					{
-						Message: "could not resolve Add(System.Integer, System.String): no matching overloads",
+						Message: "could not resolve Add(System.Integer, System.String): no matching overloads available overloads: [Add(System.Integer, System.Integer), Add(System.Long, System.Long), Add(System.Decimal, System.Decimal), Add(System.Quantity, System.Quantity), Add(System.String, System.String), Add(System.Date, System.Quantity), Add(System.DateTime, System.Quantity), Add(System.Time, System.Quantity)]",
 						Line:    1,
 						Column:  12,
 					},
@@ -205,7 +205,7 @@ func TestCQL_ParseErrors(t *testing.T) {
 			retriever: enginetests.BuildRetriever(t),
 			parserConfig: cql.ParseConfig{
 				Parameters: map[result.DefKey]string{
-					result.DefKey{Name: "param name", Library: result.LibKey{Name: "TESTLIB", Version: "1.0.0"}}: "invalid value",
+					{Name: "param name", Library: result.LibKey{Name: "TESTLIB", Version: "1.0.0"}}: "invalid value",
 				},
 				DataModels: [][]byte{fhirDataModel(t)},
 			},
@@ -311,7 +311,7 @@ func TestCQL_MultipleEvals(t *testing.T) {
 			wantSourceExpression: &model.Query{
 				Expression: model.ResultType(&types.List{ElementType: &types.Named{TypeName: "FHIR.Encounter"}}),
 				Source: []*model.AliasedSource{
-					&model.AliasedSource{
+					{
 						Alias:      "E",
 						Expression: model.ResultType(&types.List{ElementType: &types.Named{TypeName: "FHIR.Encounter"}}),
 						Source: &model.Retrieve{

example_test.go

@@ -66,7 +66,7 @@ func Example() {
 	// be accepted, such as 400 or List<Choice<Integer, String>>{1, 'stringParam'}. In this example we
 	// override the MeasurementPeriod parameter to an interval between 2017 and 2019.
 	parameters := map[result.DefKey]string{
-		result.DefKey{
+		{
 			Library: result.LibKey{Name: "Example", Version: "1.2.3"},
 			Name:    "MeasurementPeriod",
 		}: "Interval[@2017, @2019]"}