fix buggy behaviour of filter

Author: IoanaAlexandru

lib/authentication/service/auth_provider.dart

@@ -2,16 +2,20 @@ import 'dart:async';
 
 import 'package:acs_upb_mobile/authentication/model/user.dart';
 import 'package:acs_upb_mobile/generated/l10n.dart';
+import 'package:acs_upb_mobile/pages/filter/service/filter_provider.dart';
 import 'package:acs_upb_mobile/widgets/toast.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:preferences/preference_service.dart';
+import 'package:provider/provider.dart';
 
 extension DatabaseUser on User {
   static User fromSnap(DocumentSnapshot snap) {
-    return User(uid: snap.documentID, firstName: snap.data['name']['first'], lastName: snap.data['name']['last'],
-    group: snap.data['group']);
+    return User(
+        uid: snap.documentID,
+        firstName: snap.data['name']['first'],
+        lastName: snap.data['name']['last'],
+        group: snap.data['group']);
   }
 
   Map<String, dynamic> toData() {
@@ -102,6 +106,9 @@ class AuthProvider with ChangeNotifier {
   }
 
   Future<User> getCurrentUser() async {
+    if (isAnonymous) {
+      return null;
+    }
     DocumentSnapshot snapshot =
         await Firestore.instance.collection('users').document(user.uid).get();
     return DatabaseUser.fromSnap(snapshot);
@@ -152,7 +159,7 @@ class AuthProvider with ChangeNotifier {
     return true;
   }
 
-  Future<void> signOut() {
+  Future<void> signOut(BuildContext context) {
     if (isAnonymous) {
       try {
         user.delete();
@@ -161,8 +168,7 @@ class AuthProvider with ChangeNotifier {
       }
     }
 
-    // Reset filter preference
-    PrefService.setStringList('relevantNodes', null);
+    Provider.of<FilterProvider>(context, listen: false).resetFilter();
     return FirebaseAuth.instance.signOut();
   }
 

lib/pages/filter/model/filter.dart

@@ -30,6 +30,7 @@ class Filter {
   List<Map<String, String>> localizedLevelNames;
 
   Filter({this.root, this.localizedLevelNames, void Function() listener}) {
+    this.root.value = true;  // root value is true by default
     _addListener(listener ?? () {}, this.root);
   }
 
@@ -43,10 +44,11 @@ class Filter {
   }
 
   void _relevantNodesHelper(List<String> list, FilterNode node) {
-    if (node.children != null) {
-      node.children.forEach((child) => this._relevantNodesHelper(list, child));
-    }
     if (node.value) {
+      if (node.children != null) {
+        node.children
+            .forEach((child) => this._relevantNodesHelper(list, child));
+      }
       list.add(node.name);
     }
   }
@@ -79,10 +81,16 @@ class Filter {
 
   /// Set the value of node with name [nodeName] and its parents to `true`.
   bool setRelevantUpToRoot(String nodeName) {
-    return _setRelevantHelper(nodeName, root, true);
+    if (nodeName != null) {
+      return _setRelevantHelper(nodeName, root, true);
+    }
+    return false;
   }
 
   bool setRelevantNodes(List<String> nodes) {
+    if(nodes == null || nodes.isEmpty) {
+      return false;
+    }
     bool setAllNodes = true;
     nodes.forEach(
         (node) => setAllNodes &= _setRelevantHelper(node, root, false));

lib/pages/filter/service/filter_provider.dart

@@ -22,7 +22,18 @@ class FilterProvider with ChangeNotifier {
   final Firestore _db = Firestore.instance;
   Filter _relevanceFilter;
 
+  void resetFilter() {
+    _relevanceFilter = null;
+
+    // Reset filter preference
+    PrefService.setStringList('relevantNodes', null);
+  }
+
   Future<Filter> getRelevanceFilter(BuildContext context) async {
+    if (_relevanceFilter != null) {
+      return _relevanceFilter;
+    }
+
     try {
       var col = _db.collection('filters');
       var ref = col.document('relevance');
@@ -57,8 +68,10 @@ class FilterProvider with ChangeNotifier {
         if (authProvider.isAuthenticated) {
           User user = await authProvider.getCurrentUser();
           // Try to set the default as the user's group
-          _relevanceFilter.setRelevantUpToRoot(user.group);
-          relevantNodes = PrefService.get('relevantNodes');
+          if (user != null) {
+            _relevanceFilter.setRelevantUpToRoot(user.group);
+            relevantNodes = PrefService.get('relevantNodes');
+          }
         }
       }
 
@@ -67,8 +80,9 @@ class FilterProvider with ChangeNotifier {
       }
 
       return _relevanceFilter;
-    } catch (e) {
+    } catch (e, stackTrace) {
       print(e);
+      print(stackTrace);
       return null;
     }
   }

lib/pages/portal/service/website_provider.dart

@@ -70,6 +70,7 @@ class WebsiteProvider with ChangeNotifier {
           .map((doc) => WebsiteFromSnap.fromSnap(doc))
           .toList();
     } catch (e) {
+      print(e);
       return null;
     }
   }

lib/pages/profile/profile_page.dart

@@ -50,7 +50,7 @@ class ProfilePage extends StatelessWidget {
           if (authProvider.isAuthenticated)
             FloatingActionButton(
               onPressed: () async {
-                authProvider.signOut();
+                authProvider.signOut(context);
                 Navigator.pushReplacementNamed(context, Routes.login);
               },
               tooltip: 'Sign Out',

pubspec.yaml

@@ -11,7 +11,7 @@ description: A mobile application for students at ACS UPB.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.3.5+1
+version: 0.3.6+1
 
 environment:
   sdk: ">=2.6.0 <3.0.0"

test/filter_test.dart

@@ -191,18 +191,18 @@ void main() {
           ]..sort()));
 
       // Non-existent node
-      expect(testFilter.setRelevantNodes(['Nope', 'IA']), isFalse);
+      expect(testFilter.setRelevantNodes(['Nope', '312CD']), isFalse);
       expect(
           testFilter.relevantNodes..sort(),
           equals([
             '314CB',
             '313CB',
+            '312CD',
             '311CD',
             '1-CB',
             '1-CD',
             'CTI-1',
             'CTI',
-            'IA',
             'BSc',
             'All'
           ]..sort()));
@@ -222,7 +222,6 @@ void main() {
             '1-CD',
             'CTI-1',
             'CTI',
-            'IA',
             'BSc',
             'All'
           ]..sort()));