refactor: improve code readability by formatting arguments across multiple files
Test / test (push) Successful in 15s

This commit is contained in:
Artem Kashaev
2025-12-01 16:25:30 +05:00
parent dc0046c730
commit 1dd7c2f2b8
22 changed files with 161 additions and 49 deletions
+8 -2
View File
@@ -98,7 +98,10 @@ async def test_list_activities_returns_only_current_deal(session: AsyncSession)
payload={"text": "hi"},
),
Activity(
deal_id=deal_id + 1, author_id=context.user_id, type=ActivityType.SYSTEM, payload={},
deal_id=deal_id + 1,
author_id=context.user_id,
type=ActivityType.SYSTEM,
payload={},
),
],
)
@@ -120,7 +123,10 @@ async def test_add_comment_rejects_empty_text(session: AsyncSession) -> None:
with pytest.raises(ActivityValidationError):
await service.add_comment(
deal_id=deal_id, author_id=context.user_id, text=" ", context=context,
deal_id=deal_id,
author_id=context.user_id,
text=" ",
context=context,
)
+11 -3
View File
@@ -39,16 +39,24 @@ async def session() -> AsyncGenerator[AsyncSession, None]:
async def _seed_data(session: AsyncSession) -> tuple[int, int, int]:
org = Organization(name="Analytics Org")
user = User(
email="analytics@example.com", hashed_password="hashed", name="Analyst", is_active=True,
email="analytics@example.com",
hashed_password="hashed",
name="Analyst",
is_active=True,
)
session.add_all([org, user])
await session.flush()
member = OrganizationMember(
organization_id=org.id, user_id=user.id, role=OrganizationRole.OWNER,
organization_id=org.id,
user_id=user.id,
role=OrganizationRole.OWNER,
)
contact = Contact(
organization_id=org.id, owner_id=user.id, name="Client", email="client@example.com",
organization_id=org.id,
owner_id=user.id,
name="Client",
email="client@example.com",
)
session.add_all([member, contact])
await session.flush()
+10 -3
View File
@@ -50,7 +50,8 @@ def jwt_service() -> JWTService:
@pytest.mark.asyncio
async def test_authenticate_success(
password_hasher: PasswordHasher, jwt_service: JWTService,
password_hasher: PasswordHasher,
jwt_service: JWTService,
) -> None:
hashed = password_hasher.hash("StrongPass123")
user = User(email="user@example.com", hashed_password=hashed, name="Alice", is_active=True)
@@ -103,7 +104,10 @@ async def test_refresh_tokens_returns_new_pair(
jwt_service: JWTService,
) -> None:
user = User(
email="refresh@example.com", hashed_password="hashed", name="Refresh", is_active=True,
email="refresh@example.com",
hashed_password="hashed",
name="Refresh",
is_active=True,
)
user.id = 7
service = AuthService(StubUserRepository(user), password_hasher, jwt_service)
@@ -121,7 +125,10 @@ async def test_refresh_tokens_rejects_access_token(
jwt_service: JWTService,
) -> None:
user = User(
email="refresh@example.com", hashed_password="hashed", name="Refresh", is_active=True,
email="refresh@example.com",
hashed_password="hashed",
name="Refresh",
is_active=True,
)
user.id = 9
service = AuthService(StubUserRepository(user), password_hasher, jwt_service)
+3 -1
View File
@@ -65,7 +65,9 @@ def _make_context(org: Organization, user: User, role: OrganizationRole) -> Orga
async def _persist_base(
session: AsyncSession, *, role: OrganizationRole = OrganizationRole.MANAGER,
session: AsyncSession,
*,
role: OrganizationRole = OrganizationRole.MANAGER,
) -> tuple[
OrganizationContext,
Contact,
+14 -5
View File
@@ -28,7 +28,9 @@ class StubOrganizationRepository(OrganizationRepository):
self._membership = membership
async def get_membership(
self, organization_id: int, user_id: int,
self,
organization_id: int,
user_id: int,
) -> OrganizationMember | None: # pragma: no cover - helper
if (
self._membership
@@ -40,7 +42,10 @@ class StubOrganizationRepository(OrganizationRepository):
def make_membership(
role: OrganizationRole, *, organization_id: int = 1, user_id: int = 10,
role: OrganizationRole,
*,
organization_id: int = 1,
user_id: int = 10,
) -> OrganizationMember:
organization = Organization(name="Acme Inc")
organization.id = organization_id
@@ -75,7 +80,8 @@ class MembershipRepositoryStub(OrganizationRepository):
"""Repository stub that can emulate duplicate checks for add_member."""
def __init__(
self, memberships: dict[tuple[int, int], OrganizationMember] | None = None,
self,
memberships: dict[tuple[int, int], OrganizationMember] | None = None,
) -> None:
self._session_stub = SessionStub()
super().__init__(session=cast(AsyncSession, self._session_stub))
@@ -95,7 +101,8 @@ async def test_get_context_success() -> None:
service = OrganizationService(StubOrganizationRepository(membership))
context = await service.get_context(
user_id=membership.user_id, organization_id=membership.organization_id,
user_id=membership.user_id,
organization_id=membership.organization_id,
)
assert context.organization_id == membership.organization_id
@@ -183,7 +190,9 @@ async def test_add_member_rejects_duplicate_membership() -> None:
with pytest.raises(OrganizationMemberAlreadyExistsError):
await service.add_member(
context=context, user_id=duplicate_user_id, role=OrganizationRole.MANAGER,
context=context,
user_id=duplicate_user_id,
role=OrganizationRole.MANAGER,
)
+2 -1
View File
@@ -190,7 +190,8 @@ async def test_member_cannot_update_foreign_task(session: AsyncSession) -> None:
role=OrganizationRole.MEMBER,
)
member_context = OrganizationContext(
organization=context_owner.organization, membership=membership,
organization=context_owner.organization,
membership=membership,
)
with pytest.raises(TaskForbiddenError):