Fixes ##1665 Mutation joinPublicOrganization not complatible with tal…

lib/services/database_mutation_functions.dart

@@ -57,7 +57,7 @@ class DataBaseMutationFunctions {
       // debugPrint(exception.linkException.toString());
       if (showSnackBar) {
         WidgetsBinding.instance.addPostFrameCallback(
-          (_) => navigationService.showTalawaErrorSnackBar(
+          (_) => navigationService.showTalawaSnackBar(
             "Server not running/wrong url",
             MessageType.info,
           ),
@@ -94,7 +94,7 @@ class DataBaseMutationFunctions {
       if (exception.graphqlErrors[i].message == userNotFound.message) {
         if (showSnackBar) {
           WidgetsBinding.instance.addPostFrameCallback(
-            (_) => navigationService.showTalawaErrorDialog(
+            (_) => navigationService.showTalawaDialog(
               "No account registered with this email",
               MessageType.error,
             ),
@@ -106,7 +106,7 @@ class DataBaseMutationFunctions {
       if (exception.graphqlErrors[i].message == memberRequestExist.message) {
         if (showSnackBar) {
           WidgetsBinding.instance.addPostFrameCallback(
-            (_) => navigationService.showTalawaErrorDialog(
+            (_) => navigationService.showTalawaDialog(
               "Membership request already exist",
               MessageType.error,
             ),
@@ -118,7 +118,7 @@ class DataBaseMutationFunctions {
       if (exception.graphqlErrors[i].message == wrongCredentials.message) {
         if (showSnackBar) {
           WidgetsBinding.instance.addPostFrameCallback(
-            (_) => navigationService.showTalawaErrorDialog(
+            (_) => navigationService.showTalawaDialog(
               "Enter a valid password",
               MessageType.error,
             ),
@@ -130,7 +130,7 @@ class DataBaseMutationFunctions {
       if (exception.graphqlErrors[i].message == organizationNotFound.message) {
         if (showSnackBar) {
           WidgetsBinding.instance.addPostFrameCallback(
-            (_) => navigationService.showTalawaErrorDialog(
+            (_) => navigationService.showTalawaDialog(
               "Organization Not Found",
               MessageType.error,
             ),
@@ -142,7 +142,7 @@ class DataBaseMutationFunctions {
       if (exception.graphqlErrors[i].message == emailAccountPresent.message) {
         if (showSnackBar) {
           WidgetsBinding.instance.addPostFrameCallback(
-            (_) => navigationService.showTalawaErrorDialog(
+            (_) => navigationService.showTalawaDialog(
               "Account with this email already registered",
               MessageType.error,
             ),
@@ -154,7 +154,7 @@ class DataBaseMutationFunctions {
     // if the error is unknown
 
     WidgetsBinding.instance.addPostFrameCallback(
-      (_) => navigationService.showTalawaErrorDialog(
+      (_) => navigationService.showTalawaDialog(
         "Something went wrong!",
         MessageType.error,
       ),

lib/services/navigation_service.dart

@@ -16,7 +16,7 @@ import 'package:talawa/widgets/talawa_error_snackbar.dart';
 /// * `showSnackBar`
 /// * `pushDialog`
 /// * `showTalawaErrorWidget`
-/// * `showTalawaErrorDialog`
+/// * `showTalawaDialog`
 /// * `pop`
 class NavigationService {
   GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
@@ -103,15 +103,15 @@ class NavigationService {
     );
   }
 
-  void showTalawaErrorSnackBar(
+  void showTalawaSnackBar(
     String errorMessage,
     MessageType messageType, {
     Duration duration = const Duration(seconds: 2),
   }) {
     ScaffoldMessenger.of(navigatorKey.currentContext!).showSnackBar(
       SnackBar(
         padding: EdgeInsets.zero,
-        content: TalawaErrorSnackBar(
+        content: TalawaSnackBar(
           messageType: messageType,
           errorMessage: errorMessage,
         ),
@@ -120,13 +120,13 @@ class NavigationService {
     );
   }
 
-  void showTalawaErrorDialog(String errorMessage, MessageType messageType) {
+  void showTalawaDialog(String errorMessage, MessageType messageType) {
     showDialog(
       context: navigatorKey.currentContext!,
       barrierColor: Colors.transparent,
       barrierDismissible: false,
       builder: (BuildContext context) {
-        return TalawaErrorDialog(
+        return TalawaDialog(
           errorMessage,
           messageType: messageType,
         );

lib/services/user_config.dart

@@ -83,7 +83,7 @@ class UserConfig {
         return true;
       } on Exception catch (e) {
         print(e);
-        navigationService.showTalawaErrorSnackBar(
+        navigationService.showTalawaSnackBar(
           "Couldn't update User details",
           MessageType.error,
         );

lib/splash_screen.dart

@@ -85,7 +85,7 @@ class _SplashScreenState extends State<SplashScreen> {
     final values = _initialUri!.queryParameters.values;
 
     final fromInviteLink = navigationService.fromInviteLink;
-    final showSnackBar = navigationService.showTalawaErrorSnackBar;
+    final showSnackBar = navigationService.showTalawaSnackBar;
     final pushReplacementScreen = navigationService.pushReplacementScreen;
 
     final orgURI = GraphqlConfig.orgURI!;

lib/utils/queries.dart

@@ -226,18 +226,7 @@ class Queries {
       joinPublicOrganization(organizationId: "$orgId") {
           joinedOrganizations{
             _id
-            name
-            image
-            description
-            isPublic
-            creator{
-              _id
-              firstName
-              lastName
-              image
             }
-
-          }
       }
 	}
   ''';
@@ -362,6 +351,26 @@ class Queries {
   ''';
   }
 
+  String fetchOrgsJoinedByUser(String? userId) {
+    return '''
+      query {
+        getOrganizationWithUserID(id: "$userId"){
+          _id
+          name
+          image
+          description
+          isPublic
+          creator{
+            _id
+            firstName
+            lastName
+            image
+          }
+        }
+      }
+  ''';
+  }
+
   String userLanguage() {
     return '''
     query{

lib/view_model/after_auth_view_models/add_post_view_models/add_post_view_model.dart

@@ -132,6 +132,10 @@ class AddPostViewModel extends BaseModel {
     }
     removeImage();
     _controller.text = "";
+    _navigationService.showTalawaSnackBar(
+      "Post is uploaded",
+      MessageType.info,
+    );
     _titleController.text = "";
     notifyListeners();
   }

lib/view_model/after_auth_view_models/profile_view_models/profile_page_view_model.dart

@@ -312,6 +312,6 @@ class ProfilePageViewModel extends BaseModel {
 
   // show message on Snack Bar.
   showSnackBar(String message) {
-    _navigationService.showTalawaErrorDialog(message, MessageType.error);
+    _navigationService.showTalawaDialog(message, MessageType.error);
   }
 }

lib/view_model/pre_auth_view_models/select_organization_view_model.dart

@@ -91,12 +91,12 @@ class SelectOrganizationViewModel extends BaseModel {
         notifyListeners();
       } else if (orgAlreadyJoined) {
         selectedOrganization = OrgInfo(id: '-1');
-        navigationService.showTalawaErrorSnackBar(
+        navigationService.showTalawaSnackBar(
           'Organisation already joined',
           MessageType.warning,
         );
       } else {
-        navigationService.showTalawaErrorSnackBar(
+        navigationService.showTalawaSnackBar(
           'Membership request already sent',
           MessageType.warning,
         );
@@ -116,7 +116,7 @@ class SelectOrganizationViewModel extends BaseModel {
         arguments: selectedOrganization,
       );
     } else {
-      navigationService.showTalawaErrorSnackBar(
+      navigationService.showTalawaSnackBar(
         'Select one organization to continue',
         MessageType.warning,
         duration: const Duration(milliseconds: 750),
@@ -152,14 +152,14 @@ class SelectOrganizationViewModel extends BaseModel {
           );
         } else {
           navigationService.pop();
-          navigationService.showTalawaErrorSnackBar(
+          navigationService.showTalawaSnackBar(
             'Joined ${selectedOrganization.name} successfully',
             MessageType.info,
           );
         }
       } on Exception catch (e) {
         print(e);
-        navigationService.showTalawaErrorSnackBar(
+        navigationService.showTalawaSnackBar(
           'SomeThing went wrong',
           MessageType.error,
         );
@@ -182,15 +182,15 @@ class SelectOrganizationViewModel extends BaseModel {
             );
           } else {
             navigationService.pop();
-            navigationService.showTalawaErrorSnackBar(
+            navigationService.showTalawaSnackBar(
               'Join in request sent to ${selectedOrganization.name} successfully',
               MessageType.info,
             );
           }
         }
       } on Exception catch (e) {
         print(e);
-        navigationService.showTalawaErrorSnackBar(
+        navigationService.showTalawaSnackBar(
           'SomeThing went wrong',
           MessageType.error,
         );

lib/view_model/pre_auth_view_models/set_url_view_model.dart

@@ -144,7 +144,7 @@ class SetUrlViewModel extends BaseModel {
         navigationService.pushScreen(navigateTo, arguments: argument);
       } else {
         navigationService.pop();
-        navigationService.showTalawaErrorSnackBar(
+        navigationService.showTalawaSnackBar(
           "URL doesn't exist/no connection please check",
           MessageType.error,
         );
@@ -181,10 +181,10 @@ class SetUrlViewModel extends BaseModel {
         box.put(imageUrlKey, "$uri/talawa/");
         navigationService.pop();
         graphqlConfig.getOrgUrl();
-        navigationService.showSnackBar("Url is valid");
+        navigationService.showTalawaSnackBar('Url is Valid', MessageType.info);
       } else {
         navigationService.pop();
-        navigationService.showTalawaErrorDialog(
+        navigationService.showTalawaDialog(
           "URL doesn't exist/no connection please check",
           MessageType.info,
         );
@@ -283,25 +283,25 @@ class SetUrlViewModel extends BaseModel {
           navigationService.pushScreen('/selectOrg', arguments: orgId);
         } on CameraException catch (e) {
           debugPrint(e.toString());
-          navigationService.showTalawaErrorSnackBar(
+          navigationService.showTalawaSnackBar(
             "The Camera is not working",
             MessageType.error,
           );
         } on QrEmbeddedImageException catch (e) {
           debugPrint(e.toString());
-          navigationService.showTalawaErrorDialog(
+          navigationService.showTalawaDialog(
             "The QR is not Working",
             MessageType.error,
           );
         } on QrUnsupportedVersionException catch (e) {
           debugPrint(e.toString());
-          navigationService.showTalawaErrorDialog(
+          navigationService.showTalawaDialog(
             "This QR version is not Supported.",
             MessageType.error,
           );
         } on Exception catch (e) {
           debugPrint(e.toString());
-          navigationService.showTalawaErrorSnackBar(
+          navigationService.showTalawaSnackBar(
             "This QR is not for the App",
             MessageType.error,
           );

lib/view_model/pre_auth_view_models/signup_details_view_model.dart

@@ -100,25 +100,29 @@ class SignupDetailsViewModel extends BaseModel {
                     await databaseFunctions.gqlAuthMutation(
                   queries.joinOrgById(selectedOrganization.id!),
                 ) as QueryResult;
-
-                final List<OrgInfo>? joinedOrg = (result
-                            .data!['joinPublicOrganization']
-                        ['joinedOrganizations'] as List<dynamic>?)
-                    ?.map((e) => OrgInfo.fromJson(e as Map<String, dynamic>))
-                    .toList();
-                userConfig.updateUserJoinedOrg(joinedOrg!);
-                userConfig.saveCurrentOrgInHive(
-                  userConfig.currentUser.joinedOrganizations![0],
-                );
-                navigationService.removeAllAndPush(
-                  Routes.mainScreen,
-                  Routes.splashScreen,
-                  arguments:
-                      MainScreenArgs(mainScreenIndex: 0, fromSignUp: true),
-                );
+                if (result.data!.isNotEmpty) {
+                  final QueryResult result =
+                      await databaseFunctions.gqlAuthMutation(
+                    queries.fetchOrgsJoinedByUser(signedInUser.id),
+                  ) as QueryResult;
+                  final List<OrgInfo>? joinedOrg = (result
+                          .data!['getOrganizationWithUserID'] as List<dynamic>?)
+                      ?.map((e) => OrgInfo.fromJson(e as Map<String, dynamic>))
+                      .toList();
+                  userConfig.updateUserJoinedOrg(joinedOrg!);
+                  userConfig.saveCurrentOrgInHive(
+                    userConfig.currentUser.joinedOrganizations![0],
+                  );
+                  navigationService.removeAllAndPush(
+                    Routes.mainScreen,
+                    Routes.splashScreen,
+                    arguments:
+                        MainScreenArgs(mainScreenIndex: 0, fromSignUp: true),
+                  );
+                }
               } on Exception catch (e) {
                 print(e);
-                navigationService.showTalawaErrorSnackBar(
+                navigationService.showTalawaSnackBar(
                   'SomeThing went wrong',
                   MessageType.error,
                 );
@@ -142,7 +146,7 @@ class SignupDetailsViewModel extends BaseModel {
                 );
               } on Exception catch (e) {
                 print(e);
-                navigationService.showTalawaErrorSnackBar(
+                navigationService.showTalawaSnackBar(
                   'SomeThing went wrong',
                   MessageType.error,
                 );
@@ -152,7 +156,7 @@ class SignupDetailsViewModel extends BaseModel {
         }
       } on Exception catch (e) {
         print(e);
-        navigationService.showTalawaErrorSnackBar(
+        navigationService.showTalawaSnackBar(
           'SomeThing went wrong',
           MessageType.error,
         );

lib/view_model/widgets_view_models/custom_drawer_view_model.dart

@@ -53,14 +53,14 @@ class CustomDrawerViewModel extends BaseModel {
     // if `selectedOrg` is equal to `switchOrg` and `switchToOrg` present or not.
     if (selectedOrg == switchToOrg && isPresentinSwitchableOrg(switchToOrg)) {
       // _navigationService.pop();
-      navigationService.showTalawaErrorSnackBar(
+      navigationService.showTalawaSnackBar(
         '${switchToOrg.name} already selected',
         MessageType.warning,
       );
     } else {
       userConfig.saveCurrentOrgInHive(switchToOrg);
       setSelectedOrganizationName(switchToOrg);
-      navigationService.showTalawaErrorSnackBar(
+      navigationService.showTalawaSnackBar(
         'Switched to ${switchToOrg.name}',
         MessageType.info,
       );

lib/views/after_auth_screens/join_organisation_after_auth.dart

@@ -216,7 +216,7 @@ class JoinOrganisationAfterAuth extends StatelessWidget {
             Navigator.pop(navigationService.navigatorKey.currentContext!);
             model.initialise(model.orgId);
           } else {
-            navigationService.showTalawaErrorSnackBar(
+            navigationService.showTalawaSnackBar(
               "Organisation on different server, logout and scan qr again",
               MessageType.error,
             );