query compositions with encounterID

pkg/clinical/presentation/graph/clinical.graphql

@@ -14,6 +14,7 @@ extend type Query {
   # Compositions
   listPatientCompositions(
     patientID: ID!
+    encounterID: String
     pagination: Pagination!
   ): CompositionConnection
 

pkg/clinical/usecases/clinical/composition.go

@@ -43,7 +43,6 @@ func (c *UseCasesClinicalImpl) CreateComposition(ctx context.Context, input dto.
 
 	encounterRef := fmt.Sprintf("Encounter/%s", *encounter.Resource.ID)
 	encounterType := scalarutils.URI("Encounter")
-
 	organizationRef := fmt.Sprintf("Organization/%s", identifiers.OrganizationID)
 
 	today := time.Now()
@@ -174,7 +173,7 @@ func mapFHIRCompositionToCompositionDTO(composition domain.FHIRComposition) *dto
 }
 
 // ListPatientCompositions lists a patient's compositions
-func (c UseCasesClinicalImpl) ListPatientCompositions(ctx context.Context, patientID string, pagination dto.Pagination) (*dto.CompositionConnection, error) {
+func (c UseCasesClinicalImpl) ListPatientCompositions(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.CompositionConnection, error) {
 	_, err := uuid.Parse(patientID)
 	if err != nil {
 		return nil, fmt.Errorf("invalid patient id: %s", patientID)
@@ -201,6 +200,11 @@ func (c UseCasesClinicalImpl) ListPatientCompositions(ctx context.Context, patie
 		"_sort":   "date",
 	}
 
+	if encounterID != nil {
+		encounterReference := fmt.Sprintf("Encounter/%s", *encounterID)
+		params["encounter"] = encounterReference
+	}
+
 	compositionsResponse, err := c.infrastructure.FHIR.SearchFHIRComposition(ctx, params, *identifiers, pagination)
 	if err != nil {
 		return nil, err

pkg/clinical/usecases/clinical/composition_test.go

@@ -323,10 +323,12 @@ func TestUseCasesClinicalImpl_CreateComposition(t *testing.T) {
 
 func TestUseCasesClinicalImpl_ListPatientCompositions(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
@@ -342,6 +344,16 @@ func TestUseCasesClinicalImpl_ListPatientCompositions(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "happy case: list compositions 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{
@@ -425,7 +437,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.pagination)
+			got, err := c.ListPatientCompositions(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("ListPatientCompositions() error = %v, wantErr %v", err, tt.wantErr)
 				return

pkg/clinical/usecases/usecases.go

@@ -81,7 +81,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, pagination dto.Pagination) (*dto.CompositionConnection, error)
+	ListPatientCompositions(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.CompositionConnection, error)
 }
 
 // Interactor is an implementation of the usecases interface