modified usermodel to have an events array

lib/src/blocs/home_bloc.dart

@@ -10,7 +10,7 @@ export '../resources/authService.dart' show FirebaseUser;
 
 class HomeBloc {
   final AuthService _auth = authService;
-  final FirestoreProvider _firestore = firestoreProvider;
+  final FirestoreProvider _repository = firestoreProvider;
   final _tasks = BehaviorSubject<List<TaskModel>>();
 
   // Stream getters.
@@ -30,7 +30,7 @@ class HomeBloc {
 
   Future<void> fetchTasks() async {
     final user = await _auth.currentUser;
-    _firestore.getUserTasks(user.email).pipe(_tasks);
+    _repository.getUserTasks(user.email).pipe(_tasks);
   }
 
   Future<String> getUserAvatarUrl() async {
@@ -44,7 +44,7 @@ class HomeBloc {
   }
 
   void markTaskAsDone(TaskModel task) async {
-    _firestore.updateTask(
+    _repository.updateTask(
       task.id,
       done: true,
     );

lib/src/models/user_model.dart

@@ -14,6 +14,9 @@ class UserModel {
   /// An array of task ids.
   final List<String> tasks;
 
+  /// An array of event names.
+  final List<String> events;
+
   /// Added and finished tasks for the current week.
   final SummaryModel summary;
 
@@ -34,6 +37,7 @@ class UserModel {
     @required this.pendingHigh,
     @required this.pendingMedium,
     @required this.pendingLow,
+    @required this.events,
   });
 
   ///Returns a [UserModel] from a map.
@@ -41,6 +45,7 @@ class UserModel {
       : id = id,
         username = firestoreMap["username"],
         tasks = firestoreMap["tasks"].cast<String>(),
+        events = firestoreMap["events"].cast<String>(),
         summary =
             SummaryModel.fromMap(firestoreMap["summary"].cast<String, int>()),
         pendingHigh = firestoreMap["pendingHigh"],
@@ -51,6 +56,7 @@ class UserModel {
     return <String, dynamic>{
       "username": username,
       "tasks": tasks,
+      "events": events,
       "summary": summary.toMap(),
       "pendingHigh": pendingHigh,
       "pendingMedium": pendingMedium,

lib/src/resources/authService.dart

@@ -33,6 +33,7 @@ class AuthService {
       final newUserModel = UserModel(
         username: user.email,
         tasks: <String>[],
+        events: <String>[],
         summary: SummaryModel(),
         pendingHigh: 0,
         pendingMedium: 0,

lib/src/resources/firestore_provider.dart

@@ -21,7 +21,7 @@ class FirestoreProvider {
   //-----------------------User related operations------------------------------
 
   /// Returns a stream of [UserModel].
-  Observable<UserModel> getUser(String username) {
+  Observable<UserModel> getUserObservable(String username) {
     final mappedStream = _firestore
         .collection('users')
         .where('username', isEqualTo: username)
@@ -42,6 +42,28 @@ class FirestoreProvider {
     return Observable(mappedStream);
   }
 
+  //TODO: add tests for this method.
+
+  /// Returns a [UserModel].
+  /// Only one out of id or username can be provided, if both are provided id
+  /// will have higher priority.
+  Future<UserModel> getUser({String id, String username}) async {
+    DocumentSnapshot documentSnapshot;
+    if (id != null) {
+      documentSnapshot = await _firestore.document('users/$id').get();
+    } else {
+      final querySnapshot = await _firestore
+          .collection('users')
+          .where('username', isEqualTo: username)
+          .getDocuments();
+      documentSnapshot = querySnapshot.documents.first;
+    }
+    return UserModel.fromFirestore(
+      documentSnapshot.data,
+      id: documentSnapshot.documentID,
+    );
+  }
+
   /// Creates a new instance of a user in Firestore.
   Future<void> createUser(UserModel user, String uid) async {
     try {
@@ -68,6 +90,7 @@ class FirestoreProvider {
   Future<void> updateUser(
     String id, {
     List<String> tasks,
+    List<String> events,
     SummaryModel summary,
     int pendingHigh,
     int pendingMedium,
@@ -75,6 +98,7 @@ class FirestoreProvider {
   }) async {
     final newData = <String, dynamic>{
       'tasks': tasks,
+      'events': events,
       'summary': summary,
       'pendingHigh': pendingHigh,
       'pendingMedium': pendingMedium,
@@ -200,6 +224,11 @@ class FirestoreProvider {
     try {
       final dataMap = event.toFirestoreMap();
       await _firestore.collection('users/$userId/Events').add(dataMap);
+      // After the event was added successfully we have to update the events a
+      // user has.
+      final user = await getUser(id: userId);
+      final newEventsArray = user.events..add(event.name);
+      await updateUser(userId, events: newEventsArray);
     } catch (e) {
       print('Error adding Event to firestore: $e');
     }

test/src/resources/firestore_provider_test.dart

@@ -29,6 +29,7 @@ main() {
   final user = UserModel(
     id: '123',
     tasks: <String>[],
+    events: <String>[],
     pendingHigh: 0,
     pendingMedium: 0,
     pendingLow: 0,
@@ -81,7 +82,7 @@ main() {
       when(querySnapshot.documents).thenReturn([snapshot]);
       when(snapshot.documentID).thenReturn(user.id);
 
-      expect(provider.getUser(user.username), emits(user));
+      expect(provider.getUserObservable(user.username), emits(user));
     });
 
     test('should create task', () {