lint: options

Author: freemindcore

easy/controller/meta.py

@@ -25,10 +25,8 @@ class CrudAPI(CrudModel, ABC):
     def __init__(self, service=None):  # type: ignore
         # Critical to set __Meta
         self.service = service
-        if self.service:
-            self.model = self.service.model
 
-        _model_opts: ModelOptions = ModelOptions.get_model_options(self.__class__)
+        _model_opts: ModelOptions = ModelOptions.get_model_options(self.Meta)
         if self.model and _model_opts:
             ModelOptions.set_model_meta(self.model, _model_opts)
 
@@ -40,8 +38,8 @@ def __init__(self, service=None):  # type: ignore
 class CrudApiMetaclass(ABCMeta):
     def __new__(mcs, name: str, bases: Tuple[Type[Any], ...], attrs: dict) -> Any:
         # Get configs from Meta
-        _temp_cls: Type = super().__new__(mcs, name, (object,), attrs)
-        model_opts: ModelOptions = ModelOptions.get_model_options(_temp_cls)
+        attrs_meta = attrs.get("Meta", None)
+        model_opts: ModelOptions = ModelOptions.get_model_options(attrs_meta)
 
         # Get all attrs from parents excluding private ones
         def is_private_attrs(attr_name: str) -> Optional[Match[str]]:

easy/controller/meta_conf.py

@@ -1,8 +1,8 @@
-from typing import Any, List, Optional, Type, Union
+from typing import Any, Dict, List, Optional, Type, Union
 
 from django.db import models
 
-META_ATTRIBUTE_NAME: str = "__EASY_API_META__"
+META_ATTRIBUTE_NAME: str = "_easy_api_meta_"
 
 GENERATE_CRUD_ATTR: str = "generate_crud"
 GENERATE_CRUD_ATTR_DEFAULT = True
@@ -24,7 +24,7 @@
 
 
 class ModelOptions:
-    def __init__(self, options: object = None):
+    def __init__(self, options: Dict = None):
         """
         Configuration reader
         """
@@ -49,8 +49,8 @@ def __init__(self, options: object = None):
         )
 
     @classmethod
-    def get_model_options(cls, klass: Type) -> Any:
-        return ModelOptions(getattr(klass, "Meta", None))
+    def get_model_options(cls, meta: Dict) -> Any:
+        return ModelOptions(meta)
 
     @classmethod
     def set_model_meta(

easy/domain/orm.py

@@ -13,6 +13,8 @@
 
 
 class CrudModel(object):
+    Meta: Dict = {}
+
     def __init__(self, model: Any):
         self.model = model
 
@@ -58,7 +60,7 @@ def __init__(self, model: Type[models.Model]):
                 and ((_field not in exclude_list) if exclude_list else True)
             )
         )
-        super().__init__(model)
+        super().__init__(self.model)
 
     def _separate_payload(self, payload: Dict) -> Tuple[Dict, Dict]:
         m2m_fields = {}

easy/permissions/adminsite.py

@@ -24,7 +24,7 @@ def has_permission(
         model: models.Model = cast(models.Model, getattr(controller, "model", None))
         if model:
             app: str = model._meta.app_label
-            model_name = model.__name__.lower()
+            model_name = model._meta.model_name
             if request.method in ("GET", "OPTIONS"):
                 has_perm = user.has_perm(f"{app}.view_{model_name}")  # type: ignore