Skip to content

Commit d14cf5b

Browse files
authored
Revert "fix: Ability To Disable Pagination In ModelControllers"
1 parent 8bb4dac commit d14cf5b

File tree

3 files changed

+2
-29
lines changed

3 files changed

+2
-29
lines changed

ninja_extra/controllers/model/schemas.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ class ModelPagination(PydanticModel):
4141
Model Controller Pagination Configuration
4242
"""
4343

44-
klass: t.Optional[t.Type[PaginationBase]] = PageNumberPaginationExtra
44+
klass: t.Type[PaginationBase] = PageNumberPaginationExtra
4545
paginator_kwargs: t.Optional[dict] = None
46-
pagination_schema: t.Optional[t.Type[PydanticModel]] = PaginatedResponseSchema
46+
pagination_schema: t.Type[PydanticModel] = PaginatedResponseSchema
4747
filter_schema: t.Optional[t.Type[FilterSchema]] = None
4848

4949
@field_validator("pagination_schema", mode="before")

tests/test_model_controller/samples.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,6 @@ class EventModelControllerDifferentPagination(ModelControllerBase):
6565
)
6666

6767

68-
@api_controller("/event-case-5")
69-
class EventModelControllerWithoutPagination(ModelControllerBase):
70-
model_config = ModelConfig(
71-
allowed_routes=[
72-
"list",
73-
],
74-
model=Event,
75-
retrieve_schema=EventSchema,
76-
pagination=ModelPagination(
77-
klass=None,
78-
),
79-
)
80-
81-
8268
@api_controller("/event-case-4")
8369
class EventModelControllerRetrieveAndList(ModelControllerBase):
8470
model_config = ModelConfig(

tests/test_model_controller/test_model_controller_schema.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,9 @@
55
EventModelControllerDifferentPagination,
66
EventModelControllerRetrieveAndList,
77
EventModelControllerWithDefinedSchema,
8-
EventModelControllerWithoutPagination,
98
)
109

1110

12-
def test_event_model_open_api_schema_case_5():
13-
api = NinjaExtraAPI()
14-
api.register_controllers(EventModelControllerWithoutPagination)
15-
schema = api.get_openapi_schema()
16-
17-
assert "get" in schema["paths"]["/api/event-case-5/"]
18-
assert schema["paths"]["/api/event-case-5/"]["get"]["parameters"] == []
19-
assert list(schema["components"]["schemas"].keys()) == [
20-
"EventSchema",
21-
]
22-
23-
2411
def test_event_model_open_api_schema_case_3():
2512
api = NinjaExtraAPI()
2613
api.register_controllers(EventModelControllerDifferentPagination)

0 commit comments

Comments
 (0)