Merge pull request #269 from eadwinCode/model_controller_prefix

fix: ModelController Prefix With Parameters

Author: eadwinCode

ninja_extra/controllers/base.py

@@ -442,6 +442,19 @@ def __init__(
                 if is_async(_call_back):
                     self.has_auth_async = True
                     break
+        # `_prefix_route_params` a collection of route parameters that are used in the prefix
+        # for example:
+        # `api_controller("/{int:id}/{str:name}/{slug}")` will have `_prefix_route_params` = {"id": int, "name": str, "slug": str}
+        self._prefix_route_params = {}
+        if self._prefix_has_route_param:
+            for match in re.finditer(self._PATH_PARAMETER_COMPONENT_RE, self.prefix):
+                self._prefix_route_params[match.group("parameter")] = match.group(
+                    "converter"
+                )
+
+    @property
+    def prefix_route_params(self) -> Dict[str, str]:
+        return self._prefix_route_params
 
     @property
     def controller_class(self) -> Type["ControllerBase"]:

ninja_extra/controllers/model/builder.py

@@ -4,7 +4,11 @@
 
 from ninja_extra.constants import ROUTE_FUNCTION
 
-from .endpoints import ModelAsyncEndpointFactory, ModelEndpointFactory
+from .endpoints import (
+    ModelAsyncEndpointFactory,
+    ModelEndpointFactory,
+    ModelEndpointFunction,
+)
 from .schemas import ModelConfig
 
 if t.TYPE_CHECKING:
@@ -64,7 +68,7 @@ def _register_create_endpoint(self) -> None:
             **kw,  # type:ignore[arg-type]
         )
 
-        self._add_to_controller(create_item)
+        self._add_to_controller(create_item.setup(self._base_cls))
 
     def _register_update_endpoint(self) -> None:
         _path = "/{%s:%s}" % (
@@ -86,7 +90,7 @@ def _register_update_endpoint(self) -> None:
             **kw,  # type:ignore[arg-type]
         )
 
-        self._add_to_controller(update_item)
+        self._add_to_controller(update_item.setup(self._base_cls))
 
     def _register_patch_endpoint(self) -> None:
         _pk_type = self._pk_type
@@ -110,7 +114,7 @@ def _register_patch_endpoint(self) -> None:
             **kw,  # type:ignore[arg-type]
         )
 
-        self._add_to_controller(patch_item)
+        self._add_to_controller(patch_item.setup(self._base_cls))
 
     def _register_find_one_endpoint(self) -> None:
         _path = "/{%s:%s}" % (
@@ -131,7 +135,7 @@ def _register_find_one_endpoint(self) -> None:
             **kw,  # type:ignore[arg-type]
         )
 
-        self._add_to_controller(get_item)
+        self._add_to_controller(get_item.setup(self._base_cls))
 
     def _register_list_endpoint(self) -> None:
         kw = {
@@ -159,7 +163,7 @@ def _register_list_endpoint(self) -> None:
             **paginate_kwargs,
         )
 
-        self._add_to_controller(list_items)
+        self._add_to_controller(list_items.setup(self._base_cls))
 
     def _register_delete_endpoint(self) -> None:
         _path = "/{%s:%s}" % (
@@ -179,7 +183,7 @@ def _register_delete_endpoint(self) -> None:
             **kw,  # type:ignore[arg-type]
         )
 
-        self._add_to_controller(delete_item)
+        self._add_to_controller(delete_item.setup(self._base_cls))
 
     def register_model_routes(self) -> None:
         for action in self._config.allowed_routes:
@@ -191,3 +195,11 @@ def register_model_routes(self) -> None:
                     f"is not recognized as ModelController action"
                 )
             action_registration()
+
+        # check for ModelEndpointFunction in the base_cls
+        for attr_name in dir(self._base_cls):
+            attr = getattr(self._base_cls, attr_name)
+            if isinstance(attr, ModelEndpointFunction):
+                self._add_to_controller(attr.setup(self._base_cls))
+                # remove the attribute from the base_cls
+                delattr(self._base_cls, attr_name)