Skip to content

Commit 91bb1bd

Browse files
committed
rename: BaseApiResponse -> BaseAPIResponse
1 parent 73294d0 commit 91bb1bd

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

easy/controller/meta.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from easy.controller.meta_conf import MODEL_FIELDS_ATTR_DEFAULT, ModelOptions
1616
from easy.domain.meta import CrudModel
17-
from easy.response import BaseApiResponse
17+
from easy.response import BaseAPIResponse
1818
from easy.services import BaseService
1919
from easy.utils import copy_func
2020

@@ -66,21 +66,21 @@ async def get_obj(self, request: HttpRequest, id: int) -> Any: # type: ignore
6666
qs = await self.service.get_obj(id)
6767
except Exception as e: # pragma: no cover
6868
logger.error(f"Get Error - {e}", exc_info=True)
69-
return BaseApiResponse(str(e), message="Get Failed", code=500)
69+
return BaseAPIResponse(str(e), message="Get Failed", code=500)
7070
if qs:
7171
return qs
7272
else:
73-
return BaseApiResponse(message="Not Found", code=404)
73+
return BaseAPIResponse(message="Not Found", code=404)
7474

7575
async def del_obj(self, request: HttpRequest, id: int) -> Any: # type: ignore
7676
"""
7777
DELETE /{id}
7878
Delete a single Object
7979
"""
8080
if await self.service.del_obj(id):
81-
return BaseApiResponse("Deleted.", code=204)
81+
return BaseAPIResponse("Deleted.", code=204)
8282
else:
83-
return BaseApiResponse("Not Found.", code=404)
83+
return BaseAPIResponse("Not Found.", code=404)
8484

