Skip to content

Commit 7d30ef3

Browse files
committed
fix: invalid import path
1 parent c646f20 commit 7d30ef3

9 files changed

Lines changed: 81 additions & 36 deletions

File tree

.gitignore

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,49 @@
1-
```
1+
# Python
22
__pycache__/
33
*.pyc
44
*.pyo
55
*.pyd
6-
```
6+
.Python
7+
*.so
8+
*.egg-info/
9+
.eggs/
10+
11+
# Virtual environments
12+
venv/
13+
.venv/
14+
env/
15+
ENV/
16+
.ENV
17+
18+
# Build artifacts
19+
build/
20+
dist/
21+
*.egg
22+
23+
# Testing
24+
.coverage
25+
htmlcov/
26+
.pytest_cache/
27+
.mypy_cache/
28+
29+
# Logs
30+
*.log
31+
32+
# Environment variables
33+
.env
34+
.env.local
35+
*.env.*
36+
37+
# IDE
38+
.vscode/
39+
.idea/
40+
*.swp
41+
*.swo
42+
*.tmp
43+
44+
# OS
45+
.DS_Store
46+
Thumbs.db
47+
48+
# Coverage
49+
coverage/

src/core/routers/api/v1.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from fastapi import APIRouter, FastAPI
22

3-
from src.modules.authorization.presenter.routers.permission_router import (
3+
from src.modules.authorization.presentation.routers.permission_router import (
44
router as permission_router,
55
)
6-
from src.modules.authorization.presenter.routers.role_router import (
6+
from src.modules.authorization.presentation.routers.role_router import (
77
router as role_router,
88
)
99
from src.modules.todo.presentation.routers.todo_router import router as todo_router

src/modules/authorization/application/get_role/handler.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
from uuid import UUID
2-
31
from src.modules.authorization.application.get_role.query import GetRoleQuery
42
from src.modules.authorization.domain.entities.role import Role
5-
from src.modules.authorization.domain.repositories.casbin_policy_repository import (
3+
from src.modules.authorization.infrastructure.repositories.casbin_policy_repository import (
64
CasbinPolicyRepository,
75
)
86

src/modules/authorization/presentation/routers/permission_router.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
CasbinAuthorizationService,
2424
)
2525
from src.modules.authorization.presentation.dependency import (
26-
get_casbin_authorization_service,
26+
get_authorization_service,
2727
require_permission,
2828
)
2929
from src.modules.authorization.presentation.schema.request import (
@@ -45,7 +45,7 @@
4545
)
4646
async def create_permission(
4747
request: CreatePermissionRequest,
48-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
48+
service: CasbinAuthorizationService = Depends(get_authorization_service),
4949
unit_of_work: UnitOfWork = Depends(get_unit_of_work),
5050
):
5151
permission = Permission.create(
@@ -75,7 +75,7 @@ async def list_permissions(
7575
None, description="Cursor for pagination (from previous response)"
7676
),
7777
limit: int = Query(10, ge=1, le=100, description="Number of items per page"),
78-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
78+
service: CasbinAuthorizationService = Depends(get_authorization_service),
7979
):
8080
cursor_created_at = None
8181
cursor_id = None
@@ -130,7 +130,7 @@ async def list_permissions(
130130
)
131131
async def get_permission(
132132
permission_id: UUID,
133-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
133+
service: CasbinAuthorizationService = Depends(get_authorization_service),
134134
):
135135
permission = await service.get_permission(permission_id)
136136
if permission is None:
@@ -150,7 +150,7 @@ async def get_permission(
150150
async def update_permission(
151151
permission_id: UUID,
152152
request: UpdatePermissionRequest,
153-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
153+
service: CasbinAuthorizationService = Depends(get_authorization_service),
154154
unit_of_work: UnitOfWork = Depends(get_unit_of_work),
155155
):
156156
existing = await service.get_permission(permission_id)
@@ -188,7 +188,7 @@ async def update_permission(
188188
)
189189
async def delete_permission(
190190
permission_id: UUID,
191-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
191+
service: CasbinAuthorizationService = Depends(get_authorization_service),
192192
unit_of_work: UnitOfWork = Depends(get_unit_of_work),
193193
):
194194
async with unit_of_work:

src/modules/authorization/presentation/routers/role_router.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
CursorPaginatedResponse,
1111
SuccessResponse,
1212
)
13+
from src.modules.authorization.domain.entities.role import Role
1314
from src.modules.authorization.domain.permissions import (
1415
CREATE_ACTION,
1516
DELETE_ACTION,
1617
READ_ACTION,
1718
ROLE_RESOURCE,
1819
UPDATE_ACTION,
1920
)
20-
from src.modules.authorization.domain.entities.role import Role
2121
from src.modules.authorization.infrastructure.services.casbin_authorization_service import (
2222
CasbinAuthorizationService,
2323
)
2424
from src.modules.authorization.presentation.dependency import (
25-
get_casbin_authorization_service,
25+
get_authorization_service,
2626
require_permission,
2727
)
2828
from src.modules.authorization.presentation.schema.request import (
@@ -44,7 +44,7 @@
4444
)
4545
async def create_role(
4646
request: CreateRoleRequest,
47-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
47+
service: CasbinAuthorizationService = Depends(get_authorization_service),
4848
unit_of_work: UnitOfWork = Depends(get_unit_of_work),
4949
):
5050
role = Role.create(name=request.name, description=request.description)
@@ -66,7 +66,7 @@ async def list_roles(
6666
None, description="Cursor for pagination (from previous response)"
6767
),
6868
limit: int = Query(10, ge=1, le=100, description="Number of items per page"),
69-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
69+
service: CasbinAuthorizationService = Depends(get_authorization_service),
7070
):
7171
cursor_created_at = None
7272
cursor_id = None
@@ -121,7 +121,7 @@ async def list_roles(
121121
)
122122
async def get_role(
123123
role_id: UUID,
124-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
124+
service: CasbinAuthorizationService = Depends(get_authorization_service),
125125
):
126126
role = await service.get_role(role_id)
127127
if role is None:
@@ -139,7 +139,7 @@ async def get_role(
139139
async def update_role(
140140
role_id: UUID,
141141
request: UpdateRoleRequest,
142-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
142+
service: CasbinAuthorizationService = Depends(get_authorization_service),
143143
unit_of_work: UnitOfWork = Depends(get_unit_of_work),
144144
):
145145
existing = await service.get_role(role_id)
@@ -170,7 +170,7 @@ async def update_role(
170170
)
171171
async def delete_role(
172172
role_id: UUID,
173-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
173+
service: CasbinAuthorizationService = Depends(get_authorization_service),
174174
unit_of_work: UnitOfWork = Depends(get_unit_of_work),
175175
):
176176
async with unit_of_work:
@@ -186,7 +186,7 @@ async def delete_role(
186186
async def assign_permission_to_role(
187187
role_id: UUID,
188188
permission_id: UUID,
189-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
189+
service: CasbinAuthorizationService = Depends(get_authorization_service),
190190
unit_of_work: UnitOfWork = Depends(get_unit_of_work),
191191
):
192192
async with unit_of_work:
@@ -202,7 +202,7 @@ async def assign_permission_to_role(
202202
async def remove_permission_from_role(
203203
role_id: UUID,
204204
permission_id: UUID,
205-
service: CasbinAuthorizationService = Depends(get_casbin_authorization_service),
205+
service: CasbinAuthorizationService = Depends(get_authorization_service),
206206
unit_of_work: UnitOfWork = Depends(get_unit_of_work),
207207
):
208208
async with unit_of_work:

src/modules/todo/presentation/routers/todo_router.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33

44
from fastapi import APIRouter, Depends, HTTPException, Query, status
55

6-
from src.core.authorization.dependencies import require_permission
7-
from src.core.authorization.permissions import (
6+
from src.core.schemas.response import (
7+
CursorMeta,
8+
CursorPaginatedResponse,
9+
SuccessResponse,
10+
)
11+
from src.modules.authorization.domain.permissions import (
812
CREATE_ACTION,
913
DELETE_ACTION,
1014
READ_ACTION,
1115
TODO_RESOURCE,
1216
UPDATE_ACTION,
1317
)
14-
from src.core.schemas.response import (
15-
CursorMeta,
16-
CursorPaginatedResponse,
17-
SuccessResponse,
18-
)
18+
from src.modules.authorization.presentation.dependency import require_permission
1919
from src.modules.todo.application.create_todo.command import CreateTodoCommand
2020
from src.modules.todo.application.create_todo.handler import CreateTodoHandler
2121
from src.modules.todo.application.delete_todo.handler import DeleteTodoHandler

src/modules/user/application/auth/register_user/handler.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import secrets
22

3-
from src.core.authorization.domain.service import AuthorizationService
4-
from src.core.authorization.permissions import DEFAULT_USER_ROLE
53
from src.core.events.bus import get_event_bus
64
from src.core.security.password import PasswordSerrvice
5+
from src.modules.authorization.domain.permissions import DEFAULT_USER_ROLE
6+
from src.modules.authorization.domain.services.authorization_service import (
7+
AuthorizationService,
8+
)
79
from src.modules.user.application.auth.register_user.command import RegisterUserCommand
810
from src.modules.user.application.auth.register_user.validation import (
911
validate_register_user_command,

src/modules/user/presentation/dependency.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
from fastapi import Depends
22
from sqlalchemy.ext.asyncio import AsyncSession
33

4-
from src.core.authorization.dependencies import get_authorization_service
5-
from src.core.authorization.domain.service import AuthorizationService
64
from src.core.database.postgres.session import get_db, get_unit_of_work
75
from src.core.security.account_lockout import AccountLockoutService
86
from src.core.security.audit import AuditService
@@ -13,6 +11,10 @@
1311
SQLAlchemyLoginAttemptRepository,
1412
)
1513
from src.core.security.token_revocation import TokenRevocationService
14+
from src.modules.authorization.domain.services.authorization_service import (
15+
AuthorizationService,
16+
)
17+
from src.modules.authorization.presentation.dependency import get_authorization_service
1618
from src.modules.user.application.auth.login_user.handler import LoginUserCommandHandler
1719
from src.modules.user.application.auth.logout_user.handler import (
1820
LogoutUserCommandHandler,

src/modules/user/presentation/routers/user_router.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from fastapi import APIRouter, Depends, HTTPException, Request, status
22
from fastapi.security import OAuth2PasswordRequestForm
33

4-
from src.core.authorization.dependencies import require_permission
5-
from src.core.authorization.permissions import (
4+
from src.core.schemas.response import SuccessResponse
5+
from src.modules.authorization.domain.permissions import (
66
ME_ACTION,
77
UPDATE_ACTION,
88
USER_RESOURCE,
99
)
10-
from src.core.schemas.response import SuccessResponse
10+
from src.modules.authorization.presentation.dependency import require_permission
1111
from src.modules.user.application.auth.login_user.command import LoginUserCommand
1212
from src.modules.user.application.auth.login_user.handler import LoginUserCommandHandler
1313
from src.modules.user.application.auth.logout_user.command import LogoutUserCommand

0 commit comments

Comments
 (0)