refactor: use User.get instead of User.get_from_login when this is pertinent

canaille/core/endpoints/account.py

@@ -257,7 +257,7 @@ def registration(data=None, hash=None):
             )
             return redirect(url_for("core.account.index"))
 
-        if payload.user_name and models.User.get_from_login(payload.user_name):
+        if payload.user_name and models.User.get(user_name=payload.user_name):
             flash(
                 _("Your account has already been created."),
                 "error",

tests/core/test_account.py

@@ -323,7 +323,7 @@ def test_admin_self_deletion(testclient, backend):
         .follow(status=200)
     )
 
-    assert models.User.get_from_login("temp") is None
+    assert models.User.get(user_name="temp") is None
 
     with testclient.session_transaction() as sess:
         assert not sess.get("user_id")
@@ -361,7 +361,7 @@ def test_user_self_deletion(testclient, backend):
         .follow(status=200)
     )
 
-    assert models.User.get_from_login("temp") is None
+    assert models.User.get(user_name="temp") is None
 
     with testclient.session_transaction() as sess:
         assert not sess.get("user_id")

tests/core/test_invitation.py

@@ -7,7 +7,7 @@ from canaille.core.endpoints.account import RegistrationPayload
 
 
 def test_invitation(testclient, logged_admin, foo_group, smtpd):
-    assert models.User.get_from_login("someone") is None
+    assert models.User.get(user_name="someone") is None
 
     res = testclient.get("/invite", status=200)
 
@@ -46,7 +46,7 @@ def test_invitation(testclient, logged_admin, foo_group, smtpd):
     assert ("success", "Your account has been created successfully.") in res.flashes
     res = res.follow(status=200)
 
-    user = models.User.get_from_login("someone")
+    user = models.User.get(user_name="someone")
     foo_group.reload()
     assert user.check_password("whatever")[0]
     assert user.groups == [foo_group]
@@ -60,8 +60,8 @@ def test_invitation(testclient, logged_admin, foo_group, smtpd):
 
 
 def test_invitation_editable_user_name(testclient, logged_admin, foo_group, smtpd):
-    assert models.User.get_from_login("jackyjack") is None
-    assert models.User.get_from_login("djorje") is None
+    assert models.User.get(user_name="jackyjack") is None
+    assert models.User.get(user_name="djorje") is None
 
     res = testclient.get("/invite", status=200)
 
