From 666511b7f45a68212a2a3cddfb3bc40339652609 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Sun, 8 Jun 2025 13:52:35 +0930
Subject: [PATCH] test(access): Update Tenant URL route basename

ref: #805 #790
---
 app/access/serializers/organization.py                     | 4 ++--
 app/access/urls_api.py                                     | 6 +++---
 app/access/viewsets/index.py                               | 2 +-
 app/assistance/serializers/knowledge_base.py               | 2 +-
 app/assistance/serializers/knowledge_base_category.py      | 2 +-
 app/config_management/serializers/config_group.py          | 2 +-
 app/config_management/serializers/config_group_software.py | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/access/serializers/organization.py b/app/access/serializers/organization.py
index efd19f3e..8fd41c2f 100644
--- a/app/access/serializers/organization.py
+++ b/app/access/serializers/organization.py
@@ -20,7 +20,7 @@ class TenantBaseSerializer(serializers.ModelSerializer):
         return str( item )
 
     url = serializers.HyperlinkedIdentityField(
-        view_name="v2:_api_v2_organization-detail", format="html"
+        view_name="v2:_api_organization-detail", format="html"
     )
 
     class Meta:
@@ -68,7 +68,7 @@ class TenantModelSerializer(
             #         'model_id': item.pk
             #     }
             # ),
-            'teams': reverse("v2:_api_v2_organization_team-list", request=self._context['view'].request, kwargs={'organization_id': item.pk}),
+            'teams': reverse("v2:_api_organization_team-list", request=self._context['view'].request, kwargs={'organization_id': item.pk}),
         }
 
     model_notes = centurion_field.MarkdownField( required = False )
diff --git a/app/access/urls_api.py b/app/access/urls_api.py
index 07bfc699..e8715030 100644
--- a/app/access/urls_api.py
+++ b/app/access/urls_api.py
@@ -5,7 +5,7 @@ from centurion_feature_flag.urls.routers import DefaultRouter
 from access.viewsets import (
     entity,
     index as access_v2,
-    organization as organization_v2,
+    organization,
     role,
     team as team_v2,
     team_user as team_user_v2
@@ -54,8 +54,8 @@ router.register(
 # )
 
 router.register(
-    prefix = 'tenant', viewset = organization_v2.ViewSet,
-    basename = '_api_v2_organization'
+    prefix = 'tenant', viewset = organization.ViewSet,
+    basename = '_api_organization'
 )
 
 # router.register(
diff --git a/app/access/viewsets/index.py b/app/access/viewsets/index.py
index 4c85926d..b42f1530 100644
--- a/app/access/viewsets/index.py
+++ b/app/access/viewsets/index.py
@@ -24,7 +24,7 @@ class Index(IndexViewset):
     def list(self, request, pk=None):
 
         response = {
-                "organization": reverse('v2:_api_v2_organization-list', request=request),
+                "organization": reverse('v2:_api_organization-list', request=request),
             }
 
         if self.request.feature_flag['2025-00002']:
diff --git a/app/assistance/serializers/knowledge_base.py b/app/assistance/serializers/knowledge_base.py
index bd9a4fb0..228bcbf7 100644
--- a/app/assistance/serializers/knowledge_base.py
+++ b/app/assistance/serializers/knowledge_base.py
@@ -73,7 +73,7 @@ class KnowledgeBaseModelSerializer(
                 request=self.context['view'].request,
             ),
             'organization': reverse(
-                'v2:_api_v2_organization-list',
+                'v2:_api_organization-list',
                 request=self.context['view'].request,
             ),
             'team': reverse(
diff --git a/app/assistance/serializers/knowledge_base_category.py b/app/assistance/serializers/knowledge_base_category.py
index b20c21b1..bf1db71b 100644
--- a/app/assistance/serializers/knowledge_base_category.py
+++ b/app/assistance/serializers/knowledge_base_category.py
@@ -65,7 +65,7 @@ class KnowledgeBaseCategoryModelSerializer(
 
         get_url.update({
             'organization': reverse(
-                'v2:_api_v2_organization-list',
+                'v2:_api_organization-list',
                 request=self.context['view'].request,
             ),
             'team': reverse(
diff --git a/app/config_management/serializers/config_group.py b/app/config_management/serializers/config_group.py
index 191ede04..45ba7f42 100644
--- a/app/config_management/serializers/config_group.py
+++ b/app/config_management/serializers/config_group.py
@@ -85,7 +85,7 @@ class ConfigGroupModelSerializer(
                 }
             ),
             'organization': reverse(
-                'v2:_api_v2_organization-list',
+                'v2:_api_organization-list',
                 request=self.context['view'].request,
             ),
             'parent': reverse(
diff --git a/app/config_management/serializers/config_group_software.py b/app/config_management/serializers/config_group_software.py
index be306ea2..5cf54ccc 100644
--- a/app/config_management/serializers/config_group_software.py
+++ b/app/config_management/serializers/config_group_software.py
@@ -66,7 +66,7 @@ class ConfigGroupSoftwareModelSerializer(
 
         get_url.update({
             'organization': reverse(
-                'v2:_api_v2_organization-list',
+                'v2:_api_organization-list',
                 request=self.context['view'].request,
             ),
             'softwareversion': 'ToDo',