Add support for now() FHIR Path version of Now().

This addresses part of #39. PiperOrigin-RevId: 651237467
google · Jul 11, 2024 · 9e71c66 · 9e71c66
1 parent 863e6ce
commit 9e71c66
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/parser/operators.go b/parser/operators.go
@@ -1042,6 +1042,17 @@ func (p *Parser) loadSystemOperators() error {
 				}
 			},
 		},
+		{
+			name:     "now",
+			operands: [][]types.IType{{}},
+			model: func() model.IExpression {
+				return &model.Now{
+					NaryExpression: &model.NaryExpression{
+						Expression: model.ResultType(types.DateTime),
+					},
+				}
+			},
+		},
 		{
 			name:     "TimeOfDay",
 			operands: [][]types.IType{{}},

diff --git a/parser/operators_test.go b/parser/operators_test.go
@@ -812,6 +812,16 @@ func TestBuiltInFunctions(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "now()",
+			cql:  "now()",
+			want: &model.Now{
+				NaryExpression: &model.NaryExpression{
+					Operands:   []model.IExpression{},
+					Expression: model.ResultType(types.DateTime),
+				},
+			},
+		},
 		{
 			name: "TimeOfDay()",
 			cql:  "TimeOfDay()",

diff --git a/tests/enginetests/operator_datetime_test.go b/tests/enginetests/operator_datetime_test.go
@@ -726,6 +726,18 @@ func TestEvaluationTimestamp(t *testing.T) {
 			},
 			wantResult: newOrFatal(t, result.DateTime{Date: time.Date(2024, time.January, 1, 0, 0, 0, 1, time.UTC), Precision: model.MILLISECOND}),
 		},
+		{
+			name:                "now() returns passed evaluation timestamp",
+			cql:                 "define TESTRESULT: now()",
+			evaluationTimestamp: time.Date(2024, time.January, 1, 0, 0, 0, 1, time.UTC),
+			wantModel: &model.Now{
+				NaryExpression: &model.NaryExpression{
+					Operands:   []model.IExpression{},
+					Expression: model.ResultType(types.DateTime),
+				},
+			},
+			wantResult: newOrFatal(t, result.DateTime{Date: time.Date(2024, time.January, 1, 0, 0, 0, 1, time.UTC), Precision: model.MILLISECOND}),
+		},
 		{
 			name:                "Time returns passed evaluation timestamp time components",
 			cql:                 "define TESTRESULT: TimeOfDay()",