Skip to content

Commit 3013e48

Browse files
committed
resolved comment
1 parent 0df63bd commit 3013e48

File tree

2 files changed

+47
-14
lines changed

2 files changed

+47
-14
lines changed

backend/app/api/routes/banlist_configs.py

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import Optional
22
from uuid import UUID
33

4-
from fastapi import APIRouter
4+
from fastapi import APIRouter, HTTPException
55

66
from app.api.deps import AuthDep, SessionDep
77
from app.crud.banlist import banlist_crud
@@ -28,8 +28,13 @@ def create_banlist(
2828
project_id: int,
2929
_: AuthDep,
3030
):
31-
response_model = banlist_crud.create(session, payload, organization_id, project_id)
32-
return APIResponse.success_response(data=response_model)
31+
try:
32+
response_model = banlist_crud.create(session, payload, organization_id, project_id)
33+
return APIResponse.success_response(data=response_model)
34+
except HTTPException as exc:
35+
return APIResponse.failure_response(error=str(exc.detail))
36+
except Exception as exc:
37+
return APIResponse.failure_response(error=str(exc))
3338

3439
@router.get(
3540
"/",
@@ -42,8 +47,13 @@ def list_banlists(
4247
_: AuthDep,
4348
domain: Optional[str] = None,
4449
):
45-
response_model = banlist_crud.list(session, organization_id, project_id, domain)
46-
return APIResponse.success_response(data=response_model)
50+
try:
51+
response_model = banlist_crud.list(session, organization_id, project_id, domain)
52+
return APIResponse.success_response(data=response_model)
53+
except HTTPException as exc:
54+
return APIResponse.failure_response(error=str(exc.detail))
55+
except Exception as exc:
56+
return APIResponse.failure_response(error=str(exc))
4757

4858

4959
@router.get(
@@ -57,8 +67,13 @@ def get_banlist(
5767
session: SessionDep,
5868
_: AuthDep,
5969
):
60-
obj = banlist_crud.get(session, id, organization_id, project_id)
61-
return APIResponse.success_response(data=obj)
70+
try:
71+
obj = banlist_crud.get(session, id, organization_id, project_id)
72+
return APIResponse.success_response(data=obj)
73+
except HTTPException as exc:
74+
return APIResponse.failure_response(error=str(exc.detail))
75+
except Exception as exc:
76+
return APIResponse.failure_response(error=str(exc))
6277

6378

6479
@router.patch(
@@ -73,9 +88,19 @@ def update_banlist(
7388
session: SessionDep,
7489
_: AuthDep,
7590
):
76-
obj = banlist_crud.get(session, id, organization_id, project_id)
77-
response_model = banlist_crud.update(session, obj=obj, data=payload)
78-
return APIResponse.success_response(data=response_model)
91+
try:
92+
response_model = banlist_crud.update(
93+
session,
94+
id=id,
95+
organization_id=organization_id,
96+
project_id=project_id,
97+
data=payload,
98+
)
99+
return APIResponse.success_response(data=response_model)
100+
except HTTPException as exc:
101+
return APIResponse.failure_response(error=str(exc.detail))
102+
except Exception as exc:
103+
return APIResponse.failure_response(error=str(exc))
79104

80105
@router.delete(
81106
"/{id}",
@@ -88,6 +113,11 @@ def delete_banlist(
88113
session: SessionDep,
89114
_: AuthDep,
90115
):
91-
obj = banlist_crud.get(session, id, organization_id, project_id)
92-
banlist_crud.delete(session, obj)
93-
return APIResponse.success_response(data={"message": "Banlist deleted successfully"})
116+
try:
117+
obj = banlist_crud.get(session, id, organization_id, project_id)
118+
banlist_crud.delete(session, obj)
119+
return APIResponse.success_response(data={"message": "Banlist deleted successfully"})
120+
except HTTPException as exc:
121+
return APIResponse.failure_response(error=str(exc.detail))
122+
except Exception as exc:
123+
return APIResponse.failure_response(error=str(exc))

backend/app/crud/banlist.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ def list(
8080
def update(
8181
self,
8282
session: Session,
83-
obj: BanList,
83+
id: UUID,
84+
organization_id: int,
85+
project_id: int,
8486
data: BanListUpdate,
8587
) -> BanList:
88+
obj = self.get(session, id, organization_id, project_id)
8689
update_data = data.model_dump(exclude_unset=True)
8790

8891
for k, v in update_data.items():

0 commit comments

Comments
 (0)