Merge pull request #150 from PDG-NUTRI/88-intégrer-backend-dans-page-profile

LucaCoduriV · web-flow · commit db27acd6610f · 2022-09-04T00:27:53.000+02:00
88 intégrer backend dans page profile
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -3,7 +3,8 @@
    <application
         android:label="pdg_app"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/lib/api/firebase_connection.dart b/lib/api/firebase_connection.dart
@@ -44,12 +44,8 @@ class FirebaseConnection implements Auth {
             .signInWithEmailAndPassword(email: email, password: password);
       }
       return true;
-    } on FirebaseAuthException catch (e) {
-      if (e.code == 'user-not-found') {
-        log('No user found for that email.');
-      } else if (e.code == 'wrong-password') {
-        log('Wrong password provided for that user.');
-      }
+    } catch (e) {
+      log(e.toString());
     }
     return false;
   }
diff --git a/lib/api/firebase_user.dart b/lib/api/firebase_user.dart
@@ -75,7 +75,7 @@ class FirebaseUser extends FirebaseAPI implements IUser {
   }
 
   @override
-  Future<User> readDietitianOfClient(String clientId) async {
+  Future<User?> readDietitianOfClient(String clientId) async {
     final querySnapshot = await collectionReference
         .where('clientList', arrayContains: clientId)
         .withConverter(
@@ -85,6 +85,7 @@ class FirebaseUser extends FirebaseAPI implements IUser {
         .get();
     List<User> dietitians =
         querySnapshot.docs.map((doc) => doc.data()).toList();
-    return dietitians.first;
+
+    return dietitians.isNotEmpty ? dietitians.first : null;
   }
 }
diff --git a/lib/api/iuser.dart b/lib/api/iuser.dart
@@ -6,5 +6,5 @@ abstract class IUser {
   void updateUser(User user);
   void deleteUser(String userid);
   Future<List<User>> getDietitianClient(String dietitianId);
-  Future<User> readDietitianOfClient(String clientId);
+  Future<User?> readDietitianOfClient(String clientId);
 }
diff --git a/lib/provider/auth_provider.dart b/lib/provider/auth_provider.dart
@@ -12,6 +12,7 @@ class AuthProvider extends ChangeNotifier {
   bool _isAdmin = false;
 
   User? _client;
+  User? _clientDietitian;
 
   AuthProvider({required Auth auth, required IUser clientApi})
       : _auth = auth,
@@ -25,13 +26,16 @@ class AuthProvider extends ChangeNotifier {
       ]);
 
       _isAdmin = values[1] as bool;
+      await fetchClientDietitian();
     }
   }
 
   bool get isAdmin => _isAdmin;
 
   User? get user => _client;
 
