Skip to content

Commit a2863c7

Browse files
committed
refactor: model options
1 parent a9e0506 commit a2863c7

File tree

3 files changed

+24
-17
lines changed

3 files changed

+24
-17
lines changed

easy/controller/admin_auto_api.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
from ninja_extra.permissions import BasePermission
77

88
from easy.controller.base import CrudAPIController
9+
from easy.controller.meta_conf import (
10+
GENERATE_CRUD_ATTR_DEFAULT,
11+
MODEL_FIELDS_ATTR_DEFAULT,
12+
MODEL_JOIN_ATTR_DEFAULT,
13+
MODEL_RECURSIVE_ATTR_DEFAULT,
14+
SENSITIVE_FIELDS_ATTR_DEFAULT,
15+
)
916
from easy.permissions import AdminSitePermission, BaseApiPermission
1017

1118
logger = logging.getLogger(__name__)
@@ -24,11 +31,11 @@ def create_api_controller(
2431
(object,),
2532
{
2633
"model": model,
27-
"generate_crud": True,
28-
"model_fields": "__all__",
29-
"model_recursive": False,
30-
"model_join": True,
31-
"sensitive_fields": ["password", "token"],
34+
"generate_crud": GENERATE_CRUD_ATTR_DEFAULT,
35+
"model_fields": MODEL_FIELDS_ATTR_DEFAULT,
36+
"model_recursive": MODEL_RECURSIVE_ATTR_DEFAULT,
37+
"model_join": MODEL_JOIN_ATTR_DEFAULT,
38+
"sensitive_fields": SENSITIVE_FIELDS_ATTR_DEFAULT,
3239
},
3340
)
3441

easy/controller/meta.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from ninja_extra import ControllerBase, http_delete, http_get, http_patch, http_put
1212
from ninja_extra.pagination import paginate
1313

14-
from easy.controller.meta_conf import ModelOptions
14+
from easy.controller.meta_conf import MODEL_FIELDS_ATTR_DEFAULT, ModelOptions
1515
from easy.domain.orm import CrudModel
1616
from easy.response import BaseApiResponse
1717
from easy.services import BaseService
@@ -113,13 +113,13 @@ class Config:
113113
if model_opts.model_exclude:
114114
model_exclude = model_opts.model_exclude
115115
else:
116-
if model_opts.model_fields == "__all__":
117-
model_fields = "__all__"
116+
if model_opts.model_fields == MODEL_FIELDS_ATTR_DEFAULT:
117+
model_fields = MODEL_FIELDS_ATTR_DEFAULT
118118
else:
119119
model_fields = (
120-
model_opts.model_fields
120+
model_opts.model_fields # type: ignore
121121
if model_opts.model_fields
122-
else "__all__"
122+
else MODEL_FIELDS_ATTR_DEFAULT
123123
)
124124

125125
async def add_obj( # type: ignore

easy/controller/meta_conf.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ def __init__(self, options: object = None):
3030
"""
3131
self.model: Optional[Type[models.Model]] = getattr(options, "model", None)
3232
self.generate_crud: Optional[Union[bool]] = getattr(
33-
options, GENERATE_CRUD_ATTR, True
33+
options, GENERATE_CRUD_ATTR, GENERATE_CRUD_ATTR_DEFAULT
3434
)
35-
self.model_exclude: Optional[Union[str]] = getattr(
36-
options, MODEL_EXCLUDE_ATTR, None
35+
self.model_exclude: Union[Union[str], List[Any]] = getattr(
36+
options, MODEL_EXCLUDE_ATTR, MODEL_EXCLUDE_ATTR_DEFAULT
3737
)
38-
self.model_fields: Optional[Union[str]] = getattr(
39-
options, MODEL_FIELDS_ATTR, "__all__"
38+
self.model_fields: Union[Union[str], List[Any]] = getattr(
39+
options, MODEL_FIELDS_ATTR, MODEL_FIELDS_ATTR_DEFAULT
4040
)
4141
self.model_join: Optional[Union[bool]] = getattr(
42-
options, MODEL_JOIN_ATTR, False
42+
options, MODEL_JOIN_ATTR, MODEL_JOIN_ATTR_DEFAULT
4343
)
4444
self.model_recursive: Optional[Union[bool]] = getattr(
45-
options, MODEL_RECURSIVE_ATTR, False
45+
options, MODEL_RECURSIVE_ATTR, MODEL_RECURSIVE_ATTR_DEFAULT
4646
)
4747
self.sensitive_fields: Optional[Union[str, List[str]]] = getattr(
4848
options, SENSITIVE_FIELDS_ATTR, list(SENSITIVE_FIELDS_ATTR_DEFAULT)

0 commit comments

Comments
 (0)