fix: fixed streak system

refactor(DataProvider): DataProvider > UserDataUtil, deprecated Provider.
SethCohen · Apr 11, 2023 · 4b2a617 · 4b2a617
1 parent c933e34
commit 4b2a617
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 54 deletions.
diff --git a/src/lib/common/utils/data_provider.dart → src/lib/common/utils/user_data_util.dart b/src/lib/common/utils/data_provider.dart → src/lib/common/utils/user_data_util.dart
@@ -1,37 +1,51 @@
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter/material.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:spaced_repetition/sm.dart';
 import '../../features/flashcard/flashcard_model.dart';
 
 final currentUser = FirebaseAuth.instance.currentUser!;
-const pageSize = 5;
 
-class DataProvider extends ChangeNotifier {
-  Future<void> updateCardProgress(FlashcardModel flashcard, int quality) async {
-    Sm sm = Sm();
+class UserDataUtil {
+  static Future<void> updateLastLearnt() async {
+    final user = await FirebaseFirestore.instance
+        .collection('users')
+        .doc(currentUser.uid)
+        .get();
 
-    // Updates streak
-    FirebaseFirestore.instance
+    if (user.exists) {
+      user.reference.set({
+        'lastLearnt': DateTime.now(),
+      }, SetOptions(merge: true));
+    }
+  }
+
+  static Future<void> updateStreak() async {
+    final user = await FirebaseFirestore.instance
         .collection('users')
         .doc(currentUser.uid)
-        .get()
-        .then((user) {
-      final userData = user.data() as Map<String, dynamic>;
-      final lastLearnt = (userData['lastLearnt'] as Timestamp).toDate();
+        .get();
+
+    if (user.exists) {
+      final lastLearnt = (user.data()!['lastLearnt'] as Timestamp).toDate();
       final now = DateTime.now();
       DateTime lastStreakUpdate =
           DateTime(lastLearnt.year, lastLearnt.month, lastLearnt.day);
       DateTime today = DateTime(now.year, now.month, now.day);
+      DateTime yesterday = today.subtract(const Duration(days: 1));
 
-      if (lastStreakUpdate != today) {
+      if (lastStreakUpdate == yesterday) {
         user.reference.set({
           'streak': FieldValue.increment(1),
         }, SetOptions(merge: true));
       }
-    }).catchError((error) {
-      debugPrint(error);
-    });
+    }
+
+    UserDataUtil.updateLastLearnt();
+  }
+
+  static Future<void> updateCardProgress(
+      FlashcardModel flashcard, int quality) async {
+    Sm sm = Sm();
 
     // Gets card progress for the current user
     final card = await FirebaseFirestore.instance
@@ -100,8 +114,6 @@ class DataProvider extends ChangeNotifier {
           SetOptions(merge: true));
 
       await batch.commit();
-
-      notifyListeners();
     }
   }
 }
diff --git a/src/lib/features/flashcard/flashcard.dart b/src/lib/features/flashcard/flashcard.dart
@@ -1,8 +1,7 @@
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import 'flashcard_model.dart';
-import '../../common/utils/data_provider.dart';
+import '../../common/utils/user_data_util.dart';
 import '../../common/widgets/custom_iconbutton.dart';
 
 enum CardType { review, dictionary, lesson }
@@ -160,7 +159,7 @@ class _FlashcardState extends State<Flashcard> {
       );
 
   void _handleButtonPress(FlashcardModel flashcard, int quality) {
-    context.read<DataProvider>().updateCardProgress(flashcard, quality);
+    UserDataUtil.updateCardProgress(flashcard, quality);
     widget.handleIndex!();
   }
 

diff --git a/src/lib/features/lesson/lesson_details_page.dart b/src/lib/features/lesson/lesson_details_page.dart
@@ -1,7 +1,6 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import '../authentication/google_provider.dart';
+import '../../common/utils/user_data_util.dart';
 import '../flashcard/flashcard_model.dart';
 import '../flashcard/flashcard.dart';
 import 'lessons_list_page.dart';
@@ -56,14 +55,7 @@ class _LessonDetailsState extends State<LessonDetails> {
   void _handleIndex() => setState(() {
         bool isCompleted = _currentCardIndex == widget.lessonData.cardCount - 1;
         if (isCompleted) {
-          final currentUser = context.read<GoogleSignInProvider>().user;
-
-          FirebaseFirestore.instance
-              .collection("users")
-              .doc(currentUser!.uid)
-              .set({
-            'lastLearnt': DateTime.now(),
-          }, SetOptions(merge: true));
+          UserDataUtil.updateStreak();
 
           Navigator.pop(context);
         } else {

diff --git a/src/lib/features/lesson/lessons_list_page.dart b/src/lib/features/lesson/lessons_list_page.dart
@@ -1,7 +1,8 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
-import 'package:firebase_auth/firebase_auth.dart';
 import 'package:firebase_ui_firestore/firebase_ui_firestore.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../authentication/google_provider.dart';
 
 class Lesson {
   Lesson(
@@ -48,7 +49,7 @@ class LessonsPage extends StatelessWidget {
         String deckId = deckSnapshot.id;
 
         return StreamBuilder<DocumentSnapshot>(
-          stream: _getUserDeckProgress(deckId),
+          stream: _getUserDeckProgress(context, deckId),
           builder: (context, snapshot) {
             int userDeckCardCount = 0;
 
@@ -63,12 +64,11 @@ class LessonsPage extends StatelessWidget {
     );
   }
 
-  Stream<DocumentSnapshot> _getUserDeckProgress(deckId) {
-    final currentuser = FirebaseAuth.instance.currentUser!;
-
+  Stream<DocumentSnapshot> _getUserDeckProgress(
+      BuildContext context, String deckId) {
     return FirebaseFirestore.instance
         .collection('users')
-        .doc(currentuser.uid)
+        .doc(context.read<GoogleSignInProvider>().user!.uid)
         .collection('deckProgress')
         .doc(deckId)
         .snapshots();

diff --git a/src/lib/features/review/review_details_page.dart b/src/lib/features/review/review_details_page.dart
@@ -1,7 +1,5 @@
-import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import '../authentication/google_provider.dart';
+import '../../common/utils/user_data_util.dart';
 import '../flashcard/flashcard_model.dart';
 import 'review_model.dart';
 import '../flashcard/flashcard.dart';
@@ -41,14 +39,7 @@ class _ReviewState extends State<Review> {
   void _handleIndex() => setState(() {
         bool isCompleted = _currentCardIndex == widget.cards.length - 1;
         if (isCompleted) {
-          final currentUser = context.read<GoogleSignInProvider>().user;
-
-          FirebaseFirestore.instance
-              .collection("users")
-              .doc(currentUser!.uid)
-              .set({
-            'lastLearnt': DateTime.now(),
-          }, SetOptions(merge: true));
+          UserDataUtil.updateStreak();
 
           Navigator.pop(context);
         } else {

diff --git a/src/lib/features/review/reviews_list_page.dart b/src/lib/features/review/reviews_list_page.dart
@@ -3,7 +3,6 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
-import '../../common/utils/data_provider.dart';
 import '../authentication/google_provider.dart';
 import 'review_model.dart';
 
@@ -131,7 +130,8 @@ class _ReviewPageState extends State<ReviewPage> {
     return FirebaseFirestore.instance
         .collectionGroup('cards')
         .where('nextReview', isLessThan: DateTime.now())
-        .where('userId', isEqualTo: currentUser.uid)
+        .where('userId',
+            isEqualTo: context.read<GoogleSignInProvider>().user!.uid)
         .snapshots()
         .map((querySnapshot) {
       final reviewModelList = querySnapshot.docs.map((doc) {
@@ -143,11 +143,10 @@ class _ReviewPageState extends State<ReviewPage> {
   }
 
   Future<QuerySnapshot> _getNextAvailableReview() async {
-    final currentUser = context.read<GoogleSignInProvider>().user;
-
     return await FirebaseFirestore.instance
         .collectionGroup('cards')
-        .where('userId', isEqualTo: currentUser!.uid)
+        .where('userId',
+            isEqualTo: context.read<GoogleSignInProvider>().user!.uid)
         .orderBy('nextReview', descending: false)
         .limit(1)
         .get();

diff --git a/src/lib/main.dart b/src/lib/main.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:url_strategy/url_strategy.dart';
-import 'common/utils/data_provider.dart';
 import 'features/authentication/google_provider.dart';
 import 'firebase_options.dart';
 import 'common/utils/routes.dart';
@@ -26,7 +25,6 @@ class MyApp extends StatelessWidget {
     return MultiProvider(
         providers: [
           ChangeNotifierProvider(create: (_) => GoogleSignInProvider()),
-          ChangeNotifierProvider(create: (_) => DataProvider()),
         ],
         child: MaterialApp(
           debugShowCheckedModeBanner: false,