fix: Correct url prefixes to use full-words and not as "chars" in regex or names

ref: #1190

Author: jon-nfc

app/access/urls_api.py

@@ -32,12 +32,12 @@
 router.register('', access_v2.Index, basename = '_api_access_home')
 
 router.register(
-    prefix = '/(?P<model_name>[company]+)', viewset = entity.ViewSet,
+    prefix = '/(?P<model_name>(company)+)', viewset = entity.ViewSet,
     basename = '_api_v2_company'
 )
 
 router.register(
-    prefix=f'/entity/(?P<model_name>[{entity_type_names}]+)?', viewset = entity.ViewSet,
+    prefix=f'/entity/(?P<model_name>({entity_type_names})+)?', viewset = entity.ViewSet,
     basename = '_api_entity_sub'
 )
 

app/accounting/urls.py

@@ -42,7 +42,7 @@ def get_view_name(self):
 if not asset_type_names:
     asset_type_names = 'none'
 
-router.register(f'/asset/(?P<model_name>[{asset_type_names}]+)?', asset.ViewSet, feature_flag = '2025-00004', basename='_api_asset_sub')
+router.register(f'/asset/(?P<model_name>({asset_type_names})+)?', asset.ViewSet, feature_flag = '2025-00004', basename='_api_asset_sub')
 router.register('/asset', asset.NoDocsViewSet, feature_flag = '2025-00004', basename='_api_asset')
 
 urlpatterns = router.urls

app/api/urls_v2.py

@@ -43,7 +43,7 @@
 
     if getattr(model, '_audit_enabled', False):
 
-        history_type_names += str(model().get_history_model_name()).lower() + '|'
+        history_type_names += str(model().get_history_model_name()).lower()[:-12] + '|'
 
         if model._meta.app_label not in history_app_labels:
 
@@ -52,15 +52,15 @@
 
     if getattr(model, '_notes_enabled', False):
 
-        notes_type_names += str(f'{model._meta.object_name}CenturionModelNote').lower() + '|'
+        notes_type_names += str(f'{model._meta.object_name}').lower() + '|'
 
         if model._meta.app_label not in notes_app_labels:
 
             notes_app_labels += model._meta.app_label + '|'
 
     if getattr(model, '_ticket_linkable', False):
 
-        ticket_model_links_type_names += str(f'{model._meta.object_name}Ticket').lower() + '|'
+        ticket_model_links_type_names += str(f'{model._meta.object_name}').lower() + '|'
 
         if model._meta.app_label not in ticket_model_links_app_labels:
 
@@ -106,29 +106,29 @@
 
 
 router.register(
-    prefix = f'/(?P<app_label>[{history_app_labels}]+)/(?P<model_name>[{history_type_names} \
-        ]+)/(?P<model_id>[0-9]+)/history',
+    prefix = (f'/(?P<app_label>({history_app_labels})+)/(?P<model_name>({history_type_names}'
+        ')+)/(?P<model_id>[0-9]+)/history'),
     viewset = audit_history.ViewSet,
     basename = '_api_centurionaudit_sub'
 )
 
 router.register(
-    prefix = f'/(?P<app_label>[{notes_app_labels}]+)/(?P<model_name>[{notes_type_names} \
-        ]+)/(?P<model_id>[0-9]+)/notes',
+    prefix = (f'/(?P<app_label>({notes_app_labels})+)/(?P<model_name>({notes_type_names}'
+        ')+)/(?P<model_id>[0-9]+)/notes'),
     viewset = centurion_model_notes.ViewSet,
     basename = '_api_centurionmodelnote_sub'
 )
 
 router.register(
-    prefix = f'/(?P<app_label>[{ticket_model_links_app_labels} \
-        ]+)/(?P<model_name>[{ticket_model_links_type_names}]+)/(?P<model_id>[0-9]+)/tickets',
+    prefix = (f'/(?P<app_label>({ticket_model_links_app_labels}'
+        f')+)/(?P<model_name>({ticket_model_links_type_names})+)/(?P<model_id>[0-9]+)/tickets'),
     viewset = ticket_model_link.ViewSet,
     basename = '_api_modelticket_sub'
 )
 
 router.register(
-    prefix = f'/(?P<app_label>[{ticket_app_names} \
-        ]+)/ticket/(?P<model_name>[{ticket_type_names}]+)',
+    prefix = f'/(?P<app_label>({ticket_app_names} \
+        )+)/ticket/(?P<model_name>({ticket_type_names})+)',
     viewset = ticket.ViewSet,
     basename = '_api_ticketbase_sub'
 )

