Merge pull request #211 from les-crepes/201-correction-vue-diary

201 correction vue diary

Author: LucaCoduriV

lib/api/firebase_meal.dart

@@ -60,8 +60,13 @@ class FirebaseMeal extends FirebaseAPI implements IMeal {
 
   @override
   Future<List<Meal>> getUsersMealForDay(String userId, DateTime day) async {
-    DateTime newD = DateTime(day.year, day.month, day.day, 0, 0); /// Start of the day
-    DateTime endD = newD.add(const Duration(days: 1)); /// End of the day
+    DateTime newD = DateTime(day.year, day.month, day.day, 0, 0);
+
+    /// Start of the day
+    DateTime endD = newD.add(const Duration(days: 1));
+
+    /// End of the day
+
     final m = await collectionReference
         .where("owner", isEqualTo: userId)
         .where("startTime", isGreaterThanOrEqualTo: newD)
@@ -74,6 +79,30 @@ class FirebaseMeal extends FirebaseAPI implements IMeal {
     return meals;
   }
 
+  @override
+  Stream<List<Meal>> followMeals(String userId, DateTime day) {
+    DateTime newD = DateTime(day.year, day.month, day.day, 0, 0);
+
+    /// Start of the day
+    DateTime endD = newD.add(const Duration(days: 1));
+
+    /// End of the day
+
+    Stream<QuerySnapshot<Meal>> mealStream = collectionReference
+        .where("owner", isEqualTo: userId)
+        .where("startTime", isGreaterThanOrEqualTo: newD)
+        .where("startTime", isLessThanOrEqualTo: endD)
+        .withConverter(
+            fromFirestore: Meal.fromFirestore,
+            toFirestore: (Meal meal, options) => meal.toFirestore())
+        .snapshots();
+
+    return mealStream
+        .map((querySnapshot) => querySnapshot.docs)
+        .map((doc) => doc.map((e) => e.data()))
+        .cast();
+  }
+
   @override
   Future<List<Meal>> getUserMeal(String userId) async {
     final m = await collectionReference

lib/api/imeal.dart

@@ -4,14 +4,22 @@ import 'package:pdg_app/model/meal.dart';
 abstract class IMeal {
   /// Add [meal] to the database
   Future<void> createMeal(Meal meal);
+
   /// Returns the meal in the database with [mealId]
   Future<Meal> readMeal(String mealId);
+
   /// Update the [meal] in the database
   Future<void> updateMeal(Meal meal);
+
   /// Delete the meal with [mealId] from the database
   void deleteMeal(String mealId);
+
   /// Get the meals of the user [userId] for the day [day]
   Future<List<Meal>> getUsersMealForDay(String userId, DateTime day);
+
+  /// Subscribe to the user [userId] meals for the day [day]
+  Stream<List<Meal>> followMeals(String userId, DateTime day);
+
   /// Get the meals of the user [userId]
   Future<List<Meal>> getUserMeal(String userId);
 }

lib/provider/chat_provider.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:collection';
-import 'dart:developer';
 
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter/material.dart';
@@ -105,8 +104,6 @@ class ChatProvider extends ChangeNotifier {
       final subscription = _messageApi
           .followConversation(currentUserUid, user.uid)
           .listen((event) {
-        log('FOLLOW: $event');
-
         /// Be sure that the last received message isn't already in the list.
         if (event != null && !_messages[user]!.any((m) => m.uid == event.uid)) {
           _messages[user]!.add(event);

lib/provider/meal_provider.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:developer';
 
 import 'package:cloud_firestore/cloud_firestore.dart';
@@ -16,6 +17,7 @@ class MealProvider extends ChangeNotifier {
   final String _uid;
   bool _isFetching = false;
   final IFile _fileApi = FirebaseFile(FirebaseStorage.instance);
+  StreamSubscription<List<Meal>>? _subscription;
 
   MealProvider(this._uid) {
     fetchMeals();
@@ -71,4 +73,20 @@ class MealProvider extends ChangeNotifier {
 
     return picUrl;
   }
+
+  void startNewDiaryListener(String userId, DateTime date) {
+    if (_subscription != null) return;
+
+    final subscription = _mealApi.followMeals(userId, date).listen((event) {
+      _meals = event;
+      notifyListeners();
+    });
+
+    _subscription = subscription;
+  }
+
+  /// Stop listening to new incoming meal.
+  void stopNewDiaryListener() {
+    _subscription?.cancel();
+  }
 }

lib/screens/diary.dart

@@ -39,9 +39,14 @@ class _DiaryScreenState extends State<DiaryScreen> {
   IFile fileApi = FirebaseFile(FirebaseStorage.instance);
   final LoadingOverlayController _loadingOverlayController =
       LoadingOverlayController();
+  late MealProvider mealProvider;
 
-  _onDaySelected(DateTime day) async {
-    _selectedDate = day;
+  @override
+  void dispose() {
+    if (GetIt.I.get<AuthProvider>().isAdmin) {
+      mealProvider.stopNewDiaryListener();
+    }
+    super.dispose();
   }
 
   List<Meal> _getEventsForDay(BuildContext context, DateTime day) {
@@ -60,20 +65,34 @@ class _DiaryScreenState extends State<DiaryScreen> {
         builder: (context, child) {
           context.watch<MealProvider>().meals;
 
-          MealProvider mealProvider = context.read<MealProvider>();
+          mealProvider = context.read<MealProvider>();
           AuthProvider authProvider = GetIt.I.get<AuthProvider>();
 
+          if (isAdmin) {
+            mealProvider.startNewDiaryListener(
+                widget._client!.uid, _selectedDate);
+          }
+
           return LoadingOverlay(
             controller: _loadingOverlayController,
             child: Diary(
-                onDaySelected: _onDaySelected,
+                onDaySelected: (date) {
+                  _selectedDate = date;
+                  if (isAdmin) {
+                    mealProvider.stopNewDiaryListener();
+                    mealProvider.startNewDiaryListener(
+                        widget._client!.uid, date);
+                  }
+                },
                 getDiariesForDay: (day) {
                   return _getEventsForDay(context, day);
                 },
                 clientName: !isAdmin
                     ? GetIt.I.get<AuthProvider>().user!.firstName
                     : widget._client!.firstName,
-                clientPicturePath: authProvider.user!.photoUrl,
+                clientPicturePath: !isAdmin
+                    ? authProvider.user!.photoUrl
+                    : widget._client!.photoUrl,
                 defaultUserPic: "assets/images/default_user_pic.png",
                 showActionButton: !isAdmin,
                 defaultMealPic: "assets/images/breakfast.jpg",