Skip to content

Commit df877ca

Browse files
committed
refactor: remove filters/filters_exclude api
1 parent 35e2a34 commit df877ca

File tree

3 files changed

+0
-69
lines changed

3 files changed

+0
-69
lines changed

easy/controller/base.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ class CrudAPIController(ControllerBase, CrudAPI, metaclass=CrudApiMetaclass):
1616
PATCH /{id} - Update fields for an Object
1717
DELETE /{id} - Delete a single Object
1818
GET / - Retrieve multiple Object, paginated
19-
GET /filter/?filters={filters_dict}
20-
- Filter Objects with django-orm filter dict, paginated
21-
GET /filter_exclude/?filters={filters_dict}
22-
- Filter exclude Objects with Django-ORM filter dict, paginated
23-
2419
"""
2520

2621
...

easy/controller/meta.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,6 @@ async def get_objs(
6565
return await self.service.get_objs(maximum, **json.loads(filters))
6666
return await self.service.get_objs(maximum)
6767

68-
@paginate
69-
async def filter_objs(
70-
self, request: HttpRequest, filters: Union[str, bytes]
71-
) -> Any:
72-
"""
73-
GET /filter/?filters={filters_dict}
74-
Filter Objects with Django-ORM filter dict
75-
"""
76-
return await self.service.filter_objs(**json.loads(filters))
77-
78-
@paginate
79-
async def filter_exclude_objs(self, filters: Union[str, bytes]) -> Any:
80-
"""
81-
GET /filter_exclude/?filters={filters_dict}
82-
Filter exclude Objects with Django-ORM filter dict
83-
"""
84-
return await self.service.filter_exclude_objs(**json.loads(filters))
85-
8668
# async def bulk_create_objs(self, request):
8769
# """
8870
# POST /bulk_create
@@ -121,14 +103,6 @@ def __new__(mcs, name: str, bases: Tuple[Type[Any], ...], attrs: dict) -> Any:
121103
"get_all": http_get("/", summary="Get multiple objects")(
122104
copy_func(CrudAPI.get_objs) # type: ignore
123105
),
124-
"filter_objs": http_get("/filter/", summary="Filter")(
125-
copy_func(CrudAPI.filter_objs) # type: ignore
126-
),
127-
"filter_exclude_objs": http_get(
128-
"/filter_exclude/", summary="Filter exclude"
129-
)(
130-
copy_func(CrudAPI.filter_exclude_objs) # type: ignore
131-
),
132106
}
133107

134108
if opts_model:

tests/demo_app/test_async_auto_crud_apis.py

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -212,41 +212,3 @@ async def test_crud_default_patch(self, transactional_db, easy_api_client):
212212
assert response.json().get("data")["end_date"] == str(
213213
(datetime.now() + timedelta(days=20)).date()
214214
)
215-
216-
async def test_default_filter(self, transactional_db, easy_api_client):
217-
object_data = dummy_data.copy()
218-
object_data.update(title=f"{object_data['title']}_filter")
219-
220-
event = await sync_to_async(Event.objects.create)(**object_data)
221-
222-
client = easy_api_client(AutoGenCrudAPIController)
223-
224-
response = await client.get(
225-
"/filter/", query=dict(filters=json.dumps(dict(id__gte=1)))
226-
)
227-
assert response.status_code == 200
228-
229-
data = response.json().get("data")
230-
assert data[0]["title"] == "AsyncAdminAPIEvent_filter"
231-
232-
event_schema = json.loads(EventSchema.from_orm(event).json())
233-
assert event_schema["end_date"] == data[0]["end_date"]
234-
235-
async def test_crud_filter_exclude(self, transactional_db, easy_api_client):
236-
object_data = dummy_data.copy()
237-
object_data.update(title=f"{object_data['title']}_exclude")
238-
239-
event = await sync_to_async(Event.objects.create)(**object_data)
240-
241-
client = easy_api_client(AutoGenCrudAPIController)
242-
243-
response = await client.get(
244-
"/filter_exclude/", query=dict(filters=json.dumps(dict(id__lt=1)))
245-
)
246-
assert response.status_code == 200
247-
248-
data = response.json().get("data")
249-
assert data[0]["title"] == "AsyncAdminAPIEvent_exclude"
250-
251-
event_schema = json.loads(EventSchema.from_orm(event).json())
252-
assert event_schema["end_date"] == data[0]["end_date"]

0 commit comments

Comments
 (0)