Skip to content

Commit

Permalink
GH-4: Rename get user by email repository method
Browse files Browse the repository at this point in the history
  • Loading branch information
markhobson committed Oct 17, 2023
1 parent 3ed5613 commit 8feded0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion schemes/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def decorated_function(*args: P.args, **kwargs: P.kwargs) -> T | Response:


def _is_authorized(users: UserRepository, user: UserInfo) -> bool:
return users.get(user["email"]) is not None
return users.get_by_email(user["email"]) is not None


def _get_oauth() -> OAuth:
Expand Down
4 changes: 2 additions & 2 deletions schemes/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def add(self, user: User) -> None:
def clear(self) -> None:
raise NotImplementedError()

def get(self, email: str) -> User | None:
def get_by_email(self, email: str) -> User | None:
raise NotImplementedError()

def get_all(self) -> List[User]:
Expand All @@ -41,7 +41,7 @@ def clear(self) -> None:
with self._engine.begin() as connection:
connection.execute(text("DELETE FROM users"))

def get(self, email: str) -> User | None:
def get_by_email(self, email: str) -> User | None:
with self._engine.connect() as connection:
result = connection.execute(text("SELECT email FROM users WHERE email = :email"), {"email": email})
row = result.one_or_none()
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/fakes.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def add(self, user: User) -> None:
def clear(self) -> None:
self._users.clear()

def get(self, email: str) -> User | None:
def get_by_email(self, email: str) -> User | None:
def by_email(user: User) -> TypeGuard[User]:
return user.email == email

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def test_add_user(users: UserRepository, client: FlaskClient) -> None:
response = client.post("/api/users", json={"email": "boardman@example.com"})

assert response.status_code == 201
assert users.get("boardman@example.com")
assert users.get_by_email("boardman@example.com")


def test_clear_users(users: UserRepository, client: FlaskClient) -> None:
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/test_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ def users_fixture() -> DatabaseUserRepository:
def test_add_user(users: DatabaseUserRepository) -> None:
users.add(User("boardman@example.com"))

assert users.get("boardman@example.com") == User("boardman@example.com")
assert users.get_by_email("boardman@example.com") == User("boardman@example.com")


def test_get_user(users: DatabaseUserRepository) -> None:
def test_get_user_by_email(users: DatabaseUserRepository) -> None:
users.add(User("boardman@example.com"))

assert users.get("boardman@example.com") == User("boardman@example.com")
assert users.get_by_email("boardman@example.com") == User("boardman@example.com")


def test_get_user_who_does_not_exist(users: DatabaseUserRepository) -> None:
def test_get_user_by_email_who_does_not_exist(users: DatabaseUserRepository) -> None:
users.add(User("boardman@example.com"))

assert users.get("obree@example.com") is None
assert users.get_by_email("obree@example.com") is None


def test_get_all_users(users: DatabaseUserRepository) -> None:
Expand Down

0 comments on commit 8feded0

Please sign in to comment.