better test for updating user data

Author: Hagellach37

mapswipe_workers/tests/integration/tear_down.py

@@ -63,11 +63,11 @@ def delete_test_user(user_ids: List) -> None:
         ref = fb_db.reference(f"v2/users/{user_id}")
         ref.delete()
 
-        pg_db = auth.postgresDB()
-        sql_query = "DELETE FROM users WHERE user_id = %s"
-        pg_db.query(sql_query, [user_id])
-        sql_query = "DELETE FROM users_temp WHERE user_id = %s"
-        pg_db.query(sql_query, [user_id])
+    pg_db = auth.postgresDB()
+    sql_query = "DELETE FROM users WHERE user_id = ANY( %(user_ids)s );"
+    pg_db.query(sql_query, {"user_ids": user_ids})
+    sql_query = "DELETE FROM users_temp WHERE user_id = ANY( %(user_ids)s );"
+    pg_db.query(sql_query, {"user_ids": user_ids})
 
 
 if __name__ == "__main__":

mapswipe_workers/tests/integration/test_update_user_data.py

@@ -1,4 +1,5 @@
 import unittest
+import uuid
 
 import set_up
 import tear_down
@@ -9,8 +10,14 @@
 
 class TestUpdateUserData(unittest.TestCase):
     def setUp(self):
-        self.user_id = set_up.create_test_user("tile_map_service_grid")
-        self.user_ids = [self.user_id]
+        self.user_ids = []
+        self.num_users = 15
+        for i in range(0, self.num_users):
+            user_id = f"test_user_{uuid.uuid4()}"
+            set_up.create_test_user(
+                project_type="tile_map_service_grid", user_id=user_id
+            )
+            self.user_ids.append(user_id)
 
     def tearDown(self):
         tear_down.delete_test_user(self.user_ids)
@@ -19,9 +26,9 @@ def test_no_users_in_postgres(self):
         """Test update users when no users are in postgres yet."""
         update_data.update_user_data()
         pg_db = auth.postgresDB()
-        sql_query = "SELECT * FROM users WHERE user_id = '{0}'".format(self.user_id)
-        result = pg_db.retr_query(sql_query)
-        self.assertIsNotNone(result)
+        sql_query = "SELECT * FROM users WHERE user_id = ANY( %(user_ids)s )"
+        result = pg_db.retr_query(sql_query, {"user_ids": self.user_ids})
+        self.assertEqual(len(result), self.num_users)
 
     def test_last_updated_users(self):
         """Test update users when some users are in postgres."""
@@ -31,16 +38,16 @@ def test_last_updated_users(self):
         update_data.update_user_data()
 
         pg_db = auth.postgresDB()
-        sql_query = "SELECT * FROM users WHERE user_id = '{0}'".format(user_id)
-        result = pg_db.retr_query(sql_query)
+        sql_query = "SELECT * FROM users WHERE user_id = %(user_id)s"
+        result = pg_db.retr_query(sql_query, {"user_id": user_id})
         self.assertIsNotNone(result)
 
     def test_with_user_ids(self):
-        update_data.update_user_data([self.user_id])
+        update_data.update_user_data(self.user_ids)
         pg_db = auth.postgresDB()
-        sql_query = "SELECT * FROM users WHERE user_id = '{0}'".format(self.user_id)
-        result = pg_db.retr_query(sql_query)
-        self.assertIsNotNone(result)
+        sql_query = "SELECT * FROM users WHERE user_id = ANY ( %(user_ids)s )"
+        result = pg_db.retr_query(sql_query, {"user_ids": self.user_ids})
+        self.assertEqual(len(result), self.num_users)
 
 
 if __name__ == "__main__":