optimize fetch user (#74)

banghuazhao · Dec 9, 2024 · f5f8f10 · f5f8f10
1 parent 54a1cae
commit f5f8f10
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 37 deletions.
diff --git a/lib/app/injection_container.dart b/lib/app/injection_container.dart
@@ -47,8 +47,6 @@ void initInjection() {
       () => SettingsViewModel(authUseCase: sl(), userUserCase: sl(), featureFlagProvider: sl()));
   sl.registerFactory<QASettingsViewModel>(() =>
       QASettingsViewModel(featureFlagProvider: sl(), apiEnvironment: sl(), authUseCase: sl()));
-  sl.registerFactory<UserProfileViewModel>(
-      () => UserProfileViewModel(authUseCase: sl(), userUseCase: sl()));
   sl.registerFactory<ForgetPasswordViewModel>(() => ForgetPasswordViewModel(authUseCase: sl()));
   sl.registerFactory<UpdatePasswordViewModel>(() => UpdatePasswordViewModel(authUseCase: sl()));
 

diff --git a/lib/presentation/chat/views/chat_screen.dart b/lib/presentation/chat/views/chat_screen.dart
@@ -78,7 +78,9 @@ class _ChatScreenState extends State<ChatScreen>
                             String? result = await Navigator.push(
                               context,
                               MaterialPageRoute(
-                                builder: (context) => UserProfilePage(),
+                                builder: (context) => UserProfilePage(
+                                  user: viewModel.user,
+                                ),
                               ),
                             );
                             if (result == "refresh") {

diff --git a/lib/presentation/settings/viewModels/user_profile_view_model.dart b/lib/presentation/settings/viewModels/user_profile_view_model.dart
@@ -8,42 +8,20 @@ import 'package:domain/usecases/auth_usecase.dart';
 class UserProfileViewModel extends ChangeNotifier {
   final AuthUseCase authUseCase;
   final UserUseCase userUseCase;
+  User? user;
 
   bool isLoading = false;
-  User? user;
   bool isSignedIn = false;
-  bool isLoggedIn = false;
   String? _errorMessage;
   String? get errorMessage => _errorMessage;
 
-  UserProfileViewModel({required this.authUseCase, required this.userUseCase}) {
-    fetchAuthSessionNew();
-  }
-
-  Future<void> fetchAuthSessionNew() async {
-    try {
-      isLoggedIn = await authUseCase.isLoggedIn();
-      if (isLoggedIn) {
-        await fetchUser(); // Fetch user only if logged in
-      } else {
-        user = null; // Clear user data when not logged in
-      }
-    } catch (e) {
-      if (kDebugMode) {
-        print(e);
-      }
-      isLoggedIn = false;
-      user = null; // Ensure user data is cleared on error
-    }
-    notifyListeners(); // Notify listeners about state changes
-  }
+  UserProfileViewModel({required this.authUseCase, required this.userUseCase, required this.user});
 
   Future<void> fetchUser() async {
     try {
       user = await userUseCase.fetchMe();
       notifyListeners();
     } catch (e) {
-      isLoggedIn = false;
       user = null; // Clear user data in case of an error
       notifyListeners(); // Ensure the UI is updated
     }
@@ -64,7 +42,6 @@ class UserProfileViewModel extends ChangeNotifier {
       );
 
       // Update state
-      isLoggedIn = false; // Explicitly set isLoggedIn to false
       user = null; // Clear user data
       notifyListeners();
     } catch (e) {

diff --git a/lib/presentation/settings/views/settings_page.dart b/lib/presentation/settings/views/settings_page.dart
@@ -95,7 +95,7 @@ class _SettingsPageState extends State<SettingsPage> {
                         await Navigator.push(
                           context,
                           MaterialPageRoute(
-                            builder: (context) => UserProfilePage(),
+                            builder: (context) => UserProfilePage(user: viewModel.user),
                           ),
                         );
                         await _fetchAuthSession();

diff --git a/lib/presentation/settings/views/user_profile_page.dart b/lib/presentation/settings/views/user_profile_page.dart
@@ -1,4 +1,5 @@
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:domain/entities/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -8,10 +9,14 @@ import '../../../app/injection_container.dart';
 import '../viewModels/user_profile_view_model.dart';
 
 class UserProfilePage extends StatelessWidget {
+  User? user;
+
+  UserProfilePage({Key? key, required this.user}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return ChangeNotifierProvider(
-      create: (_) => sl<UserProfileViewModel>(),
+      create: (_) => UserProfileViewModel(authUseCase: sl(), userUseCase: sl(), user: user),
       child: Scaffold(
         appBar: AppBar(
           title: const Text("User Profile"),
@@ -103,7 +108,7 @@ class UserProfilePage extends StatelessWidget {
                         ),
                       );
                       if (result == 'refresh') {
-                        await viewModel.fetchAuthSessionNew();
+                        await viewModel.fetchUser();
                       }
                     },
                     style: ElevatedButton.styleFrom(
@@ -129,7 +134,7 @@ class UserProfilePage extends StatelessWidget {
                         ),
                       );
                       if (result == 'refresh') {
-                        await viewModel.fetchAuthSessionNew();
+                        await viewModel.fetchUser();
                       }
                     },
                     style: ElevatedButton.styleFrom(

diff --git a/test/user_profile_view_model_test.dart b/test/user_profile_view_model_test.dart
@@ -141,7 +141,8 @@ void main() {
       test('should set loading to true during the process and back to false after success', () async {
         final MockAuthUseCase mockAuthUseCase = MockAuthUseCase();
         final MockUserUseCase mockUserUseCase = MockUserUseCase();
-        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(authUseCase: mockAuthUseCase,userUseCase: mockUserUseCase);
+        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(
+            authUseCase: mockAuthUseCase, userUseCase: mockUserUseCase, user: User(email: "email"));
         // Arrange
         when(mockUserUseCase.deleteAccount()).thenAnswer((_) async {});
 
@@ -163,7 +164,8 @@ void main() {
       test('should set loading to true during the process and back to false after failure', () async {
         final MockAuthUseCase mockAuthUseCase = MockAuthUseCase();
         final MockUserUseCase mockUserUseCase = MockUserUseCase();
-        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(authUseCase: mockAuthUseCase,userUseCase: mockUserUseCase);
+        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(
+            authUseCase: mockAuthUseCase,userUseCase: mockUserUseCase, user: User(email: "email"));
         // Arrange
         when(mockUserUseCase.deleteAccount()).thenThrow(Exception('Deletion failed'));
 
@@ -194,7 +196,8 @@ void main() {
       test('should handle exceptions and print an error message on failure', () async {
         final MockAuthUseCase mockAuthUseCase = MockAuthUseCase();
         final MockUserUseCase mockUserUseCase = MockUserUseCase();
-        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(authUseCase: mockAuthUseCase,userUseCase: mockUserUseCase);
+        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(
+            authUseCase: mockAuthUseCase,userUseCase: mockUserUseCase, user: User(email: "email"));
         // Arrange
         when(mockUserUseCase.deleteAccount()).thenThrow(Exception('Deletion failed'));
 
@@ -213,7 +216,8 @@ void main() {
       test('should update isLoading and notify listeners when set to true', () {
         final MockAuthUseCase mockAuthUseCase = MockAuthUseCase();
         final MockUserUseCase mockUserUseCase = MockUserUseCase();
-        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(authUseCase: mockAuthUseCase,userUseCase: mockUserUseCase);
+        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(
+            authUseCase: mockAuthUseCase,userUseCase: mockUserUseCase, user: User(email: "email"));
         // Act
         userProfileViewModel.setLoading(true);
 
@@ -224,7 +228,8 @@ void main() {
       test('should update isLoading and notify listeners when set to false', () {
         final MockAuthUseCase mockAuthUseCase = MockAuthUseCase();
         final MockUserUseCase mockUserUseCase = MockUserUseCase();
-        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(authUseCase: mockAuthUseCase,userUseCase: mockUserUseCase);
+        final UserProfileViewModel userProfileViewModel = UserProfileViewModel(
+            authUseCase: mockAuthUseCase,userUseCase: mockUserUseCase, user: User(email: "email"));
         // Arrange
         userProfileViewModel.setLoading(true); // Start with true