Merge pull request #215 from les-crepes/214-actualisation-en-direct-d…

…u-diary-client 214 actualisation en direct du diary client
les-crepes · Sep 7, 2022 · d8f22ee · d8f22ee
2 parents dbe467b + 8413355
commit d8f22ee
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 28 deletions.
diff --git a/lib/api/firebase_meal.dart b/lib/api/firebase_meal.dart
@@ -80,27 +80,18 @@ class FirebaseMeal extends FirebaseAPI implements IMeal {
   }
 
   @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<List<Meal>> followMeals(String userId) {
     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();
+        .snapshots(includeMetadataChanges: true);
 
-    return mealStream
-        .map((querySnapshot) => querySnapshot.docs)
-        .map((doc) => doc.map((e) => e.data()))
-        .cast();
+    final mealList = mealStream
+        .map((query) => query.docs)
+        .map((doc) => doc.map((querydoc) => querydoc.data()).toList());
+    return mealList;
   }
 
   @override
@@ -111,6 +102,7 @@ class FirebaseMeal extends FirebaseAPI implements IMeal {
             fromFirestore: Meal.fromFirestore,
             toFirestore: (Meal meal, options) => meal.toFirestore())
         .get();
+
     List<Meal> meals = m.docs.map((doc) => doc.data()).toList();
     return meals;
   }

diff --git a/lib/api/imeal.dart b/lib/api/imeal.dart
@@ -17,8 +17,8 @@ abstract class IMeal {
   /// 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);
+  /// Subscribe to the user [userId] meals
+  Stream<List<Meal>> followMeals(String userId);
 
   /// Get the meals of the user [userId]
   Future<List<Meal>> getUserMeal(String userId);

diff --git a/lib/provider/meal_provider.dart b/lib/provider/meal_provider.dart
@@ -76,10 +76,10 @@ class MealProvider extends ChangeNotifier {
     return picUrl;
   }
 
-  void startNewDiaryListener(String userId, DateTime date) {
+  void startNewDiaryListener(String userId) {
     if (_subscription != null) return;
 
-    final subscription = _mealApi.followMeals(userId, date).listen((event) {
+    final subscription = _mealApi.followMeals(userId).listen((event) {
       _meals = event;
       notifyListeners();
     });

diff --git a/lib/screens/diary.dart b/lib/screens/diary.dart
@@ -50,7 +50,7 @@ class _DiaryScreenState extends State<DiaryScreen> {
   }
 
   List<Meal> _getEventsForDay(BuildContext context, DateTime day) {
-    return context.read<MealProvider>().meals;
+    return context.watch<MealProvider>().meals;
   }
 
   @override
@@ -65,24 +65,18 @@ class _DiaryScreenState extends State<DiaryScreen> {
         builder: (context, child) {
           context.watch<MealProvider>().meals;
 
-          mealProvider = context.read<MealProvider>();
+          mealProvider = context.watch<MealProvider>();
           AuthProvider authProvider = GetIt.I.get<AuthProvider>();
 
           if (isAdmin) {
-            mealProvider.startNewDiaryListener(
-                widget._client!.uid, _selectedDate);
+            mealProvider.startNewDiaryListener(widget._client!.uid);
           }
 
           return LoadingOverlay(
             controller: _loadingOverlayController,
             child: Diary(
                 onDaySelected: (date) {
                   _selectedDate = date;
-                  if (isAdmin) {
-                    mealProvider.stopNewDiaryListener();
-                    mealProvider.startNewDiaryListener(
-                        widget._client!.uid, date);
-                  }
                 },
                 getDiariesForDay: (day) {
                   return _getEventsForDay(context, day);