@@ -100,7 +100,7 @@ def test_invitation_editable_user_name(testclient, logged_admin, foo_group, smtp
     assert ("success", "Your account has been created successfully.") in res.flashes
     res = res.follow(status=200)
 
-    user = models.User.get_from_login("djorje")
+    user = models.User.get(user_name="djorje")
     foo_group.reload()
     assert user.check_password("whatever")[0]
     assert user.groups == [foo_group]
@@ -112,7 +112,7 @@ def test_invitation_editable_user_name(testclient, logged_admin, foo_group, smtp
 
 
 def test_generate_link(testclient, logged_admin, foo_group, smtpd):
-    assert models.User.get_from_login("sometwo") is None
+    assert models.User.get(user_name="sometwo") is None
 
     res = testclient.get("/invite", status=200)
 
@@ -147,7 +147,7 @@ def test_generate_link(testclient, logged_admin, foo_group, smtpd):
     res = res.form.submit(status=302)
     res = res.follow(status=200)
 
-    user = models.User.get_from_login("sometwo")
+    user = models.User.get(user_name="sometwo")
     foo_group.reload()
     assert user.check_password("whatever")[0]
     assert user.groups == [foo_group]
@@ -262,7 +262,7 @@ def test_registration_no_password(testclient, foo_group):
     res = res.form.submit(status=200)
     res.mustcontain("This field is required.")
 
-    assert not models.User.get_from_login("someoneelse")
+    assert not models.User.get(user_name="someoneelse")
 
     with testclient.session_transaction() as sess:
         assert "user_id" not in sess
@@ -329,7 +329,7 @@ def test_groups_are_saved_even_when_user_does_not_have_read_permission(
     res = res.form.submit(status=302)
     res = res.follow(status=200)
 
-    user = models.User.get_from_login("someoneelse")
+    user = models.User.get(user_name="someoneelse")
     foo_group.reload()
     assert user.groups == [foo_group]
     user.delete()

tests/core/test_profile_creation.py

@@ -6,7 +6,7 @@ def test_user_creation_edition_and_deletion(
 ):
     # The user does not exist.
     res = testclient.get("/users", status=200)
-    assert models.User.get_from_login("george") is None
+    assert models.User.get(user_name="george") is None
     res.mustcontain(no="george")
 
     # Fill the profile for a new user.
@@ -24,7 +24,7 @@ def test_user_creation_edition_and_deletion(
     res = res.form.submit(name="action", value="create-profile", status=302)
     assert ("success", "User account creation succeed.") in res.flashes
     res = res.follow(status=200)
-    george = models.User.get_from_login("george")
+    george = models.User.get(user_name="george")
     foo_group.reload()
     assert "George" == george.given_name
     assert george.groups == [foo_group]
@@ -45,7 +45,7 @@ def test_user_creation_edition_and_deletion(
     res.form["groups"] = [foo_group.id, bar_group.id]
     res = res.form.submit(name="action", value="edit-settings").follow()
 
-    george = models.User.get_from_login("george")
+    george = models.User.get(user_name="george")
     assert "Georgio" == george.given_name
     assert george.check_password("totoyolo")[0]
 
@@ -62,7 +62,7 @@ def test_user_creation_edition_and_deletion(
     res = res.form.submit(name="action", value="confirm-delete", status=200)
     res = res.form.submit(name="action", value="delete", status=302)
     res = res.follow(status=200)
-    assert models.User.get_from_login("george") is None
+    assert models.User.get(user_name="george") is None
     res.mustcontain(no="george")
 
 
@@ -91,7 +91,7 @@ def test_user_creation_without_password(testclient, logged_moderator):
     res = res.form.submit(name="action", value="create-profile", status=302)
     assert ("success", "User account creation succeed.") in res.flashes
     res = res.follow(status=200)
-    george = models.User.get_from_login("george")
+    george = models.User.get(user_name="george")
     assert george.user_name == "george"
     assert not george.has_password()
 
@@ -102,13 +102,13 @@ def test_user_creation_form_validation_failed(
     testclient, logged_moderator, foo_group, bar_group
 ):
     res = testclient.get("/users", status=200)
-    assert models.User.get_from_login("george") is None
+    assert models.User.get(user_name="george") is None
     res.mustcontain(no="george")
 
     res = testclient.get("/profile", status=200)
     res = res.form.submit(name="action", value="create-profile")
     assert ("error", "User account creation failed.") in res.flashes
-    assert models.User.get_from_login("george") is None
+    assert models.User.get(user_name="george") is None
 
 
 def test_username_already_taken(
@@ -144,7 +144,7 @@ def test_cn_setting_with_given_name_and_surname(testclient, logged_moderator):
         status=200
     )
 
-    george = models.User.get_from_login("george")
+    george = models.User.get(user_name="george")
     assert george.formatted_name == "George Abitbol"
     george.delete()
 
@@ -159,7 +159,7 @@ def test_cn_setting_with_surname_only(testclient, logged_moderator):
         status=200
     )
 
-    george = models.User.get_from_login("george")
+    george = models.User.get(user_name="george")
     assert george.formatted_name == "Abitbol"
     george.delete()
 

tests/core/test_profile_photo.py

@@ -106,7 +106,7 @@ def test_photo_on_profile_edition(
 
 def test_photo_on_profile_creation(testclient, jpeg_photo, logged_admin):
     res = testclient.get("/users", status=200)
-    assert models.User.get_from_login("foobar") is None
+    assert models.User.get(user_name="foobar") is None
     res.mustcontain(no="foobar")
 
     res = testclient.get("/profile", status=200)
@@ -119,14 +119,14 @@ def test_photo_on_profile_creation(testclient, jpeg_photo, logged_admin):
         status=200
     )
 
-    user = models.User.get_from_login("foobar")
+    user = models.User.get(user_name="foobar")
     assert user.photo == jpeg_photo
     user.delete()
 
 
 def test_photo_deleted_on_profile_creation(testclient, jpeg_photo, logged_admin):
     res = testclient.get("/users", status=200)
-    assert models.User.get_from_login("foobar") is None
+    assert models.User.get(user_name="foobar") is None
     res.mustcontain(no="foobar")
 
     res = testclient.get("/profile", status=200)
@@ -140,6 +140,6 @@ def test_photo_deleted_on_profile_creation(testclient, jpeg_photo, logged_admin)
         status=200
     )
 
-    user = models.User.get_from_login("foobar")
+    user = models.User.get(user_name="foobar")
     assert user.photo is None
     user.delete()