Merge branch '246-change-orm-get-return-values' into dev

Author: Seluj78

backend/PyMatcha/models/user.py

@@ -85,20 +85,11 @@ def create(
         confirmed_on: datetime.datetime = None,
     ) -> User:
         # Check email availability
-        try:
-            User.get(email=email)
-        except ValueError:
-            pass
-        else:
+        if User.get(email=email):
             logging.warning("Email {} taken".format(email))
             raise ConflictError("Email {} taken.".format(email), "Use another email.")
 
-        # Check username availability
-        try:
-            User.get(username=username)
-        except ValueError:
-            pass
-        else:
+        if User.get(username=username):
             logging.warning("Username {} taken".format(username))
             raise ConflictError("Username {} taken.".format(username), "Try another username.")
 
@@ -153,20 +144,12 @@ def create(
     @staticmethod
     def register(email: str, username: str, password: str, first_name: str, last_name: str) -> User:
         # Check email availability
-        try:
-            User.get(email=email)
-        except ValueError:
-            pass
-        else:
+        if User.get(email=email):
             logging.debug("Email {} taken".format(email))
             raise ConflictError("Email {} taken.".format(email), "Use another email.")
 
         # Check username availability
-        try:
-            User.get(username=username)
-        except ValueError:
-            pass
-        else:
+        if User.get(username=username):
             logging.warning("Username {} taken".format(username))
             raise ConflictError("Username {} taken.".format(username), "Try another username.")
 
@@ -430,26 +413,17 @@ def get_user(uid: Any[int, str]) -> Optional[User]:
     try:
         uid = int(uid)
     except ValueError:
-        try:
-            user = User.get(username=uid)
-        except ValueError:
-            pass
-        else:
+        user = User.get(username=uid)
+        if user:
             logging.debug("Found user {} from {}".format(user.id, uid))
             return user
-        try:
-            user = User.get(email=uid)
-        except ValueError:
-            pass
-        else:
+        user = User.get(email=uid)
+        if user:
             logging.debug("Found user {} from {}".format(user.id, uid))
             return user
     else:
-        try:
-            user = User.get(id=uid)
-        except ValueError:
-            pass
-        else:
+        user = User.get(id=uid)
+        if user:
             logging.debug("Found user {} from {}".format(user.id, uid))
             return user
     # If none of those worked, throw an error

backend/PyMatcha/routes/api/messages.py

@@ -98,20 +98,18 @@ def see_conversation_messages(with_uid):
     except NotFoundError:
         raise NotFoundError(f"With user {with_uid} not found.")
     unseen_messages = Message.get_multis(from_id=with_user.id, to_id=current_user.id, is_seen=False)
-    if unseen_messages:
-        for message in unseen_messages:
-            message.is_seen = True
-            message.seen_timestamp = datetime.datetime.utcnow()
-            message.save()
+    for message in unseen_messages:
+        message.is_seen = True
+        message.seen_timestamp = datetime.datetime.utcnow()
+        message.save()
     return Success("Messages marked as seen.")
 
 
 @messages_bp.route("/messages/like/<message_id>", methods=["POST"])
 @jwt_required
 def like_message(message_id):
-    try:
-        message = Message.get(id=message_id)
-    except ValueError:
+    message = Message.get(id=message_id)
+    if not message:
         raise NotFoundError(f"Message {message_id} not found.")
     if message.from_id == current_user.id:
         raise BadRequestError("Cannot like your own message.")
@@ -127,9 +125,8 @@ def like_message(message_id):
 @messages_bp.route("/messages/unlike/<message_id>", methods=["POST"])
 @jwt_required
 def unlike_message(message_id):
-    try:
-        message = Message.get(id=message_id)
-    except ValueError:
+    message = Message.get(id=message_id)
+    if not message:
         raise NotFoundError(f"Message {message_id} not found.")
     if message.from_id == current_user.id:
         raise BadRequestError("Cannot unlike your own message.")
@@ -146,8 +143,5 @@ def unlike_message(message_id):
 @jwt_required
 def get_new_messages():
     message_list = Message.get_multis(to_id=current_user.id, is_seen=False)
-    if not message_list:
-        new_messages = []
-    else:
-        new_messages = [m.to_dict() for m in message_list]
+    new_messages = [m.to_dict() for m in message_list]
     return SuccessOutput("new_messages", new_messages)

backend/PyMatcha/utils/orm/_model.py

@@ -221,11 +221,11 @@ def get(cls, **kwargs):
         """
         Get a model from the database, using a single keyword argument as a filter.
 
-        Class method allows you to use without instanciation eg.
+        Class method allows you to use without instantiation eg.
 
             model = Model.get(username="test")
 
-        Returns a populated user instance on success and raises an error if the row count was 0
+        Returns a populated user instance on success and returns none if nothing was found
 
         """
 
@@ -259,7 +259,7 @@ def get(cls, **kwargs):
         if data:
             return cls(data)
         else:
-            raise ValueError("Not found.")
+            return None
 
     @classmethod
     def get_multi(cls, **kwargs):
@@ -305,7 +305,7 @@ def get_multi(cls, **kwargs):
         if data:
             return cls(data)
         else:
-            raise ValueError("Not found.")
+            return None
 
     @classmethod
     def get_multis(cls, **kwargs) -> List:
@@ -359,7 +359,7 @@ def get_multis(cls, **kwargs) -> List:
                 ret_list.append(cls(i))
             return ret_list
         else:
-            return None
+            return []
 
     @classmethod
     def select_all(cls):

backend/PyMatcha/utils/tasks.py

@@ -37,13 +37,14 @@ def update_heat_scores():
         reports_received = len(user.get_reports_received())
         views = len(user.get_views())
         matches = len(user.get_matches())
-        try:
-            messages = len(Message.get_multi(to_id=user.id))
-        except ValueError:
+        messages = Message.get_multi(to_id=user.id)
+        if not messages:
             messages = 0
+        else:
+            messages = len(messages)
 
         score = BASE_HEAT_SCORE
-        if user.username == "seluj78" or user.username == "tet":
+        if user.username == "seluj78" or user.username == "lauris":
             score += 100
         score += likes_received * LIKES_MULTIPLIER
         score += superlikes_received * SUPERLIKES_MULTIPLIER
@@ -71,12 +72,8 @@ def update_offline_users():
         date_lastseen = float(redis.get(key))
         # If the user has passed the deadline
         if date_lastseen < login_deadline_timestamp:
-            try:
-                u = User.get(id=user_id)
-            except ValueError:
-                # Edge case where the user has been deleted from DB while he was still online
-                pass
-            else:
+            u = User.get(id=user_id)
+            if u:
                 u.date_lastseen = datetime.datetime.fromtimestamp(date_lastseen)
                 u.is_online = False
                 u.save()
@@ -85,9 +82,8 @@ def update_offline_users():
             redis.delete(key)
             count += 1
         else:
-            try:
-                u = User.get(id=user_id)
-            except ValueError:
+            u = User.get(id=user_id)
+            if not u:
                 # Edge case where the user has been deleted from DB while he was still online
                 redis.delete(key)
             else: