Use xyz_factory;create() instead of xyz_factory().

See FactoryBoy/factory_boy#468

PIDD: Pycharm inspection driven development 🤷

tests/data/repositories/test_fitbitrepository.py

@@ -19,50 +19,56 @@ async def test_top_activities(
 ):
     user_factory, _, fitbit_activity_factory = fitbit_factories
     activity_type = 111
-    user: models.User = user_factory()
-    other_user: models.User = user_factory()
+    user: models.User = user_factory.create()
+    other_user: models.User = user_factory.create()
 
     recent_date = datetime.datetime(2024, 1, 2, 23, 44, 55)
     old_date = datetime.datetime(2023, 3, 4, 15, 44, 33)
 
     # Our user, our activity, all-time top record for calories
-    all_time_top_calories_activity: models.FitbitActivity = fitbit_activity_factory(
-        fitbit_user_id=user.fitbit.id,
-        type_id=activity_type,
-        calories=600,
-        total_minutes=18,
-        fat_burn_minutes=17,
-        cardio_minutes=16,
-        peak_minutes=15,
-        updated_at=old_date,
+    all_time_top_calories_activity: models.FitbitActivity = (
+        fitbit_activity_factory.create(
+            fitbit_user_id=user.fitbit.id,
+            type_id=activity_type,
+            calories=600,
+            total_minutes=18,
+            fat_burn_minutes=17,
+            cardio_minutes=16,
+            peak_minutes=15,
+            updated_at=old_date,
+        )
     )
 
     # Our user, our activity, recent top record for calories
-    recent_top_calories_activity: models.FitbitActivity = fitbit_activity_factory(
-        fitbit_user_id=user.fitbit.id,
-        type_id=activity_type,
-        calories=599,
-        total_minutes=18,
-        fat_burn_minutes=17,
-        cardio_minutes=16,
-        peak_minutes=15,
-        updated_at=recent_date,
+    recent_top_calories_activity: models.FitbitActivity = (
+        fitbit_activity_factory.create(
+            fitbit_user_id=user.fitbit.id,
+            type_id=activity_type,
+            calories=599,
+            total_minutes=18,
+            fat_burn_minutes=17,
+            cardio_minutes=16,
+            peak_minutes=15,
+            updated_at=recent_date,
+        )
     )
 
     # Our user, our activity, all-time top record for the different minutes attributes
-    all_time_top_minutes_activity: models.FitbitActivity = fitbit_activity_factory(
-        fitbit_user_id=user.fitbit.id,
-        type_id=activity_type,
-        calories=333,
-        total_minutes=30,
-        fat_burn_minutes=29,
-        cardio_minutes=28,
-        peak_minutes=27,
-        updated_at=old_date,
+    all_time_top_minutes_activity: models.FitbitActivity = (
+        fitbit_activity_factory.create(
+            fitbit_user_id=user.fitbit.id,
+            type_id=activity_type,
+            calories=333,
+            total_minutes=30,
+            fat_burn_minutes=29,
+            cardio_minutes=28,
+            peak_minutes=27,
+            updated_at=old_date,
+        )
     )
 
     # Our user, our activity, recent top record for the different minutes attributes
-    recent_top_minutes_activity: models.FitbitActivity = fitbit_activity_factory(
+    recent_top_minutes_activity: models.FitbitActivity = fitbit_activity_factory.create(
         fitbit_user_id=user.fitbit.id,
         type_id=activity_type,
         calories=333,
@@ -74,7 +80,7 @@ async def test_top_activities(
     )
 
     # Our user, but not top stats
-    fitbit_activity_factory(
+    fitbit_activity_factory.create(
         fitbit_user_id=user.fitbit.id,
         type_id=activity_type,
         calories=400,
@@ -86,7 +92,7 @@ async def test_top_activities(
     )
 
     # Another user with higher stats
-    fitbit_activity_factory(
+    fitbit_activity_factory.create(
         fitbit_user_id=other_user.fitbit.id,
         type_id=activity_type,
         calories=800,
@@ -98,7 +104,7 @@ async def test_top_activities(
     )
 
     # Our user, with higher stats for another activity type
-    fitbit_activity_factory(
+    fitbit_activity_factory.create(
         fitbit_user_id=user.fitbit.id,
         type_id=999,
         calories=900,
@@ -148,7 +154,7 @@ async def test_top_activities_no_history(
 ):
     user_factory, _, _ = fitbit_factories
     activity_type = 111
-    user: models.User = user_factory()
+    user: models.User = user_factory.create()
     recent_date = datetime.datetime(2024, 1, 2, 23, 44, 55)
 
     all_time_top_activity_stats: fitbitrepository.TopActivityStats = (

tests/routes/test_fitbit_oauth.py

@@ -47,8 +47,8 @@ async def test_refresh_token_ok(
     ]
 
     # Given a user
-    user: User = user_factory(fitbit=None)
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None)
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_access_token="some old access token",
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
@@ -157,8 +157,8 @@ async def test_refresh_token_fail(
     ]
 
     # Given a user
-    user: User = user_factory(fitbit=None, slack_alias="jdoe")
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None, slack_alias="jdoe")
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_access_token="some old invalid access token",
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
@@ -242,13 +242,13 @@ async def test_login_success(
 
     # Given a user
     if scenario == LoginScenario.EXISTING_FITBIT_USER:
-        user: User = user_factory(fitbit=None, slack_alias="jdoe")
-        fitbit_user_factory(
+        user: User = user_factory.create(fitbit=None, slack_alias="jdoe")
+        fitbit_user_factory.create(
             user_id=user.id,
             oauth_userid="user123",
         )
     elif scenario == LoginScenario.EXISTING_NOT_FITBIT_USER:
-        user_factory(fitbit=None, slack_alias="jdoe")
+        user_factory.create(fitbit=None, slack_alias="jdoe")
 
     # mock authlib's generation of a URL on fitbit
     async def mock_authorize_redirect(*_args, **_kwags):
@@ -335,8 +335,8 @@ async def test_logged_out(
     activity_type_id = 55001
 
     # Given a user
-    user: User = user_factory(fitbit=None, slack_alias="jdoe")
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None, slack_alias="jdoe")
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_access_token="some invalid access token",
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)

tests/routes/test_fitbit_routes.py

@@ -48,8 +48,8 @@ async def test_sleep_notification(
     user_factory, fitbit_user_factory, _ = fitbit_factories
 
     # Given a user with the given previous sleep data
-    user: User = user_factory(fitbit=None)
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None)
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         **scenario.input_initial_sleep_data,
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
@@ -124,15 +124,15 @@ async def test_activity_notification(
     activity_type_id = 55001
 
     # Given a user with the given previous activity data
-    user: User = user_factory(fitbit=None)
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None)
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
         + datetime.timedelta(days=1),
     )
 
     if scenario.input_initial_activity_data:
-        fitbit_activity_factory(
+        fitbit_activity_factory.create(
             fitbit_user_id=fitbit_user.id,
             type_id=activity_type_id,
             **scenario.input_initial_activity_data,
@@ -212,8 +212,8 @@ async def test_duplicate_activity_notification(
     ]
 
     # Given a user with the given previous activity data
-    user: User = user_factory(fitbit=None)
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None)
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
         + datetime.timedelta(days=1),
@@ -303,8 +303,8 @@ async def test_duplicate_sleep_notification(
     scenario: FitbitSleepScenario = sleep_scenarios["No previous sleep data"]
 
     # Given a user with the given previous sleep data
-    user: User = user_factory(fitbit=None)
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None)
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         **scenario.input_initial_sleep_data,
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)

tests/routes/test_withings_oauth.py

@@ -38,8 +38,8 @@ async def test_refresh_token_ok(
 
     ctx_db.set(mocked_async_session)
     # Given a user
-    user: User = user_factory(withings=None)
-    db_withings_user: DbWithingsUser = withings_user_factory(
+    user: User = user_factory.create(withings=None)
+    db_withings_user: DbWithingsUser = withings_user_factory.create(
         user_id=user.id,
         last_weight=50.2,
         oauth_access_token="some old access token",
@@ -149,8 +149,8 @@ async def test_refresh_token_fail(
 
     ctx_db.set(mocked_async_session)
     # Given a user
-    user: User = user_factory(withings=None, slack_alias="jdoe")
-    db_withings_user: DbWithingsUser = withings_user_factory(
+    user: User = user_factory.create(withings=None, slack_alias="jdoe")
+    db_withings_user: DbWithingsUser = withings_user_factory.create(
         user_id=user.id,
         last_weight=None,
         oauth_access_token="some old invalid access token",
@@ -231,13 +231,13 @@ async def test_login_success(
     ctx_db.set(mocked_async_session)
     # Given a user
     if scenario == LoginScenario.EXISTING_WITHINGS_USER:
-        user: User = user_factory(withings=None, slack_alias="jdoe")
-        withings_user_factory(
+        user: User = user_factory.create(withings=None, slack_alias="jdoe")
+        withings_user_factory.create(
             user_id=user.id,
             oauth_userid="user123",
         )
     elif scenario == LoginScenario.EXISTING_NOT_WITHINGS_USER:
-        user_factory(withings=None, slack_alias="jdoe")
+        user_factory.create(withings=None, slack_alias="jdoe")
 
     # mock authlib's generation of a URL on withings
     async def mock_authorize_redirect(*_args, **_kwargs):
@@ -322,8 +322,8 @@ async def test_logged_out(
 
     ctx_db.set(mocked_async_session)
     # Given a user
-    user: User = user_factory(withings=None, slack_alias="jdoe")
-    db_withings_user: DbWithingsUser = withings_user_factory(
+    user: User = user_factory.create(withings=None, slack_alias="jdoe")
+    db_withings_user: DbWithingsUser = withings_user_factory.create(
         user_id=user.id,
         last_weight=None,
         oauth_access_token="some invalid access token",

tests/routes/test_withings_routes.py

@@ -53,8 +53,8 @@ async def test_weight_notification(
     user_factory, withings_user_factory = withings_factories
 
     # Given a user
-    user: User = user_factory(withings=None)
-    db_withings_user: DbWithingsUser = withings_user_factory(
+    user: User = user_factory.create(withings=None)
+    db_withings_user: DbWithingsUser = withings_user_factory.create(
         user_id=user.id,
         last_weight=scenario.input_initial_weight,
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
@@ -140,8 +140,8 @@ async def test_duplicate_weight_notification(
     user_factory, withings_user_factory = withings_factories
 
     # Given a user
-    user: User = user_factory(withings=None)
-    db_withings_user: DbWithingsUser = withings_user_factory(
+    user: User = user_factory.create(withings=None)
+    db_withings_user: DbWithingsUser = withings_user_factory.create(
         user_id=user.id,
         last_weight=50.2,
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)

tests/tasks/test_fitbit_oauth.py

@@ -45,8 +45,8 @@ async def test_refresh_token_ok(
     ]
 
     # Given a user
-    user: User = user_factory(fitbit=None)
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None)
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_access_token="some old access token",
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
@@ -151,8 +151,8 @@ async def test_refresh_token_fail(
     ]
 
     # Given a user
-    user: User = user_factory(fitbit=None, slack_alias="jdoe")
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None, slack_alias="jdoe")
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_access_token="some old invalid access token",
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
@@ -232,8 +232,8 @@ async def test_logged_out(
     activity_type_id = 55001
 
     # Given a user
-    user: User = user_factory(fitbit=None, slack_alias="jdoe")
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None, slack_alias="jdoe")
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_access_token="some invalid access token",
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)

tests/tasks/test_fitbit_poll.py

@@ -50,8 +50,8 @@ async def test_fitbit_poll_sleep(
     user_factory, fitbit_user_factory, _ = fitbit_factories
 
     # Given a user with the given previous sleep data
-    user: User = user_factory(fitbit=None)
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None)
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         **scenario.input_initial_sleep_data,
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
@@ -122,14 +122,14 @@ async def test_fitbit_poll_activity(
     activity_type_id = 55001
 
     # Given a user with the given previous activity data
-    user: User = user_factory(fitbit=None)
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None)
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
         + datetime.timedelta(days=1),
     )
     if scenario.input_initial_activity_data:
-        fitbit_activity_factory(
+        fitbit_activity_factory.create(
             fitbit_user_id=fitbit_user.id,
             type_id=activity_type_id,
             **scenario.input_initial_activity_data,
@@ -199,8 +199,8 @@ async def test_schedule_fitbit_poll(
 
     user_factory, fitbit_user_factory, _ = fitbit_factories
 
-    user: User = user_factory(fitbit=None)
-    fitbit_user: FitbitUser = fitbit_user_factory(
+    user: User = user_factory.create(fitbit=None)
+    fitbit_user: FitbitUser = fitbit_user_factory.create(
         user_id=user.id,
         oauth_expiration_date=datetime.datetime.now(datetime.timezone.utc)
         + datetime.timedelta(days=1),