Merge pull request #318 from eadwinCode/revert_controller_url_namespace

Revert controller url namespace

Author: eadwinCode

ninja_extra/__init__.py

@@ -1,6 +1,6 @@
 """Django Ninja Extra - Class Based Utility and more for Django Ninja(Fast Django REST framework)"""
 
-__version__ = "0.30.5"
+__version__ = "0.30.6"
 
 import django
 

ninja_extra/controllers/base.py

@@ -501,10 +501,9 @@ def __call__(self, cls: ControllerClassType) -> ControllerClassType:
             self.tags = [class_name]
 
         self._controller_class = cls
-        if not self.urls_namespace:
-            # if urls_namespace is not provided, use the class name as the namespace
-            self.urls_namespace = class_name
-
+        # if not self.urls_namespace:
+        #     # if urls_namespace is not provided, use the class name as the namespace
+        #     self.urls_namespace = class_name
         if issubclass(cls, ModelControllerBase):
             if cls.model_config:
                 assert cls.service_type is not None, (
@@ -563,7 +562,6 @@ def add_controller_route_function(self, route_function: RouteFunction) -> None:
 
     def urls_paths(self, prefix: str) -> Iterator[Union[URLPattern, URLResolver]]:
         namespaced_patterns: List[URLPattern] = []
-        assert self.urls_namespace, "urls_namespace is required"
 
         for path, path_view in self.path_operations.items():
             path = path.replace("{", "<").replace("}", ">")
@@ -575,14 +573,14 @@ def urls_paths(self, prefix: str) -> Iterator[Union[URLPattern, URLResolver]]:
             for op in path_view.operations:
                 op = cast(Operation, op)
                 view = path_view.get_view()
-                if op.url_name:
-                    pattern = django_path(route, view, name=op.url_name)
-                else:
-                    pattern = django_path(route, view)
+                pattern = django_path(route, view, name=op.url_name)
 
-                namespaced_patterns.append(pattern)
+                if self.urls_namespace:
+                    namespaced_patterns.append(pattern)
+                else:
+                    yield pattern
 
-        if namespaced_patterns:
+        if namespaced_patterns and self.urls_namespace:
             yield django_path(
                 "",
                 include(

tests/test_controller.py

@@ -380,4 +380,4 @@ def test_namespaced_controller_detail(client):
 
 
 def test_default_url_name(client):
-    assert reverse("api-1.0.0:event:get_event", kwargs={"id": 5}) == "/api/events/5"
+    assert reverse("api-1.0.0:get_event", kwargs={"id": 5}) == "/api/events/5"

tests/test_django_model.py

@@ -26,9 +26,9 @@ def test_with_client(client: Client):
 
 def test_reverse():
     # check that url reversing works
-    assert reverse("api-1.0.0:event:event-create-url-name") == "/api/events"
-    assert reverse("api-1.0.0:event:event-list") == "/api/events"
-    assert reverse("api-1.0.0:event:event-list-2") == "/api/events/list"
+    assert reverse("api-1.0.0:event-create-url-name") == "/api/events"
+    assert reverse("api-1.0.0:event-list") == "/api/events"
+    assert reverse("api-1.0.0:event-list-2") == "/api/events/list"
 
 
 def json_payload(data):