fix: consent update

- use enums instead of booleans for consent to accept or revoke consent Signed-off-by: Kathurima Kimathi <kathurimakimathi415@gmail.com> Signed-off-by: maxwellgithinji <maxwellgithinji@gmail.com>
savannahghi · May 23, 2023 · 8719e79 · 8719e79
1 parent 2ec7eb3
commit 8719e79
Show file tree

Hide file tree

Showing 11 changed files with 351 additions and 41 deletions.
diff --git a/fixtures/caregivers_caregiver_client.yml b/fixtures/caregivers_caregiver_client.yml
@@ -49,4 +49,20 @@
   relationship_type: FATHER
   caregiver_consent: ACCEPTED
   caregiver_consent_at: 2021-11-22 21:16:29.23639+03
-  client_consent: REJECTED
+  client_consent: REJECTED
+
+- caregiver_id: {{.test_caregiver_id_to_update}}
+  client_id: {{.test_client_to_update}}
+  active: true
+  created: 2021-11-22 21:16:29.23639+03
+  created_by: NULL
+  updated: 2021-11-22 21:16:29.23639+03
+  updated_by: NULL
+  deleted_at: NULL
+  organisation_id: {{.test_organisation_id}}
+  assigned_by: {{.staff_id}}
+  program_id: {{.test_program_id}}
+  relationship_type: FATHER
+  caregiver_consent: ACCEPTED
+  caregiver_consent_at: 2021-11-22 21:16:29.23639+03
+  client_consent: ACCEPTED
diff --git a/fixtures/clients_client.yml b/fixtures/clients_client.yml
@@ -174,3 +174,17 @@
   program_id: {{.test_program_id}}
   current_facility_id: {{.test_facility_id}}
   user_id: {{.user_with_roles_id}}
