feat: add date filter on conditions

- adds date filter as a search param for conditions
savannahghi · Dec 8, 2023 · a9eff40 · a9eff40
1 parent be73e16
commit a9eff40
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 12 deletions.
diff --git a/pkg/clinical/presentation/graph/clinical.graphql b/pkg/clinical/presentation/graph/clinical.graphql
@@ -8,6 +8,7 @@ extend type Query {
   listPatientConditions(
     patientID: ID!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ConditionConnection
 

diff --git a/pkg/clinical/presentation/graph/clinical.resolvers.go b/pkg/clinical/presentation/graph/clinical.resolvers.go
diff --git a/pkg/clinical/presentation/graph/generated/generated.go b/pkg/clinical/presentation/graph/generated/generated.go
diff --git a/pkg/clinical/usecases/clinical/condition.go b/pkg/clinical/usecases/clinical/condition.go
@@ -180,7 +180,7 @@ func mapFHIRConditionToConditionDTO(condition domain.FHIRCondition) *dto.Conditi
 
 // ListPatientConditions lists a patients conditions
 // TODO: pagination
-func (c UseCasesClinicalImpl) ListPatientConditions(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ConditionConnection, error) {
+func (c UseCasesClinicalImpl) ListPatientConditions(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ConditionConnection, error) {
 	_, err := uuid.Parse(patientID)
 	if err != nil {
 		return nil, fmt.Errorf("invalid patient id: %s", patientID)
@@ -212,6 +212,10 @@ func (c UseCasesClinicalImpl) ListPatientConditions(ctx context.Context, patient
 		params["encounter"] = encounterReference
 	}
 
+	if date != nil {
+		params["recorded-date"] = date.AsTime().Format(dateFormatStr)
+	}
+
 	conditionsResponse, err := c.infrastructure.FHIR.SearchFHIRCondition(ctx, params, *identifiers, pagination)
 	if err != nil {
 		return nil, err

diff --git a/pkg/clinical/usecases/clinical/condition_test.go b/pkg/clinical/usecases/clinical/condition_test.go
@@ -465,6 +465,7 @@ func TestUseCasesClinicalImpl_ListPatientConditions(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  dto.Pagination
 	}
 	tests := []struct {
@@ -491,6 +492,20 @@ func TestUseCasesClinicalImpl_ListPatientConditions(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "happy case: list conditions with date",
+			args: args{
+				ctx:       context.Background(),
+				patientID: gofakeit.UUID(),
+				date: &scalarutils.Date{
+					Year:  2013,
+					Month: 12,
+					Day:   8,
+				},
+				pagination: dto.Pagination{},
+			},
+			wantErr: false,
+		},
 		{
 			name: "sad case: invalid patient id",
 			args: args{
@@ -569,7 +584,7 @@ func TestUseCasesClinicalImpl_ListPatientConditions(t *testing.T) {
 				}
 			}
 
-			got, err := c.ListPatientConditions(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			got, err := c.ListPatientConditions(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("ListPatientConditions() error = %v, wantErr %v", err, tt.wantErr)
 				return

diff --git a/pkg/clinical/usecases/usecases.go b/pkg/clinical/usecases/usecases.go
@@ -21,7 +21,7 @@ type Clinical interface {
 	EndEpisodeOfCare(ctx context.Context, id string) (*dto.EpisodeOfCare, error)
 
 	CreateCondition(ctx context.Context, input dto.ConditionInput) (*dto.Condition, error)
-	ListPatientConditions(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ConditionConnection, error)
+	ListPatientConditions(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ConditionConnection, error)
 
 	PatientHealthTimeline(ctx context.Context, input dto.HealthTimelineInput) (*dto.HealthTimeline, error)
 	GetMedicalData(ctx context.Context, patientID string) (*dto.MedicalData, error)