feat: add date filter on composition (#295)

-adds date filter as a search param for compositions
savannahghi · Dec 14, 2023 · 443cb4a · 443cb4a
1 parent a6295e4
commit 443cb4a
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
@@ -16,6 +16,7 @@ extend type Query {
   listPatientCompositions(
     patientID: ID!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): CompositionConnection
 

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/composition.go b/pkg/clinical/usecases/clinical/composition.go
@@ -173,7 +173,7 @@ func mapFHIRCompositionToCompositionDTO(composition domain.FHIRComposition) *dto
 }
 
 // ListPatientCompositions lists a patient's compositions
-func (c UseCasesClinicalImpl) ListPatientCompositions(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.CompositionConnection, error) {
+func (c UseCasesClinicalImpl) ListPatientCompositions(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.CompositionConnection, error) {
 	_, err := uuid.Parse(patientID)
 	if err != nil {
 		return nil, fmt.Errorf("invalid patient id: %s", patientID)
@@ -205,6 +205,10 @@ func (c UseCasesClinicalImpl) ListPatientCompositions(ctx context.Context, patie
 		params["encounter"] = encounterReference
 	}
 
+	if date != nil {
+		params["date"] = date.AsTime().Format(dateFormatStr)
+	}
+
 	compositionsResponse, err := c.infrastructure.FHIR.SearchFHIRComposition(ctx, params, *identifiers, pagination)
 	if err != nil {
 		return nil, err

diff --git a/pkg/clinical/usecases/clinical/composition_test.go b/pkg/clinical/usecases/clinical/composition_test.go
@@ -328,6 +328,7 @@ func TestUseCasesClinicalImpl_ListPatientCompositions(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  dto.Pagination
 	}
 	tests := []struct {
@@ -354,6 +355,20 @@ func TestUseCasesClinicalImpl_ListPatientCompositions(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "happy case: list compositions with date",
+			args: args{
+				ctx:       context.Background(),
+				patientID: gofakeit.UUID(),
+				date: &scalarutils.Date{
+					Year:  2023,
+					Month: 12,
+					Day:   11,
+				},
+				pagination: dto.Pagination{},
+			},
+			wantErr: false,
+		},
 		{
 			name: "sad case: invalid patient id",
 			args: args{
@@ -437,7 +452,7 @@ func TestUseCasesClinicalImpl_ListPatientCompositions(t *testing.T) {
 					return nil, fmt.Errorf("failed to find condition")
 				}
 			}
-			got, err := c.ListPatientCompositions(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			got, err := c.ListPatientCompositions(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("ListPatientCompositions() error = %v, wantErr %v", err, tt.wantErr)
 				return

diff --git a/pkg/clinical/usecases/usecases.go b/pkg/clinical/usecases/usecases.go
@@ -82,7 +82,7 @@ type Clinical interface {
 	ListPatientMedia(ctx context.Context, patientID string, pagination dto.Pagination) (*dto.MediaConnection, error)
 
 	CreateComposition(ctx context.Context, input dto.CompositionInput) (*dto.Composition, error)
-	ListPatientCompositions(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.CompositionConnection, error)
+	ListPatientCompositions(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.CompositionConnection, error)
 }
 
 // Interactor is an implementation of the usecases interface