Fixed a get_multi bug with strings

Author: Seluj78

backend/PyMatcha/utils/orm/_model.py

@@ -1,5 +1,6 @@
 import logging
 from copy import deepcopy
+from typing import List
 
 import pymysql
 from PyMatcha import database_config
@@ -254,7 +255,7 @@ def get(cls, **kwargs):
             raise ValueError("Not found.")
 
     @classmethod
-    def get_multi(cls, **kwargs):
+    def get_multi(cls, **kwargs) -> List:
         """
         Get a model from the database, using multiple keyword argument as a filter.
 
@@ -309,7 +310,6 @@ def get_multis(cls, **kwargs):
             model = Model.get(username="test", email="test@example.org")
 
         Returns list of instances on success and raises an error if the row count was 0
-
         """
 
         keys = []
@@ -321,11 +321,16 @@ def get_multis(cls, **kwargs):
         where = ""
         length = len(keys)
         for index, (key, value) in enumerate(zip(keys, values)):
-            if index == length - 1:
-                where = where + f"{key}={value}"
+            if isinstance(value, str):
+                if index == length - 1:
+                    where = where + f"{key}='{value}'"
+                else:
+                    where = where + f"{key}='{value}' and "
             else:
-                where = where + f"{key}={value} and "
-
+                if index == length - 1:
+                    where = where + f"{key}={value}"
+                else:
+                    where = where + f"{key}={value} and "
         temp = cls()
         with temp.db.cursor() as c:
             c.execute(

backend/populate_database.py

@@ -23,7 +23,7 @@ def gen_datetime(min_year: int = 1900, max_year: int = datetime.datetime.now().y
 def populate_users():
     User.drop_table()
     User.create_table()
-    for i in range(0, 500):
+    for i in range(0, 150):
         gender = random.choice(["male", "female", "other"])
 
         orientation = random.choice(["heterosexual", "homosexual", "bisexual", "other"])
@@ -80,7 +80,7 @@ def populate_users():
             with open("tags.json") as handle:
                 json_list = json.load(handle)
             u = get_user(username)
-            tags = random.sample(json_list, 5)
+            tags = list(set(random.sample(json_list, 8)))
 
             for tag in tags:
                 Tag.create(name=tag, user_id=u.id)