+
+- id: {{.test_client_to_update}}
+  created: 2021-11-22 21:16:29.23639+03
+  updated: 2021-11-22 21:16:29.23639+03
+  active: true
+  client_types: '{PMTCT}'
+  enrollment_date: 2021-11-22 21:16:29.23639+03
+  fhir_patient_id: {{.test_client_to_update}}
+  emr_health_record_id: 29b30a42-cbb8-4573-aedb-c539602d04fc
+  counselled: true
+  organisation_id: {{.test_organisation_id}}
+  program_id: {{.test_program_id2}}
+  current_facility_id: {{.test_facility_id}}
+  user_id: {{.test_user_without_caregiver}}
diff --git a/pkg/mycarehub/infrastructure/database/postgres/gorm/config_test.go b/pkg/mycarehub/infrastructure/database/postgres/gorm/config_test.go
@@ -78,6 +78,7 @@ var (
 	testClientToAddToAnotherProgram  = "01bd8f8d-a1f6-45cf-973d-afb9bde23d87"
 	clientWithRolesID                = "79b0aae0-1c42-4b2b-8920-12f7c05dddd9"
 	testClientToAssignToCaregiver    = "4a9552c7-ddbb-423c-89b6-626099087b37"
+	testClientToUpdateConsent        = "5f579d05-0df4-431d-8f70-6f7c76feb925"
 
 	contactID    = "bdc22436-e314-43f2-bb39-ba1ab332f9b0"
 	identifierID = "bcbdaf68-3d36-4365-b575-4182d6749af5"
@@ -113,6 +114,7 @@ var (
 	testClientCaregiver1 = "28b20a42-cbb8-4553-aedb-c575602d04fc"
 	testCaregiverOrg2ID  = "4e4ef3d2-eb26-407a-82c3-31243dc923cd"
 	caregiverWithRolesID = "484831c5-9b63-4580-9aef-4bffb4bdd230"
+	testCaregiverID3     = "96b20a42-cbb8-4553-aedb-c593602d04fc"
 
 	//Terms
 	termsText = "Test terms"
@@ -403,9 +405,10 @@ func TestMain(m *testing.M) {
 			"security_question_response_id4": securityQuestionResponseID4,
 			"user_id_to_add_caregiver":       userIDtoAddCaregiver,
 
-			"test_caregiver_id":       testCaregiverID,
-			"test_caregiver_org_2_id": testCaregiverOrg2ID,
-			"caregiver_with_roles_id": caregiverWithRolesID,
+			"test_caregiver_id":           testCaregiverID,
+			"test_caregiver_org_2_id":     testCaregiverOrg2ID,
+			"caregiver_with_roles_id":     caregiverWithRolesID,
+			"test_caregiver_id_to_update": testCaregiverID3,
 
 			"staff_number":                        staffNumber,
 			"clients_service_request_id":          clientsServiceRequestID,
@@ -423,6 +426,7 @@ func TestMain(m *testing.M) {
 			"test_client_id": clientID,
 			"test_client_id_same_user_different_program": clientSameUserDifferentProgramID,
 			"test_client_id_different_user_same_program": clientDifferentUserSameProgramID,
+			"test_client_to_update":                      testClientToUpdateConsent,
 
 			"can_invite_user_permission":   canInviteUserPermissionID,
 			"can_resolve_service_request":  canEditOwnRolePermissionID,

diff --git a/pkg/mycarehub/presentation/graph/generated/generated.go b/pkg/mycarehub/presentation/graph/generated/generated.go
diff --git a/pkg/mycarehub/presentation/graph/user.graphql b/pkg/mycarehub/presentation/graph/user.graphql
@@ -40,8 +40,8 @@ extend type Mutation {
   assignCaregiver(input: ClientCaregiverInput!): Boolean!
   removeFacilitiesFromStaffProfile(staffID: ID!, facilities: [ID!]!): Boolean!
   registerExistingUserAsStaff(input: ExistingUserStaffInput!): StaffRegistrationOutput!
-  consentToAClientCaregiver(clientID: ID!, caregiverID: ID!, consent: Boolean!): Boolean!
-  consentToManagingClient(caregiverID: ID!, clientID: ID!, consent: Boolean! ): Boolean!
+  consentToAClientCaregiver(clientID: ID!, caregiverID: ID!, consent: ConsentState!): Boolean!
+  consentToManagingClient(caregiverID: ID!, clientID: ID!, consent: ConsentState!): Boolean!
   registerExistingUserAsClient(input: ExistingUserClientInput!): ClientRegistrationOutput!
   setCaregiverCurrentClient(clientID: ID!): ClientProfile!
   setCaregiverCurrentFacility(clientID: ID!, facilityID: ID!): Facility!

diff --git a/pkg/mycarehub/presentation/graph/user.resolvers.go b/pkg/mycarehub/presentation/graph/user.resolvers.go
diff --git a/pkg/mycarehub/usecases/user/mock/user_mock.go b/pkg/mycarehub/usecases/user/mock/user_mock.go
@@ -56,8 +56,8 @@ type UserUseCaseMock struct {
 	MockRegisterClientAsCaregiverFn         func(ctx context.Context, clientID string, caregiverNumber string) (*domain.CaregiverProfile, error)
 	MockGetCaregiverManagedClientsFn        func(ctx context.Context, userID string, input dto.PaginationsInput) (*dto.ManagedClientOutputPage, error)
 	MockListClientsCaregiversFn             func(ctx context.Context, clientID string, pagination *dto.PaginationsInput) (*dto.CaregiverProfileOutputPage, error)
-	MockConsentToAClientCaregiverFn         func(ctx context.Context, clientID string, caregiverID string, consent bool) (bool, error)
-	MockConsentToManagingClientFn           func(ctx context.Context, caregiverID string, clientID string, consent bool) (bool, error)
+	MockConsentToAClientCaregiverFn         func(ctx context.Context, clientID string, caregiverID string, consent enums.ConsentState) (bool, error)
+	MockConsentToManagingClientFn           func(ctx context.Context, caregiverID string, clientID string, consent enums.ConsentState) (bool, error)
 	MockRegisterExistingUserAsStaffFn       func(ctx context.Context, input dto.ExistingUserStaffInput) (*dto.StaffRegistrationOutput, error)
 	MockGetStaffFacilitiesFn                func(ctx context.Context, staffID string, paginationInput dto.PaginationsInput) (*dto.FacilityOutputPage, error)
 	MockGetClientFacilitiesFn               func(ctx context.Context, clientID string, paginationInput dto.PaginationsInput) (*dto.FacilityOutputPage, error)
@@ -333,7 +333,7 @@ func NewUserUseCaseMock() *UserUseCaseMock {
 		MockUpdateUserProfileFn: func(ctx context.Context, userID string, cccNumber, username, phoneNumber *string, programID string, flavour feedlib.Flavour, email *string) (bool, error) {
 			return true, nil
 		},
-		MockConsentToAClientCaregiverFn: func(ctx context.Context, clientID string, caregiverID string, consent bool) (bool, error) {
+		MockConsentToAClientCaregiverFn: func(ctx context.Context, clientID string, caregiverID string, consent enums.ConsentState) (bool, error) {
 			return true, nil
 		},
 		MockRegisteredFacilityPatientsFn: func(ctx context.Context, input dto.PatientSyncPayload) (*dto.PatientSyncResponse, error) {
@@ -471,7 +471,7 @@ func NewUserUseCaseMock() *UserUseCaseMock {
 		MockAddFacilitiesToStaffProfileFn: func(ctx context.Context, staffID string, facilities []string) (bool, error) {
 			return true, nil
 		},
-		MockConsentToManagingClientFn: func(ctx context.Context, caregiverID string, clientID string, consent bool) (bool, error) {
+		MockConsentToManagingClientFn: func(ctx context.Context, caregiverID string, clientID string, consent enums.ConsentState) (bool, error) {
 			return true, nil
 		},
 		MockAddFacilitiesToClientProfileFn: func(ctx context.Context, clientID string, facilities []string) (bool, error) {
@@ -768,12 +768,12 @@ func (f *UserUseCaseMock) ListClientsCaregivers(ctx context.Context, clientID st
 }
 
 // ConsentToAClientCaregiver mocks the implementation of a client acknowledging to having a certain caregiver assigned to them.
-func (f *UserUseCaseMock) ConsentToAClientCaregiver(ctx context.Context, clientID string, caregiverID string, consent bool) (bool, error) {
+func (f *UserUseCaseMock) ConsentToAClientCaregiver(ctx context.Context, clientID string, caregiverID string, consent enums.ConsentState) (bool, error) {
 	return f.MockConsentToAClientCaregiverFn(ctx, clientID, caregiverID, consent)
 }
 
 // ConsentToManagingClient mock the implementation of a caregiver acknowledging or offering their consent to act on behalf of the client.
-func (f *UserUseCaseMock) ConsentToManagingClient(ctx context.Context, caregiverID string, clientID string, consent bool) (bool, error) {
+func (f *UserUseCaseMock) ConsentToManagingClient(ctx context.Context, caregiverID string, clientID string, consent enums.ConsentState) (bool, error) {
 	return f.MockConsentToManagingClientFn(ctx, caregiverID, clientID, consent)
 }
 

diff --git a/pkg/mycarehub/usecases/user/user.go b/pkg/mycarehub/usecases/user/user.go
@@ -85,8 +85,8 @@ type IClientCaregiver interface {
 	TransferClientToFacility(ctx context.Context, clientID *string, facilityID *string) (bool, error)
 	AssignCaregiver(ctx context.Context, input dto.ClientCaregiverInput) (bool, error)
 	ListClientsCaregivers(ctx context.Context, clientID string, pagination *dto.PaginationsInput) (*dto.CaregiverProfileOutputPage, error)
-	ConsentToAClientCaregiver(ctx context.Context, clientID string, caregiverID string, consent bool) (bool, error)
-	ConsentToManagingClient(ctx context.Context, caregiverID string, clientID string, consent bool) (bool, error)
+	ConsentToAClientCaregiver(ctx context.Context, clientID string, caregiverID string, consent enums.ConsentState) (bool, error)
+	ConsentToManagingClient(ctx context.Context, caregiverID string, clientID string, consent enums.ConsentState) (bool, error)
 	SetCaregiverCurrentClient(ctx context.Context, clientID string) (*domain.ClientProfile, error)
 	SetCaregiverCurrentFacility(ctx context.Context, caregiverID string, facilityID string) (*domain.Facility, error)
 	RegisterExistingUserAsCaregiver(ctx context.Context, userID string, caregiverNumber string) (*domain.CaregiverProfile, error)
@@ -2027,7 +2027,7 @@ func (us *UseCasesUserImpl) ListClientsCaregivers(ctx context.Context, clientID
 }
 
 // ConsentToAClientCaregiver is used to mark whether the client has acknowledged to having a certain caregiver assigned to them
-func (us *UseCasesUserImpl) ConsentToAClientCaregiver(ctx context.Context, clientID string, caregiverID string, consent bool) (bool, error) {
+func (us *UseCasesUserImpl) ConsentToAClientCaregiver(ctx context.Context, clientID string, caregiverID string, consent enums.ConsentState) (bool, error) {
 	caregiverClient := &domain.CaregiverClient{
 		ClientID:    clientID,
 		CaregiverID: caregiverID,
@@ -2047,7 +2047,7 @@ func (us *UseCasesUserImpl) ConsentToAClientCaregiver(ctx context.Context, clien
 }
 
 // ConsentToManagingClient is used to update caregiver as having consented to offer their service to a caregiver
-func (us *UseCasesUserImpl) ConsentToManagingClient(ctx context.Context, caregiverID string, clientID string, consent bool) (bool, error) {
+func (us *UseCasesUserImpl) ConsentToManagingClient(ctx context.Context, caregiverID string, clientID string, consent enums.ConsentState) (bool, error) {
 	caregiverClient := &domain.CaregiverClient{
 		CaregiverID: caregiverID,
 		ClientID:    clientID,

diff --git a/pkg/mycarehub/usecases/user/user_unit_test.go b/pkg/mycarehub/usecases/user/user_unit_test.go
@@ -5183,7 +5183,7 @@ func TestUseCasesUserImpl_ConsentToAClientCaregiver(t *testing.T) {
 		ctx         context.Context
 		clientID    string
 		caregiverID string
-		consent     bool
+		consent     enums.ConsentState
 	}
 	tests := []struct {
 		name    string
@@ -5197,7 +5197,7 @@ func TestUseCasesUserImpl_ConsentToAClientCaregiver(t *testing.T) {
 				ctx:         context.Background(),
 				clientID:    uuid.NewString(),
 				caregiverID: uuid.NewString(),
-				consent:     true,
+				consent:     enums.ConsentStateAccepted,
 			},
 			want:    true,
 			wantErr: false,
@@ -5207,7 +5207,7 @@ func TestUseCasesUserImpl_ConsentToAClientCaregiver(t *testing.T) {
 			args: args{
 				ctx:      context.Background(),
 				clientID: uuid.NewString(),
-				consent:  true,
+				consent:  enums.ConsentStateAccepted,
 			},
 			want:    false,
 			wantErr: true,
@@ -5248,7 +5248,7 @@ func TestUseCasesUserImpl_ConsentToManagingClient(t *testing.T) {
 		ctx         context.Context
 		caregiverID string
 		clientID    string
-		consent     bool
+		consent     enums.ConsentState
 	}
 	tests := []struct {
 		name    string
@@ -5262,7 +5262,7 @@ func TestUseCasesUserImpl_ConsentToManagingClient(t *testing.T) {
 				ctx:         context.Background(),
 				caregiverID: uuid.NewString(),
 				clientID:    uuid.NewString(),
-				consent:     true,
+				consent:     enums.ConsentStateAccepted,
 			},
 			want:    true,
 			wantErr: false,
@@ -5273,7 +5273,7 @@ func TestUseCasesUserImpl_ConsentToManagingClient(t *testing.T) {
 				ctx:         context.Background(),
 				caregiverID: uuid.NewString(),
 				clientID:    uuid.NewString(),
-				consent:     true,
+				consent:     enums.ConsentStateAccepted,
 			},
 			want:    false,
 			wantErr: true,