added additional user attributes, fixed postman collection and energy…

… endpoint

backend/models/energy.py

@@ -9,6 +9,7 @@
 from bson import ObjectId
 from bson import json_util
 
+
 class EnergyEntry(DB_MODEL):
     oid: ObjectId
     user_id: ObjectId
@@ -66,7 +67,7 @@ def calculate_carbon_emissions(self) -> float:
         heating_oil_carbon_emissions = self.heating_oil * 2.753
         natural_gas_carbon_emissions = self.natural_gas * 1.96
 
-        if self.province == "British Colombia":
+        if self.province == "British Columbia":
             electricity_carbon_emissions = (self.electricity * 0.015)/self.household
         elif self.province == "Alberta":
             electricity_carbon_emissions = (self.electricity * 0.54)/self.household

backend/models/user.py

@@ -18,8 +18,9 @@ class User(DB_MODEL):
     score: int
     province: str
     household: int
+    fuel_efficiency: float
 
-    def __init__(self, oid: ObjectId, full_name: str, email: str, badges: list[str], friends: list[str], score:int, province:str, household:int) -> None:
+    def __init__(self, oid: ObjectId, full_name: str, email: str, badges: list[str], friends: list[str], score:int, province:str, household:int, fuel_efficiency: float) -> None:
         super().__init__(oid)
         self.full_name = str(full_name)
         self.email = str(email)
@@ -28,6 +29,7 @@ def __init__(self, oid: ObjectId, full_name: str, email: str, badges: list[str],
         self.score = score
         self.province = province
         self.household = household
+        self.fuel_efficiency = fuel_efficiency
 
     def to_json(self, for_mongodb: bool = False) -> json:
         res = {
@@ -38,7 +40,8 @@ def to_json(self, for_mongodb: bool = False) -> json:
             'friends': self.friends,
             'score': self.score,
             'province': self.province,
-            'household': self.household
+            'household': self.household,
+            'fuel_efficiency': self.fuel_efficiency
         }
         if for_mongodb:
             return res
@@ -54,8 +57,10 @@ def from_json(doc: json) -> User:
             friends=doc["friends"],
             score=doc["score"],
             province=doc["province"],
-            household=doc["household"]
+            household=doc["household"],
+            fuel_efficiency=doc["fuel_efficiency"]
         )
+
 
     def __repr__(self) -> str:
         return f'User ID: {self.oid.__str__()}'