8585
@paginate
8686
async def get_objs(self, request: HttpRequest, filters: Optional[str] = None) -> Any: # type: ignore
@@ -142,9 +142,9 @@ async def add_obj( # type: ignore
142142
"""
143143
obj_id = await self.service.add_obj(**data.dict())
144144
if obj_id:
145-
return BaseApiResponse({"id": obj_id}, code=201, message="Created.")
145+
return BaseAPIResponse({"id": obj_id}, code=201, message="Created.")
146146
else:
147-
return BaseApiResponse(
147+
return BaseAPIResponse(
148148
code=204, message="Add failed."
149149
) # pragma: no cover
150150

@@ -156,9 +156,9 @@ async def patch_obj( # type: ignore
156156
Update a single object
157157
"""
158158
if await self.service.patch_obj(id=id, payload=data.dict()):
159-
return BaseApiResponse(message="Updated.")
159+
return BaseAPIResponse(message="Updated.")
160160
else:
161-
return BaseApiResponse(code=400, message="Updated Failed")
161+
return BaseAPIResponse(code=400, message="Updated Failed")
162162

163163
DataSchema.__name__ = (
164164
f"{model_opts.model.__name__}__AutoSchema({str(uuid.uuid4())[:4]})"

easy/main.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from easy.controller.auto_api import create_admin_controller
1515
from easy.domain.orm import django_serializer
1616
from easy.renderer.json import EasyJSONRenderer
17-
from easy.response import BaseApiResponse
17+
from easy.response import BaseAPIResponse
1818

1919
logger = logging.getLogger(__name__)
2020

@@ -126,14 +126,14 @@ def create_response(
126126
data = django_serializer.serialize_data(data)
127127
except Exception as e: # pragma: no cover
128128
logger.error(f"Creat Response Error - {e}", exc_info=True)
129-
return BaseApiResponse(str(e), code=500)
129+
return BaseAPIResponse(str(e), code=500)
130130

131131
if self.easy_output:
132132
if temporal_response:
133133
status = temporal_response.status_code
134134
assert status
135135

136-
_temp = BaseApiResponse(
136+
_temp = BaseAPIResponse(
137137
data, status=status, content_type=self.get_content_type()
138138
)
139139

@@ -154,6 +154,6 @@ def create_response(
154154

155155
def create_temporal_response(self, request: HttpRequest) -> HttpResponse:
156156
if self.easy_output:
157-
return BaseApiResponse("", content_type=self.get_content_type())
157+
return BaseAPIResponse("", content_type=self.get_content_type())
158158
else:
159159
return super().create_temporal_response(request)

easy/response.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
SUCCESS_MESSAGE = "success"
1111

1212

13-
class BaseApiResponse(JsonResponse):
13+
class BaseAPIResponse(JsonResponse):
1414
"""
1515
Base for all API responses
1616
"""

tests/easy_app/controllers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
IsAuthenticated,
1212
IsSuperUser,
1313
)
14-
from easy.response import BaseApiResponse
14+
from easy.response import BaseAPIResponse
1515

1616
from .models import Client, Event
1717
from .schema import EventSchema
@@ -113,7 +113,7 @@ class APIMeta:
113113

114114
@http_get("/base_response/")
115115
async def generate_base_response(self, request):
116-
return BaseApiResponse({"data": "This is a BaseApiResponse."})
116+
return BaseAPIResponse({"data": "This is a BaseAPIResponse."})
117117

118118
@http_get("/qs_paginated/", auth=None)
119119
@paginate
@@ -136,7 +136,7 @@ async def list_events(self):
136136
await sync_to_async(list)(qs)
137137
if qs:
138138
return qs
139-
return BaseApiResponse()
139+
return BaseAPIResponse()
140140

141141

142142
@api_controller("unittest")

tests/test_api_base_response.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,44 @@
22

33
import pytest
44

5-
from easy.response import BaseApiResponse
5+
from easy.response import BaseAPIResponse
66

77

88
def test_base_api_result_base():
99

10-
assert BaseApiResponse("").json_data["data"] == ""
10+
assert BaseAPIResponse("").json_data["data"] == ""
1111

12-
assert BaseApiResponse("1").json_data["data"] == "1"
12+
assert BaseAPIResponse("1").json_data["data"] == "1"
1313

14-
assert BaseApiResponse("0").json_data["data"] == "0"
15-
assert BaseApiResponse().json_data["data"] == {}
16-
assert BaseApiResponse([]).json_data["data"] == []
17-
assert BaseApiResponse(True).json_data["data"] is True
18-
assert BaseApiResponse(False).json_data["data"] is False
19-
assert BaseApiResponse([1, 2, 3]).json_data["data"] == [1, 2, 3]
14+
assert BaseAPIResponse("0").json_data["data"] == "0"
15+
assert BaseAPIResponse().json_data["data"] == {}
16+
assert BaseAPIResponse([]).json_data["data"] == []
17+
assert BaseAPIResponse(True).json_data["data"] is True
18+
assert BaseAPIResponse(False).json_data["data"] is False
19+
assert BaseAPIResponse([1, 2, 3]).json_data["data"] == [1, 2, 3]
2020

2121

2222
def test_base_api_result_dict():
2323

24-
assert BaseApiResponse({"a": 1, "b": 2}).json_data["data"] == {
24+
assert BaseAPIResponse({"a": 1, "b": 2}).json_data["data"] == {
2525
"a": 1,
2626
"b": 2,
2727
}
2828

29-
assert (BaseApiResponse({"code": 2, "im": 14})).json_data["data"]["im"] == 14
30-
assert (BaseApiResponse({"code": 2, "im": 14})).json_data["data"]["code"] == 2
29+
assert (BaseAPIResponse({"code": 2, "im": 14})).json_data["data"]["im"] == 14
30+
assert (BaseAPIResponse({"code": 2, "im": 14})).json_data["data"]["code"] == 2
3131

3232

3333
def test_base_api_result_message():
3434
assert (
35-
BaseApiResponse(code=-1, message="error test").json_data["message"]
35+
BaseAPIResponse(code=-1, message="error test").json_data["message"]
3636
== "error test"
3737
)
38-
assert BaseApiResponse().json_data["message"]
38+
assert BaseAPIResponse().json_data["message"]
3939

4040

4141
def test_base_api_edit():
42-
orig_resp = BaseApiResponse(
42+
orig_resp = BaseAPIResponse(
4343
{"item_id": 2, "im": 14},
4444
code=0,
4545
)

tests/test_async_other_apis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ async def test_base_response(self, transactional_db, easy_api_client):
5050
"/base_response/",
5151
)
5252
assert response.status_code == 200
53-
assert response.json().get("data")["data"] == "This is a BaseApiResponse."
53+
assert response.json().get("data")["data"] == "This is a BaseAPIResponse."
5454

5555
async def test_qs_paginated(self, transactional_db, easy_api_client):
5656
client = easy_api_client(EasyCrudAPIController)

0 commit comments

Comments
 (0)