fixed references to user id

utmgdsc · Dec 15, 2023 · c1d9a5c · c1d9a5c
1 parent 26f6ef8
commit c1d9a5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/backend/routes/energy.py b/backend/routes/energy.py
@@ -55,10 +55,10 @@ def get_energy_entries_for_user_using_date_range() -> Response:
 def get_energy_metric_for_today(user_id: str) -> Response:
     try:
         user = FirebaseAPI.get_user(flask.request.headers.get('Authorization').split()[1])
-        query = {"user_id": ObjectId(user.id), "date": weekly_metric_reset(datetime.now())}
+        query = {"user_id": ObjectId(user.oid), "date": weekly_metric_reset(datetime.now())}
         item = CarbonTrackDB.energy_coll.find_one(query)
         if item is None:
-            create_energy(ObjectId(user.id))
+            create_energy(ObjectId(user.oid))
             return get_energy_metric_for_today(user_id)
         else:
             item = EnergyEntry.from_json(item).to_json()
@@ -102,10 +102,10 @@ def update_energy(oid: str) -> Response:
 def get_energy_recommendation_for_today() -> Response:
     try:
         user = FirebaseAPI.get_user(flask.request.headers.get('Authorization').split()[1])
-        query = {"user_id": ObjectId(user.id), "date": weekly_metric_reset(datetime.now())}
+        query = {"user_id": ObjectId(user.oid), "date": weekly_metric_reset(datetime.now())}
         item = CarbonTrackDB.energy_coll.find_one(query)
         if item is None:
-            create_energy(ObjectId(user.id))
+            create_energy(ObjectId(user.oid))
             return get_energy_metric_for_today()
         else:
             item = EnergyEntry.from_json(item)

diff --git a/backend/routes/transportation.py b/backend/routes/transportation.py
@@ -54,11 +54,11 @@ def get_transportation_entries_for_user_using_date_range() -> Response:
 def get_transportation_metric_for_today() -> Response:
     try:
         user = FirebaseAPI.get_user(flask.request.headers.get('Authorization').split()[1])
-        query = {"user_id": ObjectId(user.id), "date": weekly_metric_reset(datetime.now())}
+        query = {"user_id": ObjectId(user.oid), "date": weekly_metric_reset(datetime.now())}
         item = CarbonTrackDB.transportation_coll.find_one(query)
         if item is None:
-            create_transportation(ObjectId(user.id))
-            return get_transportation_metric_for_today(user.id)
+            create_transportation(ObjectId(user.oid))
+            return get_transportation_metric_for_today(user.oid)
         else:
             item = TransportationEntry.from_json(item).to_json()
             return jsonify({'transportation': item})
@@ -102,10 +102,10 @@ def update_transportation(oid: str) -> Response:
 def get_transportation_recommendation_for_today() -> Response:
     try:
         user = FirebaseAPI.get_user(flask.request.headers.get('Authorization').split()[1])
-        query = {"user_id": ObjectId(user.id), "date": weekly_metric_reset(datetime.now())}
+        query = {"user_id": ObjectId(user.oid), "date": weekly_metric_reset(datetime.now())}
         item = CarbonTrackDB.transportation_coll.find_one(query)
         if item is None:
-            create_transportation(ObjectId(user.id))
+            create_transportation(ObjectId(user.oid))
             return get_transportation_recommendation_for_today()
         else:
             item = TransportationEntry.from_json(item)