Merge pull request #281 from Seluj78/275-cast-db

Fixed cast warnings

Author: Seluj78

backend/PyMatcha/__init__.py

@@ -114,6 +114,7 @@
 logging.debug("Configuring JWT")
 
 ACCESS_TOKEN_EXPIRES = datetime.timedelta(minutes=15)
+
 REFRESH_TOKEN_EXPIRES = datetime.timedelta(days=30)
 application.config["JWT_ACCESS_TOKEN_EXPIRES"] = ACCESS_TOKEN_EXPIRES
 application.config["JWT_REFRESH_TOKEN_EXPIRES"] = REFRESH_TOKEN_EXPIRES

backend/PyMatcha/models/user.py

@@ -486,34 +486,37 @@ def get_messages_with_user(self, with_user_id) -> List[Message]:
 
 
 def get_user(uid: Any[int, str]) -> Optional[User]:
-    not_found = 0
     # These initializations are to make PEP happy and silence warnings
-    f_user = None
+    f_user = None  # noqa
 
     if isinstance(uid, str):
         uid = uid.lower()
 
     try:
-        user = User.get(id=uid)
+        uid = int(uid)
     except ValueError:
-        not_found += 1
-    else:
-        f_user = user
-    try:
-        user = User.get(username=uid)
-    except ValueError:
-        not_found += 1
-    else:
-        f_user = user
-    try:
-        user = User.get(email=uid)
-    except ValueError:
-        not_found += 1
+        try:
+            user = User.get(username=uid)
+        except ValueError:
+            pass
+        else:
+            logging.debug("Found user {} from {}".format(user.id, uid))
+            return user
+        try:
+            user = User.get(email=uid)
+        except ValueError:
+            pass
+        else:
+            logging.debug("Found user {} from {}".format(user.id, uid))
+            return user
     else:
-        f_user = user
+        try:
+            user = User.get(id=uid)
+        except ValueError:
+            pass
+        else:
+            logging.debug("Found user {} from {}".format(user.id, uid))
+            return user
     # If none of those worked, throw an error
-    if not_found == 3:
-        logging.debug("User {} not found.".format(uid))
-        raise NotFoundError("User {} not found.".format(uid))
-    logging.debug("Found user {} from {}".format(f_user.id, uid))
-    return f_user
+    logging.debug("User {} not found.".format(uid))
+    raise NotFoundError("User {} not found.".format(uid))

backend/PyMatcha/utils/orm/_model.py

@@ -233,20 +233,26 @@ def get(cls, **kwargs):
             return False
         key = next(iter(kwargs))
         val = kwargs[key]
-
+        if isinstance(val, str):
+            typ = "CHAR"
+        else:
+            typ = None
         temp = cls()
+        fields = ", ".join(temp.fields.keys())
         with temp.db.cursor() as c:
-            c.execute(
+            if typ:
+                query = f"""
+                    SELECT {fields}
+                    FROM {cls.table_name}
+                    WHERE {key}=CAST('{val}' AS {typ} CHARACTER SET utf8mb4);
                 """
-                SELECT 
-                    {fields}
-                FROM 
-                    {table} 
-                WHERE   {cond}=%s""".format(
-                    fields=", ".join(temp.fields.keys()), table=cls.table_name, cond=key
-                ),
-                (val,),
-            )
+            else:
+                query = f"""
+                    SELECT {fields}
+                    FROM {cls.table_name}
+                    WHERE {key}={val};
+                """
+            c.execute(query)
 
             data = c.fetchone()
             c.close()