+  User? get clientDietitian => _clientDietitian;
+
   String get userUid => _auth.uid;
 
   bool isConnected() {
@@ -45,6 +49,7 @@ class AuthProvider extends ChangeNotifier {
     _isAdmin = await _auth.isDietitian();
     if (isConnected) {
       await fetchClient();
+      await fetchClientDietitian();
     }
 
     notifyListeners();
@@ -53,6 +58,7 @@ class AuthProvider extends ChangeNotifier {
   Future<void> signOut() async {
     await _auth.signOut();
     _client = null;
+    _clientDietitian = null;
     _isAdmin = false;
     notifyListeners();
   }
@@ -75,4 +81,18 @@ class AuthProvider extends ChangeNotifier {
 
     return _client;
   }
+
+  Future<User?> fetchClientDietitian() async {
+    try {
+      if (!isAdmin) {
+        _clientDietitian = await _userApi.readDietitianOfClient(_client!.uid);
+        notifyListeners();
+        return _clientDietitian;
+      }
+      return null;
+    } catch (e) {
+      log("Error fetching client's dietitian: $e");
+    }
+    return null;
+  }
 }
diff --git a/lib/screens/diary.dart b/lib/screens/diary.dart
@@ -1,5 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
 import 'package:intl/intl.dart';
 import 'package:pdg_app/model/meal.dart';
 import 'package:pdg_app/provider/meal_provider.dart';
@@ -44,7 +45,7 @@ class _DiaryScreenState extends State<DiaryScreen> {
           getDiariesForDay: (day) {
             return _getEventsForDay(context, day);
           },
-          clientName: "Marie",
+          clientName: GetIt.I.get<AuthProvider>().user!.firstName,
           onAddPressed: () async {
             final addedMeal = await AutoRouter.of(context)
                 .push<Meal?>(AddMealScreenRoute(day: _selectedDate));
diff --git a/lib/screens/profile.dart b/lib/screens/profile.dart
@@ -1,27 +1,56 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
+import 'package:pdg_app/model/user.dart';
 import 'package:pdg_app/widgets/cards/left_element_card.dart';
 import 'package:pdg_app/widgets/profile_template.dart';
 import '../router/router.gr.dart';
+import '../widgets/buttons/custom_icon_button.dart';
 import '../widgets/custom_divider.dart';
 
 import '../provider/auth_provider.dart';
 
 class ProfileScreen extends StatelessWidget {
   const ProfileScreen({Key? key}) : super(key: key);
 
+  // IDietitian dietitianApi = FirebaseDietitian(FirebaseFirestore.instance);
+
+  // Dietitian dietitian = await dietitianApi.readDietitian("bZB6G7LbLSfp8lTPsh00fWxiHb03");
+
   @override
   Widget build(BuildContext context) {
+    final authProvider = GetIt.I.get<AuthProvider>();
+    final User? user = authProvider.user;
+
+    if (user == null) {
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const Text("An error has occured."),
+            CustomIconButton(
+              icon: Icons.logout_outlined,
+              onTap: () {
+                authProvider.signOut();
+                AutoRouter.of(context).navigate(const LoginScreenRoute());
+              },
+            )
+          ],
+        ),
+      );
+    }
+
     return Profile(
-      clientFirstName: "Luca",
-      clienLastName: "Coduri",
-      nutriFirstName: "Claire",
-      nutriLastName: "Nutri",
-      clientEmail: "luca.coduri@gmail.com",
-      clientPhone: "0794563418",
-      clientBirthday: DateTime(1996, 12, 18),
-      clientInsurance: "09734789789248943",
+      clientFirstName: user.firstName,
+      clienLastName: user.lastName,
+      blockEnabled: !authProvider.isAdmin,
+      blockText: authProvider.clientDietitian == null
+          ? "Yous nutritionnist hasn't contact you yet."
+          : "Your nutritionnist is ${authProvider.clientDietitian!.firstName} ${authProvider.clientDietitian!.lastName}.",
+      clientEmail: user.email,
+      clientPhone: user.phoneNumber,
+      clientBirthday: user.birthDate,
+      clientInsurance: user.avs,
       onLogoutPressed: () {
         GetIt.I.get<AuthProvider>().signOut();
         context.router.replaceAll([
@@ -37,8 +66,8 @@ class Profile extends StatelessWidget {
   final String _clientPicturePath;
   final String _clientFirstName;
   final String _clientLastName;
-  final String _nutriFirstName;
-  final String _nutriLastName;
+  final bool _blockEnabled;
+  final String _blocText;
   final String _clientEmail;
   final String _clientPhone;
   final DateTime _clientBirthday;
@@ -50,20 +79,20 @@ class Profile extends StatelessWidget {
     clientPicturePath = 'assets/images/default_user_pic.png',
     required clientFirstName,
     required clienLastName,
-    required nutriFirstName,
-    required nutriLastName,
     required clientEmail,
     required clientPhone,
     required clientBirthday,
     required clientInsurance,
+    blockEnabled = false,
+    blockText = "",
     void Function()? onLogoutPressed,
     Key? key,
   })  : _screenWidth = screenWidth,
         _clientPicturePath = clientPicturePath,
         _clientFirstName = clientFirstName,
         _clientLastName = clienLastName,
-        _nutriFirstName = nutriFirstName,
-        _nutriLastName = nutriLastName,
+        _blocText = blockText,
+        _blockEnabled = blockEnabled,
         _clientEmail = clientEmail,
         _clientPhone = clientPhone,
         _clientBirthday = clientBirthday,
@@ -85,18 +114,24 @@ class Profile extends StatelessWidget {
         onIconButtonPressed: _onLogoutPressed,
         buttonIcon: Icons.logout_outlined,
         firstBloc: Column(children: [
-          LeftElementCard(
-            title:
-                Text("Your nutritionnist is $_nutriFirstName $_nutriLastName."),
-            element: IconTheme(
-              data: IconThemeData(
-                color: Theme.of(context).colorScheme.primary,
-                size: 30,
-              ),
-              child: const Icon(Icons.notification_important_outlined),
-            ),
-          ),
-          const CustomDivider(),
+          _blockEnabled
+              ? Column(
+                  children: [
+                    LeftElementCard(
+                      title: Text(_blocText),
+                      element: IconTheme(
+                        data: IconThemeData(
+                          color: Theme.of(context).colorScheme.primary,
+                          size: 30,
+                        ),
+                        child:
+                            const Icon(Icons.notification_important_outlined),
+                      ),
+                    ),
+                    const CustomDivider(),
+                  ],
+                )
+              : const SizedBox(),
           const Text("Personal data",
               textAlign: TextAlign.center,
               style: TextStyle(fontWeight: FontWeight.w600, fontSize: 18)),
diff --git a/test/user_test.dart b/test/user_test.dart
@@ -11,14 +11,14 @@ User c1 = User(
     phoneNumber: '0780001223',
     birthDate: DateTime.now(),
     avs: '',
-  email: 'olivier.dancona@gmail.com');
+    email: 'olivier.dancona@gmail.com');
 User c2 = User(
     firstName: 'Chloé',
     lastName: 'Fontaine',
     phoneNumber: '0780002334',
     birthDate: DateTime.now(),
     avs: '',
-  email: 'chloe.fontaine@heig-vd.ch');
+    email: 'chloe.fontaine@heig-vd.ch');
 User c3 = User(
     firstName: 'Luca',
     lastName: 'Coduri',
@@ -131,7 +131,7 @@ void main() {
   });
 
   test("Read Dietitian of Client", () async {
-    final User dietCopy = await userApi.readDietitianOfClient(c3.uid);
+    final User? dietCopy = await userApi.readDietitianOfClient(c3.uid);
     expect(d1.toString(), dietCopy.toString());
   });
 }
diff --git a/widgetbook/widgetbook.dart b/widgetbook/widgetbook.dart
@@ -224,14 +224,6 @@ class HotReload extends StatelessWidget {
                   label: 'Last name',
                   initialValue: "Coduri",
                 ),
-                nutriFirstName: context.knobs.text(
-                  label: 'Nutri first name',
-                  initialValue: "Claire",
-                ),
-                nutriLastName: context.knobs.text(
-                  label: 'Nutri last name',
-                  initialValue: "Nutri",
-                ),
                 clientEmail: context.knobs.text(
                   label: 'Email',
                   initialValue: "luca.coduri@gmail.com",

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,8 @@ class FirebaseConnection implements Auth {`
`44`	`44`	`.signInWithEmailAndPassword(email: email, password: password);`
`45`	`45`	`}`
`46`	`46`	`return true;`
`47`		`- } on FirebaseAuthException catch (e) {`
`48`		`- if (e.code == 'user-not-found') {`
`49`		`- log('No user found for that email.');`
`50`		`- } else if (e.code == 'wrong-password') {`
`51`		`- log('Wrong password provided for that user.');`
`52`		`- }`
	`47`	`+ } catch (e) {`
	`48`	`+ log(e.toString());`
`53`	`49`	`}`
`54`	`50`	`return false;`
`55`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class FirebaseUser extends FirebaseAPI implements IUser {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`@override`
`78`		`- Future<User> readDietitianOfClient(String clientId) async {`
	`78`	`+ Future<User?> readDietitianOfClient(String clientId) async {`
`79`	`79`	`final querySnapshot = await collectionReference`
`80`	`80`	`.where('clientList', arrayContains: clientId)`
`81`	`81`	`.withConverter(`
`@@ -85,6 +85,7 @@ class FirebaseUser extends FirebaseAPI implements IUser {`
`85`	`85`	`.get();`
`86`	`86`	`List<User> dietitians =`
`87`	`87`	`querySnapshot.docs.map((doc) => doc.data()).toList();`
`88`		`- return dietitians.first;`
	`88`	`+`
	`89`	`+ return dietitians.isNotEmpty ? dietitians.first : null;`
`89`	`90`	`}`
`90`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ abstract class IUser {`
`6`	`6`	`void updateUser(User user);`
`7`	`7`	`void deleteUser(String userid);`
`8`	`8`	`Future<List<User>> getDietitianClient(String dietitianId);`
`9`		`- Future<User> readDietitianOfClient(String clientId);`
	`9`	`+ Future<User?> readDietitianOfClient(String clientId);`
`10`	`10`	`}`