app/core/serializers/ticketcommentbase.py

@@ -95,7 +95,7 @@ def get_url(self, item) -> dict:
                         request = None,
                         kwargs={
                             'ticket_id': ticket_id,
-                            'model_name': 'comment',
+                            'model_name': 'ticketcommentbase',
                             'parent_id': item.id
                         }
                     )

app/core/urls_api.py

@@ -71,8 +71,8 @@
     basename = '_api_ticket_comment_base_thread'
 )
 router.register(
-    prefix=f'/ticket/(?P<ticket_id>[0-9]+)/(?P<model_name>[{ticket_comment_names} \
-        ]+)/(?P<parent_id>[0-9]+)/threads',
+    prefix=(f'/ticket/(?P<ticket_id>[0-9]+)/(?P<model_name>({ticket_comment_names}'
+        ')+)/(?P<parent_id>[0-9]+)/threads'),
     viewset = ticket_comment.ViewSet,
     basename = '_api_ticket_comment_base_thread_sub'
 )
@@ -90,21 +90,21 @@
     basename = '_api_v2_ticket_linked_item'
 )
 router.register(
-    prefix=f'/ticket/(?P<model_name>[{ticket_type_names}]+)/(?P<model_id>[0-9]+)/models', viewset = ticket_model_link.ViewSet,
+    prefix=f'/ticket/(?P<model_name>({ticket_type_names})+)/(?P<model_id>[0-9]+)/models', viewset = ticket_model_link.ViewSet,
     basename = '_api_modelticket'
 )
 router.register(
     prefix = '/ticket/(?P<ticket_id>[0-9]+)/related_ticket', viewset = related_ticket.ViewSet,
     basename = '_api_v2_ticket_related'
 )
 router.register(
-    prefix=f'/ticket/(?P<ticket_id>[0-9]+)/(?P<model_name>[{ticket_comment_names}]+)',
+    prefix=f'/ticket/(?P<ticket_id>[0-9]+)/(?P<model_name>({ticket_comment_names})+)',
     viewset = ticket_comment.ViewSet,
     basename = '_api_ticket_comment_base_sub'
 )
 router.register(
-    prefix=f'/ticket/(?P<ticket_id>[0-9]+)/(?P<model_name>[{ticket_comment_names} \
-        ]+)/(?P<parent_id>[0-9]+)/threads',
+    prefix=(f'/ticket/(?P<ticket_id>[0-9]+)/(?P<model_name>({ticket_comment_names}'
+        ')+)/(?P<parent_id>[0-9]+)/threads'),
     viewset = ticket_comment.ViewSet,
     basename = '_api_ticket_comment_base_sub_thread'
 )

app/itam/urls_api.py

@@ -34,9 +34,13 @@
     basename = '_api_v2_itam_home'
 )
 router.register(
-    prefix = '/(?P<model_name>[itamassetbase]+)', viewset = asset.ViewSet,
+    prefix = '/(?P<model_name>(itamassetbase)+)', viewset = asset.ViewSet,
     feature_flag = '2025-00007', basename = '_api_itamassetbase'
 )
+router.register(
+    prefix = '/(?P<model_name>(itamassetbase)+)', viewset = asset.ViewSet,
+    feature_flag = '2025-00007', basename = '_api_itamassetbase_sub'
+)
 router.register(
     prefix = '/device', viewset = device.ViewSet,
     basename = '_api_device'

app/project_management/urls_api.py

@@ -57,7 +57,7 @@
 )
 
 router.register(
-    prefix = f'/project/(?P<project_id>[0-9]+)/ticket/(?P<model_name>[{ticket_type_names}]+)',
+    prefix = f'/project/(?P<project_id>[0-9]+)/ticket/(?P<model_name>({ticket_type_names})+)',
     viewset = ticket.ViewSet,
     basename = '_api_project_ticket_sub'
 )