Skip to content

Commit 0eaf9b1

Browse files
committed
lint: setting name changes
1 parent 96135dc commit 0eaf9b1

File tree

6 files changed

+27
-29
lines changed

6 files changed

+27
-29
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ You will see the automatic interactive API documentation (provided by Swagger UI
8383
![Auto generated APIs List](https://github.com/freemindcore/django-api-framework/blob/fae8209a8d08c55daf75ac3a4619fe62b8ef3af6/docs/images/admin_apis_list.png)
8484

8585
#### Configuration
86-
If `AUTO_ADMIN_ENABLED_ALL_APPS` is set to True (default), all app models CRUD apis will be generated.
87-
Apps in the `AUTO_ADMIN_EXCLUDE_APPS` list, will be always excluded.
86+
If `CRUD_API_ENABLED_ALL_APPS` is set to True (default), all app models CRUD apis will be generated.
87+
Apps in the `CRUD_API_EXCLUDE_APPS` list, will be always excluded.
8888

89-
If `AUTO_ADMIN_ENABLED_ALL_APPS` is set to False, only apps in the `AUTO_ADMIN_INCLUDE_APPS` list will have CRUD apis generated.
89+
If `CRUD_API_ENABLED_ALL_APPS` is set to False, only apps in the `CRUD_API_INCLUDE_APPS` list will have CRUD apis generated.
9090

9191
Also, configuration is possible for each model, via ApiMeta class:
9292
- `generate_crud`: whether to create crud api, default to True

easy/conf/settings.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55

66
# AUTO ADMIN API settings
77
# If not all
8-
AUTO_ADMIN_ENABLED_ALL_APPS = getattr(
9-
django_settings, "AUTO_ADMIN_ENABLED_ALL_APPS", True
10-
)
8+
CRUD_API_ENABLED_ALL_APPS = getattr(django_settings, "CRUD_API_ENABLED_ALL_APPS", True)
119
# Only generate for included apps
12-
AUTO_ADMIN_INCLUDE_APPS = getattr(django_settings, "AUTO_ADMIN_INCLUDE_APPS", [])
10+
CRUD_API_INCLUDE_APPS = getattr(django_settings, "CRUD_API_INCLUDE_APPS", [])
1311
# Exclude apps always got excluded
14-
AUTO_ADMIN_EXCLUDE_APPS = getattr(django_settings, "AUTO_ADMIN_EXCLUDE_APPS", [])
12+
CRUD_API_EXCLUDE_APPS = getattr(django_settings, "CRUD_API_EXCLUDE_APPS", [])
1513

1614

1715
def reload_settings(*args: Any, **kwargs: Any) -> None: # pragma: no cover

easy/main.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
from django.conf import settings
66
from django.http import HttpRequest, HttpResponse
77
from django.utils.module_loading import module_has_submodule
8-
from domain.orm import django_serializer
98
from ninja.constants import NOT_SET, NOT_SET_TYPE
109
from ninja.parser import Parser
1110
from ninja.renderers import BaseRenderer
1211
from ninja.types import TCallable
1312
from ninja_extra import NinjaExtraAPI
1413

1514
from easy.controller.auto_api import create_admin_controller
15+
from easy.domain.orm import django_serializer
1616
from easy.renderer.json import EasyJSONRenderer
1717
from easy.response import BaseApiResponse
1818

@@ -29,9 +29,9 @@ class EasyAPI(NinjaExtraAPI):
2929
If True, will be encapsulated in BaseAPIResponse
3030
-renderer, default to EasyJSONRenderer
3131
-Auto generate AdminAPIs, it will read the following settings:
32-
AUTO_ADMIN_ENABLED_ALL_APPS
33-
AUTO_ADMIN_EXCLUDE_APPS
34-
AUTO_ADMIN_INCLUDE_APPS
32+
CRUD_API_ENABLED_ALL_APPS
33+
CRUD_API_EXCLUDE_APPS
34+
CRUD_API_INCLUDE_APPS
3535
"""
3636

3737
def __init__(
@@ -75,17 +75,17 @@ def __init__(
7575
def auto_create_admin_controllers(self, version: str = None) -> None:
7676
for app_module in self.get_installed_apps():
7777
# If not all
78-
if not settings.AUTO_ADMIN_ENABLED_ALL_APPS: # type:ignore
78+
if not settings.CRUD_API_ENABLED_ALL_APPS: # type:ignore
7979
# Only generate for this included apps
80-
if settings.AUTO_ADMIN_INCLUDE_APPS is not None: # type:ignore
80+
if settings.CRUD_API_INCLUDE_APPS is not None: # type:ignore
8181
if (
8282
app_module.name
83-
not in settings.AUTO_ADMIN_INCLUDE_APPS # type:ignore
83+
not in settings.CRUD_API_INCLUDE_APPS # type:ignore
8484
):
8585
continue
8686

8787
# Exclude list
88-
if app_module.name in settings.AUTO_ADMIN_EXCLUDE_APPS: # type:ignore
88+
if app_module.name in settings.CRUD_API_EXCLUDE_APPS: # type:ignore
8989
continue
9090

9191
try:

tests/config/settings.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"""
44

55
# Admin API auto-generation settings
6-
AUTO_ADMIN_ENABLED_ALL_APPS = True
7-
AUTO_ADMIN_INCLUDE_APPS = []
8-
AUTO_ADMIN_EXCLUDE_APPS = []
6+
CRUD_API_ENABLED_ALL_APPS = True
7+
CRUD_API_INCLUDE_APPS = []
8+
CRUD_API_EXCLUDE_APPS = []
99

1010
# Django Settings
1111
INSTALLED_APPS = (

tests/test_auto_api_creation.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ async def test_auto_apis(transactional_db, user, easy_api_client):
6666

6767

6868
async def test_auto_generation_settings(settings):
69-
settings.AUTO_ADMIN_EXCLUDE_APPS = ["tests.easy_app"]
69+
settings.CRUD_API_EXCLUDE_APPS = ["tests.easy_app"]
7070
api_admin_v2 = EasyAPI()
7171
api_admin_v2.auto_create_admin_controllers()
7272
assert len(api_admin_v2._routers) == 1
7373

74-
settings.AUTO_ADMIN_ENABLED_ALL_APPS = False
75-
settings.AUTO_ADMIN_EXCLUDE_APPS = []
76-
settings.AUTO_ADMIN_INCLUDE_APPS = ["tests.none_existing_app"]
74+
settings.CRUD_API_ENABLED_ALL_APPS = False
75+
settings.CRUD_API_EXCLUDE_APPS = []
76+
settings.CRUD_API_INCLUDE_APPS = ["tests.none_existing_app"]
7777
api_admin_v3 = EasyAPI()
7878
api_admin_v3.auto_create_admin_controllers()
7979
assert len(api_admin_v3._routers) == 1

tests/test_settings.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
from easy.conf.settings import (
2-
AUTO_ADMIN_ENABLED_ALL_APPS,
3-
AUTO_ADMIN_EXCLUDE_APPS,
4-
AUTO_ADMIN_INCLUDE_APPS,
2+
CRUD_API_ENABLED_ALL_APPS,
3+
CRUD_API_EXCLUDE_APPS,
4+
CRUD_API_INCLUDE_APPS,
55
)
66

77

88
def test_change_django_settings(settings):
9-
assert settings.AUTO_ADMIN_ENABLED_ALL_APPS == AUTO_ADMIN_ENABLED_ALL_APPS
10-
assert settings.AUTO_ADMIN_INCLUDE_APPS == AUTO_ADMIN_INCLUDE_APPS
11-
assert settings.AUTO_ADMIN_EXCLUDE_APPS == AUTO_ADMIN_EXCLUDE_APPS
9+
assert settings.CRUD_API_ENABLED_ALL_APPS == CRUD_API_ENABLED_ALL_APPS
10+
assert settings.CRUD_API_INCLUDE_APPS == CRUD_API_INCLUDE_APPS
11+
assert settings.CRUD_API_EXCLUDE_APPS == CRUD_API_EXCLUDE_APPS

0 commit comments

Comments
 (0)