Skip to content

Commit

Permalink
Change repo structure.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman505050 committed Nov 14, 2024
1 parent 2e07c32 commit c9cc542
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 13 deletions.
1 change: 0 additions & 1 deletion src/core/application/user/use_cases/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ async def execute(self, register_data: RegisterUserDTO) -> UserDTO:

try:
user_dto = UserDTO.from_entity(user)
await self._user_repository.commit()
return user_dto
except ValidationError as e:
# Because if an error occurs, it is not a user error
Expand Down
3 changes: 0 additions & 3 deletions src/core/domain/user/repositories/role.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@


class IRoleRepository(ABC):
@abstractmethod
async def commit(self) -> None: ...

@abstractmethod
async def save(self, role: RoleEntity) -> RoleEntity: ...

Expand Down
3 changes: 0 additions & 3 deletions src/core/domain/user/repositories/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@


class IUserRepository(ABC):
@abstractmethod
async def commit(self) -> None: ...

@abstractmethod
async def save(self, user: UserEntity) -> UserEntity: ...

Expand Down
5 changes: 2 additions & 3 deletions src/core/infrastructure/repositories/role.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,18 @@ class RoleRepository(IRoleRepository):
def __init__(self, session: AsyncSession):
self._session = session

async def commit(self) -> None:
await self._session.commit()

async def save(self, role: RoleEntity) -> RoleEntity:
role_model = self.model.from_entity(role)
self._session.add(role_model)
await self._session.commit()
return role_model.to_entity()

async def delete(self, role_id: UUID) -> None:
stmt = delete(self.model).filter_by(role_id=role_id)
result = await self._session.execute(stmt)
if result.rowcount == 0:
raise RoleNotFoundException(f"Role with id {role_id} not found")
await self._session.commit()

async def get_by_id(self, role_id: UUID) -> RoleEntity:
stmt = select(self.model).filter_by(role_id=role_id)
Expand Down
5 changes: 2 additions & 3 deletions src/core/infrastructure/repositories/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ class UserRepository(IUserRepository):
def __init__(self, session: AsyncSession):
self._session = session

async def commit(self) -> None:
await self._session.commit()

async def save(self, user: UserEntity) -> UserEntity:
user_model = self.model.from_entity(user)
await self._session.execute(
Expand Down Expand Up @@ -62,13 +59,15 @@ async def save(self, user: UserEntity) -> UserEntity:
roles = roles_result.scalars().all()
user_model.roles = list(roles)

await self._session.commit()
return user_model.to_entity()

async def delete(self, user_id: UUID) -> None:
stmt = delete(self.model).filter_by(user_id=user_id)
result = await self._session.execute(stmt)
if result.rowcount == 0:
raise UserNotFoundException(f"User with id {user_id} not found")
await self._session.commit()

async def get_by_id(self, user_id: UUID) -> UserEntity:
stmt = (
Expand Down

0 comments on commit c9cc542

Please sign in to comment.