Skip to content

Commit 84c2f9c

Browse files
committed
ref(fastapi): move relation part to relation from common
1 parent 370fd11 commit 84c2f9c

File tree

5 files changed

+50
-45
lines changed

5 files changed

+50
-45
lines changed
Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,13 @@
1-
from fastapi import FastAPI, Response, status
2-
from fastapi.responses import JSONResponse
1+
from fastapi import FastAPI
32

4-
from tgdb.application.relation.ports.relations import (
5-
NoRelationError,
6-
NotUniqueRelationNumberError,
7-
)
8-
from tgdb.application.relation.ports.tuples import OversizedRelationSchemaError
9-
from tgdb.presentation.fastapi.common.schemas.error import (
10-
NoRelationSchema,
11-
NotUniqueRelationNumberSchema,
12-
OversizedRelationSchemaSchema,
13-
)
143
from tgdb.presentation.fastapi.horizon.error_handling import (
154
add_horizon_error_handling,
165
)
6+
from tgdb.presentation.fastapi.relation.error_handling import (
7+
add_relation_error_handling,
8+
)
179

1810

1911
def add_error_handling(app: FastAPI) -> None:
20-
add_common_error_handling(app)
2112
add_horizon_error_handling(app)
22-
23-
24-
def add_common_error_handling(app: FastAPI) -> None:
25-
@app.exception_handler(NoRelationError)
26-
def _(_: object, __: object) -> Response:
27-
schema = NoRelationSchema()
28-
29-
return JSONResponse(
30-
schema.model_dump(mode="json", by_alias=True),
31-
status_code=status.HTTP_404_NOT_FOUND,
32-
)
33-
34-
@app.exception_handler(NotUniqueRelationNumberError)
35-
def _(_: object, __: object) -> Response:
36-
schema = NotUniqueRelationNumberSchema()
37-
38-
return JSONResponse(
39-
schema.model_dump(mode="json", by_alias=True),
40-
status_code=status.HTTP_409_CONFLICT,
41-
)
42-
43-
@app.exception_handler(OversizedRelationSchemaError)
44-
def _(_: object, error: OversizedRelationSchemaError) -> Response:
45-
schema = OversizedRelationSchemaSchema.of(error)
46-
47-
return JSONResponse(
48-
schema.model_dump(mode="json", by_alias=True),
49-
status_code=status.HTTP_400_BAD_REQUEST,
50-
)
13+
add_relation_error_handling(app)
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
from fastapi import FastAPI, Response, status
2+
from fastapi.responses import JSONResponse
3+
4+
from tgdb.application.relation.ports.relations import (
5+
NoRelationError,
6+
NotUniqueRelationNumberError,
7+
)
8+
from tgdb.application.relation.ports.tuples import OversizedRelationSchemaError
9+
from tgdb.presentation.fastapi.relation.schemas.error import (
10+
NoRelationSchema,
11+
NotUniqueRelationNumberSchema,
12+
OversizedRelationSchemaSchema,
13+
)
14+
15+
16+
def add_relation_error_handling(app: FastAPI) -> None:
17+
@app.exception_handler(NoRelationError)
18+
def _(_: object, __: object) -> Response:
19+
schema = NoRelationSchema()
20+
21+
return JSONResponse(
22+
schema.model_dump(mode="json", by_alias=True),
23+
status_code=status.HTTP_404_NOT_FOUND,
24+
)
25+
26+
@app.exception_handler(NotUniqueRelationNumberError)
27+
def _(_: object, __: object) -> Response:
28+
schema = NotUniqueRelationNumberSchema()
29+
30+
return JSONResponse(
31+
schema.model_dump(mode="json", by_alias=True),
32+
status_code=status.HTTP_409_CONFLICT,
33+
)
34+
35+
@app.exception_handler(OversizedRelationSchemaError)
36+
def _(_: object, error: OversizedRelationSchemaError) -> Response:
37+
schema = OversizedRelationSchemaSchema.of(error)
38+
39+
return JSONResponse(
40+
schema.model_dump(mode="json", by_alias=True),
41+
status_code=status.HTTP_400_BAD_REQUEST,
42+
)

src/tgdb/presentation/fastapi/relation/routes/create_relation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
from tgdb.application.relation.create_relation import CreateRelation
88
from tgdb.entities.numeration.number import Number
9-
from tgdb.presentation.fastapi.common.schemas.error import (
9+
from tgdb.presentation.fastapi.common.tags import Tag
10+
from tgdb.presentation.fastapi.relation.schemas.error import (
1011
NotUniqueRelationNumberSchema,
1112
OversizedRelationSchemaSchema,
1213
)
13-
from tgdb.presentation.fastapi.common.tags import Tag
1414
from tgdb.presentation.fastapi.relation.schemas.schema import SchemaSchema
1515

1616

src/tgdb/presentation/fastapi/relation/routes/view_tuples.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from tgdb.entities.numeration.number import Number
1111
from tgdb.entities.relation.scalar import Scalar
1212
from tgdb.entities.relation.tuple import Tuple
13-
from tgdb.presentation.fastapi.common.schemas.error import NoRelationSchema
13+
from tgdb.presentation.fastapi.relation.schemas.error import NoRelationSchema
1414
from tgdb.presentation.fastapi.common.tags import Tag
1515
from tgdb.presentation.fastapi.horizon.schemas.error import (
1616
NoTransactionSchema,

src/tgdb/presentation/fastapi/common/schemas/error.py renamed to src/tgdb/presentation/fastapi/relation/schemas/error.py

File renamed without changes.

0 commit comments

Comments
 (0)