From 610e4665a6f57e9848ec46330bb893c2af734c05 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 12 Jun 2025 12:22:17 +0930 Subject: [PATCH] refactor(itam): Update URL route name for SoftwareCategory model ref: #823 #820 --- app/itam/serializers/software_category.py | 2 +- .../software_category/test_software_category_viewset.py | 2 +- .../unit/software_category/test_software_category_api_v2.py | 2 +- .../software_category/test_unit_software_category_viewset.py | 2 +- app/settings/urls_api.py | 2 +- app/settings/viewsets/index.py | 2 +- docs/projects/centurion_erp/user/core/markdown.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/itam/serializers/software_category.py b/app/itam/serializers/software_category.py index 0caadb41..d83f4132 100644 --- a/app/itam/serializers/software_category.py +++ b/app/itam/serializers/software_category.py @@ -17,7 +17,7 @@ class SoftwareCategoryBaseSerializer(serializers.ModelSerializer): return str( item ) url = serializers.HyperlinkedIdentityField( - view_name="v2:_api_v2_software_category-detail", format="html" + view_name="v2:_api_softwarecategory-detail", format="html" ) class Meta: diff --git a/app/itam/tests/functional/software_category/test_software_category_viewset.py b/app/itam/tests/functional/software_category/test_software_category_viewset.py index 5b46f1d6..3d6b102b 100644 --- a/app/itam/tests/functional/software_category/test_software_category_viewset.py +++ b/app/itam/tests/functional/software_category/test_software_category_viewset.py @@ -27,7 +27,7 @@ class ViewSetBase: app_namespace = 'v2' - url_name = '_api_v2_software_category' + url_name = '_api_softwarecategory' change_data = {'name': 'device-change'} diff --git a/app/itam/tests/unit/software_category/test_software_category_api_v2.py b/app/itam/tests/unit/software_category/test_software_category_api_v2.py index ba86f2a3..1883ff9e 100644 --- a/app/itam/tests/unit/software_category/test_software_category_api_v2.py +++ b/app/itam/tests/unit/software_category/test_software_category_api_v2.py @@ -77,7 +77,7 @@ class SoftwareCategoryAPI( ) client = Client() - url = reverse('v2:_api_v2_software_category-detail', kwargs=self.url_view_kwargs) + url = reverse('v2:_api_softwarecategory-detail', kwargs=self.url_view_kwargs) client.force_login(self.view_user) diff --git a/app/itam/tests/unit/software_category/test_unit_software_category_viewset.py b/app/itam/tests/unit/software_category/test_unit_software_category_viewset.py index e9be5ea1..1747c065 100644 --- a/app/itam/tests/unit/software_category/test_unit_software_category_viewset.py +++ b/app/itam/tests/unit/software_category/test_unit_software_category_viewset.py @@ -15,7 +15,7 @@ class SoftwareCategoryViewsetList( viewset = ViewSet - route_name = 'v2:_api_v2_software_category' + route_name = 'v2:_api_softwarecategory' @classmethod diff --git a/app/settings/urls_api.py b/app/settings/urls_api.py index 5952b882..0181a5d5 100644 --- a/app/settings/urls_api.py +++ b/app/settings/urls_api.py @@ -99,7 +99,7 @@ router.register( ) router.register( prefix = 'software_category', viewset = software_category_v2.ViewSet, - basename = '_api_v2_software_category' + basename = '_api_softwarecategory' ) router.register( prefix = 'ticket_category', diff --git a/app/settings/viewsets/index.py b/app/settings/viewsets/index.py index 6602c7c3..65e41cec 100644 --- a/app/settings/viewsets/index.py +++ b/app/settings/viewsets/index.py @@ -118,7 +118,7 @@ class Index(IndexViewset): "port": reverse('v2:_api_v2_port-list', request=request), "project_state": reverse('v2:_api_v2_project_state-list', request=request), "project_type": reverse('v2:_api_v2_project_type-list', request=request), - "software_category": reverse('v2:_api_v2_software_category-list', request=request), + "software_category": reverse('v2:_api_softwarecategory-list', request=request), "ticket_category": reverse('v2:_api_ticketcategory-list', request=request), "ticket_comment_category": reverse('v2:_api_ticketcommentcategory-list', request=request), "user_settings": reverse( diff --git a/docs/projects/centurion_erp/user/core/markdown.md b/docs/projects/centurion_erp/user/core/markdown.md index e7449be4..fd439886 100644 --- a/docs/projects/centurion_erp/user/core/markdown.md +++ b/docs/projects/centurion_erp/user/core/markdown.md @@ -102,7 +102,7 @@ A Model link is a reference to an item within the database. Supported model link | [role](../access/role.md)| `$role-` | | service| `$service-` | | software| `$software-` | -| softwarecategory| `$-` | +| softwarecategory| `$software_category-` | | softwareversion| `$software_version-` | | team| `$team-` | | ticketcategory| `$ticket_category-` |