Skip to content

Commit 6c2f504

Browse files
committed
ref: make it better, faster, stronger
1 parent 2b9eb3f commit 6c2f504

File tree

22 files changed

+42
-81
lines changed

22 files changed

+42
-81
lines changed

.env.template

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/app_name_snake_case/application/ports/map.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ async def __call__(
1919
/,
2020
) -> None:
2121
"""
22-
:raises iam.application.ports.map.NotUniqueUserNameError:
23-
"""
22+
:raises app_name_snake_case.application.ports.map.NotUniqueUserNameError:
23+
""" # noqa: E501

src/app_name_snake_case/application/ports/user_id_signing.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
from uuid import UUID
33

44

5-
class UserIDSigning[SignedIDDataT](ABC):
5+
class UserIDSigning[SignedUserIDT](ABC):
66
@abstractmethod
7-
async def signed_user_id_when(self, *, user_id: UUID) -> SignedIDDataT:
7+
async def signed_user_id(self, user_id: UUID, /) -> SignedUserIDT:
88
...
99

1010
@abstractmethod
11-
async def user_id_when(
12-
self, *, signed_user_id: SignedIDDataT
11+
async def user_id(
12+
self, signed_user_id: SignedUserIDT, /
1313
) -> UUID | None: ...

src/app_name_snake_case/application/register_user.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from app_name_snake_case.application.ports.user_views import UserViews
1414
from app_name_snake_case.application.ports.users import Users
1515
from app_name_snake_case.entities.core.user import (
16-
registered_user_when,
16+
registered_user,
1717
)
1818

1919

@@ -46,24 +46,22 @@ async def __call__(
4646
""" # noqa: E501
4747

4848
if signed_user_id is not None:
49-
user_id = await self.user_id_signing.user_id_when(
50-
signed_user_id=signed_user_id
51-
)
49+
user_id = await self.user_id_signing.user_id(signed_user_id)
5250

5351
if user_id is not None:
5452
raise RegisteredUserToRegisterUserError
5553

56-
registered_user = registered_user_when(user_name=user_name)
54+
registered_user_ = registered_user(user_name=user_name)
5755

5856
async with self.transaction:
5957
try:
60-
await self.map(registered_user)
58+
await self.map(registered_user_)
6159
except NotUniqueUserNameError as error:
6260
raise TakenUserNameToRegisterUserError from error
6361

64-
view = await self.user_views.view_of_user(just(registered_user))
62+
view = await self.user_views.view_of_user(just(registered_user_))
6563

66-
signed_user_id = await self.user_id_signing.signed_user_id_when(
67-
user_id=just(registered_user).id
64+
signed_user_id = await self.user_id_signing.signed_user_id(
65+
just(registered_user_).id
6866
)
6967
return Output(signed_user_id=signed_user_id, user_view=view)

src/app_name_snake_case/application/view_user.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ async def __call__(
1717
if signed_user_id is None:
1818
user_id = None
1919
else:
20-
user_id = await self.user_id_signing.user_id_when(
21-
signed_user_id=signed_user_id
22-
)
20+
user_id = await self.user_id_signing.user_id(signed_user_id)
2321

2422
async with self.transaction:
2523
return await self.user_views.view_of_user_with_id(user_id)

src/app_name_snake_case/entities/core/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ class User(IdentifiedValue[UUID]):
99
name: str
1010

1111

12-
def registered_user_when(*, user_name: str) -> New[User]:
12+
def registered_user(user_name: str) -> New[User]:
1313
return new(User(id=uuid4(), name=user_name))

src/app_name_snake_case/entities/time/time.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class NotUTCTimeError(Exception): ...
1010
@dataclass(kw_only=True, frozen=True)
1111
class Time:
1212
"""
13-
:raises iam.entities.time.time.NotUTCTimeError:
13+
:raises app_name_snake_case.entities.time.time.NotUTCTimeError:
1414
"""
1515

1616
datetime: datetime_cls

src/app_name_snake_case/infrastructure/__init__.py

100755100644
File mode changed.

src/app_name_snake_case/infrastructure/adapters/transaction.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44

55
from sqlalchemy.ext.asyncio import AsyncSession
66

7-
from app_name_snake_case.infrastructure.app_name_snake_case.in_memory_storage import ( # noqa: E501
7+
from app_name_snake_case.infrastructure.in_memory_storage import (
88
TransactionalInMemoryStorage,
99
)
1010

1111

1212
@asynccontextmanager
13-
async def in_postgres_transaction_when(
14-
*, session: AsyncSession
15-
) -> AsyncIterator[None]:
13+
async def in_postgres_transaction(session: AsyncSession) -> AsyncIterator[None]:
1614
async with session.begin():
1715
yield
1816

1917

2018
@asynccontextmanager
21-
async def in_memory_transaction_for(
19+
async def in_memory_transaction(
2220
storages: Sequence[TransactionalInMemoryStorage[Any]]
2321
) -> AsyncIterator[None]:
2422
for storage in storages:

src/app_name_snake_case/infrastructure/adapters/user_id_signing.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,26 @@
77
from app_name_snake_case.application.ports.user_id_signing import (
88
UserIDSigning,
99
)
10-
from app_name_snake_case.infrastructure.app_name_snake_case.alias import JWT
10+
from app_name_snake_case.infrastructure.alias import JWT
1111

1212

1313
@dataclass(kw_only=True, frozen=True, slots=True)
1414
class UserIDSigningAsIdentification(UserIDSigning[UUID | None]):
15-
async def signed_user_id_when(self, *, user_id: UUID) -> UUID:
15+
async def signed_user_id(self, user_id: UUID) -> UUID:
1616
return user_id
1717

18-
async def user_id_when(self, *, signed_user_id: UUID | None) -> UUID | None:
18+
async def user_id_when(self, signed_user_id: UUID | None) -> UUID | None:
1919
return signed_user_id
2020

2121

2222
@dataclass(kw_only=True, frozen=True, slots=True)
2323
class UserIDSigningToHS256JWT(UserIDSigning[JWT]):
2424
secret: str = field(repr=False)
2525

26-
async def signed_user_id_when(self, *, user_id: UUID) -> JWT:
26+
async def signed_user_id(self, user_id: UUID) -> JWT:
2727
return pyjwt.encode({"id": user_id.hex}, self.secret, algorithm="HS256")
2828

29-
async def user_id_when(self, *, signed_user_id: JWT) -> UUID | None:
30-
jwt = signed_user_id
31-
29+
async def user_id(self, jwt: JWT) -> UUID | None:
3230
try:
3331
user_data: dict[str, Any]
3432
user_data = pyjwt.decode(jwt, self.secret, algorithms="HS256")

0 commit comments

Comments
 (0)