update tests for n_events

jrycw · Feb 27, 2024 · f71c307 · f71c307
1 parent 04a5039
commit f71c307
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -8,7 +8,7 @@
 
 from app.main import make_app
 
-from .factories import TestEventData, TestUserData
+from .factories import TestEventData, TestUserData, TestUserDataWithnEvents
 from .lifespan import t_lifespan
 
 
@@ -32,6 +32,11 @@ def gen_user():
     return lambda: TestUserData()
 
 
+@pytest.fixture
+def gen_user_with_n_event():
+    return lambda: TestUserDataWithnEvents()
+
+
 @pytest.fixture
 def gen_event():
     return lambda: TestEventData()

diff --git a/tests/factories.py b/tests/factories.py
@@ -22,6 +22,10 @@ class TestUserData(TestAuditable):
     name: str = Field(default_factory=faker.name)
 
 
+class TestUserDataWithnEvents(TestUserData):
+    n_events: int = 0
+
+
 class TestEventData(TestAuditable):
     name: str = Field(default_factory=lambda: faker.text(max_nb_chars=20))
     address: str = Field(default_factory=faker.street_address)

diff --git a/tests/test_users.py b/tests/test_users.py
@@ -17,11 +17,11 @@
 ################################
 # Good cases
 ################################
-def test_get_user(gen_user, test_db_client, test_client, users_url):
-    user = gen_user()
+def test_get_user(gen_user_with_n_event, test_db_client, test_client, users_url):
+    user = gen_user_with_n_event()
 
     test_db_client.query_single.return_value = get_user_by_name_qry.GetUserByNameResult(
-        **user.model_dump(), n_events=0
+        **user.model_dump()
     )
     t_lifespan.registry.register_value(AsyncIOClient, test_db_client)
 
@@ -34,15 +34,15 @@ def test_get_user(gen_user, test_db_client, test_client, users_url):
     assert resp_json["created_at"] == user.created_at.isoformat()
 
 
-def test_get_users(gen_user, test_db_client, test_client, users_url):
-    user1, user2 = gen_user(), gen_user()
+def test_get_users(gen_user_with_n_event, test_db_client, test_client, users_url):
+    user1, user2 = gen_user_with_n_event(), gen_user_with_n_event()
 
     test_db_client.query.return_value = [
         get_users_qry.GetUsersResult(
-            **user1.model_dump(include={"id", "name", "created_at"}), n_events=0
+            **user1.model_dump(include={"id", "name", "created_at", "n_events"})
         ),
         get_users_qry.GetUsersResult(
-            **user2.model_dump(include={"id", "name", "created_at"}), n_events=0
+            **user2.model_dump(include={"id", "name", "created_at", "n_events"})
         ),
     ]
     t_lifespan.registry.register_value(AsyncIOClient, test_db_client)