fixed linting errors in userpage

src/backend/pages/userpage.py

@@ -9,13 +9,11 @@
 class UserPage:
     """UserPage class"""
 
-    def __init__(self, username: str, user:User) -> None:
+    def __init__(self, username: str) -> None:
         """Constructor"""
         self.username = username
-        self.user = self.get_user(self, username)
-
+        self.user = self.get_user(username)
 
-<<<<<<< HEAD
     @use_database
     def get_user(self, username: str):
         """Return User object based on username"""
@@ -26,16 +24,10 @@ def get_user(self, username: str):
             WHERE u.username = ?",
             (query_sql,),
         ).fetchone()
-
-        if user_query is None:  return None
-        else:
-            user_id, password, email, phone = user_query
-            return User(user_id, username, password, email, phone)
-=======
-    def get_user(self):
-        """Return User object based on self.username"""
-        return True
->>>>>>> 54a7f6a760774b09fd9933a99f61c01ee41785c4
+        if user_query is None:
+            return None
+        user_id, password, email, phone = user_query
+        return User(user_id, username, password, email, phone)
 
     @use_database
     def update_password(self, password: str) -> bool:
@@ -50,28 +42,21 @@ def update_password(self, password: str) -> bool:
             WHERE user_id = ?",
             (password, query_sql),
         )
-
         return True
-        
+
     @use_database
     def update_email(self, email: str) -> bool:
-<<<<<<< HEAD
         """Updates email based on username"""
         if self.user.email == email:
             return True
-=======
-        """Updates email based on self.username"""
-        return True
->>>>>>> 54a7f6a760774b09fd9933a99f61c01ee41785c4
 
         query_sql = "%" + email + "%"
         self.update_email.cursor.execute(
             "UPDATE Users \
             SET email = ? \
             WHERE username = ?",
-            (query_sql,self.username),
+            (query_sql, self.username),
         )
-
         new_email = self.update_email.cursor.execute(
             "SELECT email \
             From User \
@@ -96,8 +81,16 @@ def get_liked(self, user_id: int) -> List[Apt]:
 
         for apt in liked:
             apt_id, apt_name, apt_address, price_min, price_max = apt
-            apts.append(Apt(apt_id, apt_name, apt_address, price_min, price_max))
-
+            query_sql = "%" + apt_id + "%"
+            rating = self.get_liked.cursor.execute(
+                "SELECT AVG(r.vote) \
+                From Reviews r \
+                WHERE r.apt_id = ?",
+                (query_sql),
+            )
+            apts.append(
+                Apt(apt_id, apt_name, rating, apt_address, price_min, price_max)
+            )
         return apts
 
     @use_database