diff --git a/lib/utils/queries.dart b/lib/utils/queries.dart index 256aa2651..60234d422 100644 --- a/lib/utils/queries.dart +++ b/lib/utils/queries.dart @@ -10,6 +10,7 @@ class Queries { /// * `lastName`: user's data. /// * `email`: user's data. /// * `password`: user's data. + /// * `selectedOrganization`: ID of the selected organization. /// /// **returns**: /// * `String`: Return the mutation in string type to be passed to graphql client. @@ -18,10 +19,11 @@ class Queries { String lastName, String email, String password, + String? selectedOrganization, ) { return """ mutation{ - signUp(data: {firstName: "$firstName", lastName: "$lastName", email: "$email", password: "$password"}) + signUp(data: {firstName: "$firstName", lastName: "$lastName", email: "$email", password: "$password", selectedOrganization: "$selectedOrganization"}) { appUserProfile{ adminFor{ diff --git a/lib/view_model/pre_auth_view_models/signup_details_view_model.dart b/lib/view_model/pre_auth_view_models/signup_details_view_model.dart index 2fc3c1451..494afac0b 100644 --- a/lib/view_model/pre_auth_view_models/signup_details_view_model.dart +++ b/lib/view_model/pre_auth_view_models/signup_details_view_model.dart @@ -135,6 +135,7 @@ class SignupDetailsViewModel extends BaseModel { Encryptor.encryptString( password.text, ), + selectedOrganization.id, ), ); navigationService.pop(); diff --git a/test/utils_tests/queries_test.dart b/test/utils_tests/queries_test.dart index 6fffa6739..cdb43da4d 100644 --- a/test/utils_tests/queries_test.dart +++ b/test/utils_tests/queries_test.dart @@ -10,8 +10,13 @@ void main() { var mutation = false; expect(mutation, false); - final fnData = Queries() - .registerUser('Ayush', 'Chaudhary', 'ayush@gmail.com', 'password'); + final fnData = Queries().registerUser( + 'Ayush', + 'Chaudhary', + 'ayush@gmail.com', + 'password', + 'orgId123', + ); if (fnData.contains('Ayush')) { mutation = true; } diff --git a/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart b/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart index cfd954522..a98bf1a02 100644 --- a/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart +++ b/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart @@ -49,7 +49,7 @@ class SignUpMock extends StatelessWidget { } OrgInfo get org => OrgInfo( - id: '3', + id: '', name: 'test org 3', userRegistrationRequired: userRegistrationRequired, creatorInfo: User(firstName: 'test', lastName: '1'), @@ -84,13 +84,13 @@ void main() { source: QueryResultSource.network, data: data, options: QueryOptions( - document: gql(queries.registerUser('', '', '', '')), + document: gql(queries.registerUser('', '', '', '', '')), ), ); when(graphqlConfig.getToken()).thenAnswer((_) async => true); when( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ).thenAnswer((_) async => result); when(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!))) @@ -116,7 +116,7 @@ void main() { verify(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!))); verify( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ); verify( @@ -143,12 +143,12 @@ void main() { locator.registerSingleton(MockUserConfig()); final model = SignupDetailsViewModel(); - + model.selectedOrganization = OrgInfo(id: ""); await tester.pumpWidget(SignUpMock(formKey: model.formKey)); when( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ).thenAnswer((_) async => null); @@ -194,13 +194,13 @@ void main() { source: QueryResultSource.network, data: data, options: QueryOptions( - document: gql(queries.registerUser('', '', '', '')), + document: gql(queries.registerUser('', '', '', '', '')), ), ); when(graphqlConfig.getToken()).thenAnswer((_) async => false); when( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ).thenAnswer((_) async => result); @@ -301,13 +301,13 @@ void main() { source: QueryResultSource.network, data: data, options: QueryOptions( - document: gql(queries.registerUser('', '', '', '')), + document: gql(queries.registerUser('', '', '', '', '')), ), ); when(graphqlConfig.getToken()).thenAnswer((_) async => true); when( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ).thenAnswer((_) async => result); when( @@ -340,7 +340,7 @@ void main() { ); verify( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ); verify( @@ -364,7 +364,7 @@ void main() { when(graphqlConfig.getToken()).thenAnswer((_) async => true); when( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ).thenThrow(Exception()); @@ -374,7 +374,7 @@ void main() { verify( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ); verifyNever( @@ -416,13 +416,15 @@ void main() { source: QueryResultSource.network, data: data, options: QueryOptions( - document: gql(queries.registerUser('', '', '', '')), + document: gql( + queries.registerUser('', '', '', '', ''), + ), ), ); when(graphqlConfig.getToken()).thenAnswer((_) async => true); when( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ).thenAnswer((_) async => result); when(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!))) @@ -435,7 +437,7 @@ void main() { verify(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!))); verify( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ); verifyNever( @@ -478,13 +480,15 @@ void main() { source: QueryResultSource.network, data: data, options: QueryOptions( - document: gql(queries.registerUser('', '', '', '')), + document: gql( + queries.registerUser('', '', '', '', ''), + ), ), ); when(graphqlConfig.getToken()).thenAnswer((_) async => true); when( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ).thenAnswer((_) async => result); when( @@ -503,7 +507,7 @@ void main() { ); verify( databaseFunctions.gqlNonAuthMutation( - queries.registerUser('', '', '', ''), + queries.registerUser('', '', '', '', ''), ), ); verifyNever(