update viewnames for DRF 3.15 change [#187298296]

setup.py

@@ -58,7 +58,7 @@ def get_package_name(name):
         'django-paypal~=1.1',
         'django-post-office~=3.2',
         'django-timezone-field>=3.1,<7.0',
-        'djangorestframework~=3.9,<3.15.0',
+        'djangorestframework~=3.9',
         'python-dateutil~=2.8.1;python_version<"3.11"',
         'requests>=2.27.1,<2.32.0',
     ],

tests/requirements.txt

@@ -8,7 +8,7 @@ django-paypal==1.1.2
 django-mptt==0.14.0
 django-post-office==3.6.0
 django-timezone-field==6.1.0
-djangorestframework==3.14.0
+djangorestframework==3.15.1
 pre-commit==3.5.0 ; python_version<"3.9"
 pre-commit==3.7.0 ; python_version>="3.9"
 python-dateutil==2.8.2

tests/util.py

@@ -161,6 +161,16 @@ def __init__(self, limit=settings.TRACKER_PAGINATION_LIMIT, offset=0):
         paginator.paginate_queryset(queryset, FakeRequest())
         return paginator.get_paginated_response(data)
 
+    def _get_viewname(self, model_name, action, **kwargs):
+        if 'event_pk' in kwargs:
+            if 'feed' in kwargs:
+                viewname = f'tracker:api_v2:event-{model_name}-feed-{action}'
+            else:
+                viewname = f'tracker:api_v2:event-{model_name}-{action}'
+        else:
+            viewname = f'tracker:api_v2:{model_name}-{action}'
+        return viewname
+
     def get_detail(
         self,
         obj,
@@ -178,7 +188,8 @@ def get_detail(
         assert model_name is not None
         response = self.client.get(
             reverse(
-                f'tracker:api_v2:{model_name}-detail', kwargs={'pk': obj.pk, **kwargs}
+                self._get_viewname(model_name, 'detail', **kwargs),
+                kwargs={'pk': obj.pk, **kwargs},
             ),
             data=data,
         )
@@ -205,7 +216,7 @@ def get_list(
         assert model_name is not None
         response = self.client.get(
             reverse(
-                f'tracker:api_v2:{model_name}-list',
+                self._get_viewname(model_name, 'list', **kwargs),
                 kwargs=kwargs,
             ),
             data=data,
@@ -237,7 +248,7 @@ def get_noun(
         assert model_name is not None
         response = self.client.get(
             reverse(
-                f'tracker:api_v2:{model_name}-{noun}',
+                self._get_viewname(model_name, noun, **kwargs),
                 kwargs=kwargs,
             ),
             data=data,
@@ -285,7 +296,7 @@ def post_noun(
         assert model_name is not None
         response = self.client.post(
             reverse(
-                f'tracker:api_v2:{model_name}-{noun}',
+                self._get_viewname(model_name, noun, **kwargs),
                 kwargs=kwargs,
             ),
             data=data,
@@ -314,7 +325,8 @@ def patch_detail(
         assert model_name is not None
         response = self.client.patch(
             reverse(
-                f'tracker:api_v2:{model_name}-detail', kwargs={'pk': obj.pk, **kwargs}
+                self._get_viewname(model_name, 'detail', **kwargs),
+                kwargs={'pk': obj.pk, **kwargs},
             ),
             data=data,
         )

tracker/api/urls.py

@@ -9,15 +9,19 @@
 router = routers.DefaultRouter()
 
 
-def event_nested_route(path, viewset, *, feed=False, **kwargs):
-    router.register(path, viewset)
+def event_nested_route(path, viewset, *, basename=None, feed=False):
+    if basename is None:
+        basename = router.get_default_basename(viewset)
+    router.register(path, viewset, basename)
     if feed:
         router.register(
             r'events/(?P<event_pk>[^/.]+)/' + path + r'/feed_(?P<feed>\w+)',
             viewset,
-            **kwargs,
+            f'event-{basename}-feed',
         )
-    router.register(r'events/(?P<event_pk>[^/.]+)/' + path, viewset, **kwargs)
+    router.register(
+        r'events/(?P<event_pk>[^/.]+)/' + path, viewset, f'event-{basename}'
+    )
 
 
 # routers generate URLs based on the view sets, so that we don't need to do a bunch of stuff by hand