start rewrite.

Author: mrsrmn

lib/models/place.dart

@@ -1,53 +1,54 @@
+import 'package:harmony/models/review.dart';
+import 'package:harmony/models/user.dart';
+import 'package:harmony/utilites/places/place_category_enum.dart';
+
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:geoflutterfire/geoflutterfire.dart';
-import 'package:harmony/utilites/places/place_category_enum.dart';
 
-class Place{
+class Place {
   final String id;
-  PlaceCategory category;
-  GeoFirePoint point;
-  String name;
-  List<dynamic> pastUserIds;
-  List<dynamic> reviewIds;
-  double rating;
-
-
-  Place(this.id, this.category, this.point, this.name, this.pastUserIds,
-      this.reviewIds, this.rating);
-
-  ///FROM DB
-
+  final PlaceCategory category;
+  final GeoFirePoint point;
+  final String name;
+  final List<HarmonyUser> pastUsers;
+  final List<Review> reviews;
+  final double rating;
+
+  Place({
+    required this.id,
+    required this.category,
+    required this.point,
+    required this.name,
+    required this.pastUsers,
+    required this.reviews,
+    required this.rating
+  });
 
   factory Place.fromJson(Map<String, dynamic> data, String id) {
-    PlaceCategory parsePlaceCategory(String sPlaceCategory){
-      return PlaceCategory.values.firstWhere((e) => e.toString() == sPlaceCategory); //from string to enum
-    }
     GeoFirePoint parsePoint(Map<String, dynamic> point){
       GeoPoint geoPoint = point['geopoint'];
       return GeoFirePoint(geoPoint.latitude, geoPoint.longitude);
     }
 
-    //TODO
     return Place(
-      id,
-      parsePlaceCategory(data["category"] as String),
-      parsePoint(data['point']),
-      data["name"] as String,
-      data["past_user_ids"] as List<dynamic>,
-      data['review_ids'] as List<dynamic>,
-      (data["rating"] as int).toDouble(),
+      id: id,
+      category: PlaceCategory.values.byName(data["category"]),
+      point: parsePoint(data['point']),
+      name: data["name"],
+      pastUsers: data["pastUsers"], // TODO
+      reviews: data["reviews"], // TODO
+      rating: data["rating"],
     );
   }
 
   Map<String, dynamic> toJson(){
     return {
-      'category': category.toString(),
-      'name': name,
-      'point': point.data,
-      'past_user_ids': pastUserIds,
-      'review_ids': reviewIds,
-      'rating': rating,
+      "category": category.toString(),
+      "name": name,
+      "point": point,
+      "pastUsers": pastUsers,
+      "reviews": reviews,
+      "rating": rating,
     };
   }
-
 }

lib/models/user.dart

@@ -3,7 +3,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
 
 import 'associative_entities/check_in.dart';
 
-class HarmonyUser{
+class HarmonyUser {
   final String id; // Not designated by us as all other classes, comes from firestore when creating document
   final String uid;
   String username;//May change in profile settings etc.

lib/services/firestore.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:firebase_auth/firebase_auth.dart';
 import 'package:firebase_storage/firebase_storage.dart';
 import 'package:geoflutterfire/geoflutterfire.dart';
 import 'package:harmony/models/associative_entities/check_in.dart';
@@ -15,7 +16,6 @@ import 'package:location/location.dart';
 
 
 class FireStoreService {
-
   static CollectionReference users = FirebaseFirestore.instance.collection('users');
   static CollectionReference places = FirebaseFirestore.instance.collection('places');
   static CollectionReference reviews = FirebaseFirestore.instance.collection('reviews');
@@ -32,8 +32,9 @@ class FireStoreService {
   Future<List<Place>> getPlacesNearUser(LocationData userLocation, FilterModel filterModel) async {
     GeoFirePoint center = _geoFireService.createGeoPoint(userLocation.latitude!, userLocation.longitude!);
     String field = "point";
-    Stream<List<DocumentSnapshot>> documentStream =  _geoFireService.geo.collection(collectionRef: places).within(
-        center: center, radius: filterModel.proximity, field: field);
+    Stream<List<DocumentSnapshot>> documentStream = _geoFireService.geo.collection(collectionRef: places).within(
+      center: center, radius: filterModel.proximity, field: field
+    );
     return await filterNearPlacesStream(documentStream, filterModel.chosenCategories, filterModel.minimumRating);
   }
 
@@ -361,45 +362,43 @@ class FireStoreService {
   }
 
   void _updatePlacePUIDS(Place place, HarmonyUser user) { // PUIDS stands for PastUserIds,
-    List pastUserIds = place.pastUserIds;
-    pastUserIds.add(user.id);
+    List<HarmonyUser> pastUsers = place.pastUsers;
+    pastUsers.add(user);
 
     places.doc(place.id).get().then(
-            (placeDoc) {
-          placeDoc.reference.update(
-              {
-                "past_user_ids": pastUserIds
-              }
-          );
-        }
+      (placeDoc) {
+        placeDoc.reference.update({
+          "past_user_ids": pastUserIds
+        });
+      }
     );
   }
 
-  void reviewLikedByUser(Review review, HarmonyUser user){
+  void reviewLikedByUser(Review review, HarmonyUser user) {
     _handleLikeForReview(review, user);
   }
 
-  void _handleLikeForReview(Review review, HarmonyUser user){
+  void _handleLikeForReview(Review review, HarmonyUser user) {
     review.like(user);
     _updateReview(
-        review,
-        {
-          "likes": review.getLikesAsString()
-        }
+      review,
+      {
+        "likes": review.getLikesAsString()
+      }
     );
   }
 
-  void _updateReview(Review review, Map<String, dynamic> fields){
+  void _updateReview(Review review, Map<String, dynamic> fields) {
     reviews.doc(review.id).get().then(
-            (reviewDoc){
-          reviewDoc.reference.update(
-              fields
-          );
-        }
+      (reviewDoc) {
+        reviewDoc.reference.update(
+          fields
+        );
+      }
     );
   }
 
-  void reviewUnlikedByUser(Review review, HarmonyUser user){
+  void reviewUnlikedByUser(Review review, HarmonyUser user) {
     review.unlike(user);
     _updateReview(
         review,
@@ -408,7 +407,4 @@ class FireStoreService {
         }
     );
   }
-
-
-
 }

lib/utilites/page_enum.dart

@@ -1,7 +1,7 @@
-enum PAGE_ENUM{
-  LOGIN_PAGE,
-  REGISTER_PAGE,
-  DISCOVER_PAGE,
-  NEARBY_PAGE,
-  ACCOUNT_PAGE,
+enum PageEnum{
+  loginPage,
+  registerPage,
+  discoverPage,
+  nearbyPage,
+  accountPage,
 }

lib/viewmodel/add_place/add_place_viewmodel.dart

@@ -11,8 +11,7 @@ import 'package:harmony/utilites/custom_exception.dart';
 import 'package:harmony/utilites/places/place_category_enum.dart';
 import 'package:location/location.dart';
 
-class AddPlaceViewModel{
-
+class AddPlaceViewModel {
   Future<Place> createPlace(String name, PlaceCategory category, File imageFile, double latitude, double longitude) async {
     FireStoreService fireStoreService = FireStoreService();
 
@@ -38,8 +37,8 @@ class AddPlaceViewModel{
   Future<bool> checkIfAnyPlaceExistsNearby(LocationData locationOfPotentialData) async{
     GeoFirePoint point = GeoFireService().createGeoPoint(locationOfPotentialData.latitude!, locationOfPotentialData.longitude!);
     List<String> hashesToBeChecked = point.neighbors..add(point.hash);
-    for(String geoHash in hashesToBeChecked){
-      if(await FireStoreService().anyPlaceExistWithHash(geoHash)){
+    for (String geoHash in hashesToBeChecked) {
+      if (await FireStoreService().anyPlaceExistWithHash(geoHash)) {
         return true;
       }
     }

lib/views/account/account_page.dart

@@ -140,7 +140,7 @@ class AccountPage extends StatelessWidget {
           ),
         ),
         bottomNavigationBar: pushedFromSpotInfo ? const SizedBox() :  HarmonyBottomNavigationBar(
-            PAGE_ENUM.ACCOUNT_PAGE
+            PageEnum.accountPage
         ),
       ),
     );

lib/views/discover/discover_page.dart

@@ -42,7 +42,7 @@ class DiscoverPageState extends State<DiscoverPage> with FilterSheetCreator impl
         ),
       ),
       bottomNavigationBar: HarmonyBottomNavigationBar(
-        PAGE_ENUM.DISCOVER_PAGE
+        PageEnum.discoverPage
       ),
     );
   }

lib/views/place/near_place.dart

@@ -42,7 +42,7 @@ class _NearbyPageState extends State<NearbyPage> with FilterSheetCreator impleme
         ),
       ),
       bottomNavigationBar: HarmonyBottomNavigationBar(
-        PAGE_ENUM.NEARBY_PAGE,
+        PageEnum.nearbyPage,
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: () {

lib/widgets/general_use/harmony_bottom_navigation_bar.dart

@@ -7,7 +7,7 @@ import 'package:harmony/views/discover/discover_page.dart';
 import 'package:harmony/views/place/near_place.dart';
 
 class HarmonyBottomNavigationBar extends StatelessWidget {
-  final PAGE_ENUM currPage;
+  final PageEnum currPage;
   final Color _activeColor = const Color(0xff00CA9D);
   final Color _inactiveColor = Colors.black54;
 
@@ -27,7 +27,7 @@ class HarmonyBottomNavigationBar extends StatelessWidget {
               IconButton(
                 icon: Icon(
                   FontAwesomeIcons.compass,
-                  color: currPage == PAGE_ENUM.DISCOVER_PAGE ? _activeColor : _inactiveColor,
+                  color: currPage == PageEnum.discoverPage ? _activeColor : _inactiveColor,
 
                 ),
                 onPressed: () =>  Navigator.pushReplacement(
@@ -43,7 +43,7 @@ class HarmonyBottomNavigationBar extends StatelessWidget {
                   icon: Icon(
                     Icons.near_me_outlined,
                     size: 26,
-                    color: currPage == PAGE_ENUM.NEARBY_PAGE ? _activeColor : _inactiveColor,
+                    color: currPage == PageEnum.nearbyPage ? _activeColor : _inactiveColor,
                   ),
                   onPressed: () =>  Navigator.pushReplacement(
 
@@ -58,7 +58,7 @@ class HarmonyBottomNavigationBar extends StatelessWidget {
                 icon: Icon(
                   FontAwesomeIcons.user,
                   size: 22,
-                  color: currPage == PAGE_ENUM.ACCOUNT_PAGE ? _activeColor : _inactiveColor,
+                  color: currPage == PageEnum.accountPage ? _activeColor : _inactiveColor,
                 ),
                 onPressed: () =>  Navigator.pushReplacement(