query conditions with encounterID

savannahghi · Dec 1, 2023 · 121e541 · 121e541
1 parent 7909635
commit 121e541
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 15 deletions.
diff --git a/pkg/clinical/presentation/graph/clinical.graphql b/pkg/clinical/presentation/graph/clinical.graphql
@@ -7,6 +7,7 @@ extend type Query {
   # Conditions
   listPatientConditions(
     patientID: ID!
+    encounterID: String
     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, pagination dto.Pagination) (*dto.ConditionConnection, error) {
+func (c UseCasesClinicalImpl) ListPatientConditions(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ConditionConnection, error) {
 	_, err := uuid.Parse(patientID)
 	if err != nil {
 		return nil, fmt.Errorf("invalid patient id: %s", patientID)
@@ -207,6 +207,11 @@ func (c UseCasesClinicalImpl) ListPatientConditions(ctx context.Context, patient
 		"_sort":   "date",
 	}
 
+	if encounterID != nil {
+		encounterReference := fmt.Sprintf("Encounter/%s", *encounterID)
+		params["encounter"] = encounterReference
+	}
+
 	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
@@ -460,10 +460,12 @@ func TestUseCasesClinicalImpl_CreateCondition(t *testing.T) {
 
 func TestUseCasesClinicalImpl_ListPatientConditions(t *testing.T) {
 	first := 3
+	encounterId := uuid.New().String()
 	type args struct {
-		ctx        context.Context
-		patientID  string
-		pagination dto.Pagination
+		ctx         context.Context
+		patientID   string
+		encounterID *string
+		pagination  dto.Pagination
 	}
 	tests := []struct {
 		name    string
@@ -479,6 +481,16 @@ func TestUseCasesClinicalImpl_ListPatientConditions(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "happy case: list conditions with encounterID",
+			args: args{
+				ctx:         context.Background(),
+				patientID:   gofakeit.UUID(),
+				encounterID: &encounterId,
+				pagination:  dto.Pagination{},
+			},
+			wantErr: false,
+		},
 		{
 			name: "sad case: invalid patient id",
 			args: args{
@@ -557,7 +569,7 @@ func TestUseCasesClinicalImpl_ListPatientConditions(t *testing.T) {
 				}
 			}
 
-			got, err := c.ListPatientConditions(tt.args.ctx, tt.args.patientID, tt.args.pagination)
+			got, err := c.ListPatientConditions(tt.args.ctx, tt.args.patientID, tt.args.encounterID, 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
@@ -20,7 +20,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, pagination dto.Pagination) (*dto.ConditionConnection, error)
+	ListPatientConditions(ctx context.Context, patientID string, encounterID *string, 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)