Move get_user_by_username into repositories

lib/galaxy/managers/users.py

@@ -20,7 +20,6 @@
     and_,
     exc,
     func,
-    select,
     true,
 )
 from sqlalchemy.orm.exc import NoResultFound
@@ -838,15 +837,3 @@ def _add_parsers(self):
         )
 
         self.fn_filter_parsers.update({})
-
-
-def get_user_by_username(session, user_class, username):
-    """
-    Get a user from the database by username.
-    (We pass the session and the user_class to accommodate usage from the tool_shed app.)
-    """
-    try:
-        stmt = select(user_class).filter(user_class.username == username)
-        return session.execute(stmt).scalar_one()
-    except Exception:
-        return None

lib/galaxy/model/repositories/user.py

@@ -11,6 +11,7 @@ class UserRepository(BaseRepository):
     def __init__(self, session: SessionType):
         super().__init__(session, User)
 
+
 def get_user_by_username(session: SessionType, user_class, username: str):
     """Get a user from the database by username."""
     # This may be called from the tool_shed app, which has a different

lib/tool_shed/webapp/controllers/repository.py

@@ -24,8 +24,8 @@
     util,
     web,
 )
-from galaxy.managers.users import get_user_by_username
 from galaxy.model.base import transaction
+from galaxy.model.repositories.user import get_user_by_username
 from galaxy.tool_shed.util import dependency_display
 from galaxy.tools.repositories import ValidationContext
 from galaxy.web.form_builder import (