Merge pull request #246 from PROCOLLAB-github/swagger-doc-fix

quick merge

Author: LolAnthony

chats/urls.py

@@ -16,26 +16,26 @@
 
 urlpatterns = [
     path("directs/", DirectChatList.as_view(), name="direct-chat-list"),
-    path("directs/<slug:pk>/", DirectChatDetail.as_view(), name="direct-chat-detail"),
+    path("directs/<slug:id>/", DirectChatDetail.as_view(), name="direct-chat-detail"),
     path(
-        "directs/<slug:pk>/messages/",
+        "directs/<slug:id>/messages/",
         DirectChatMessageList.as_view(),
         name="direct-chat-messages",
     ),
     path(
-        "directs/<slug:pk>/files/",
+        "directs/<slug:id>/files/",
         DirectChatFileList.as_view(),
         name="direct-chat-files",
     ),
     path("projects/", ProjectChatList.as_view(), name="project-chat-list"),
     path("projects/<int:pk>/", ProjectChatDetail.as_view(), name="project-chat-detail"),
     path(
-        "projects/<int:pk>/messages/",
+        "projects/<int:id>/messages/",
         ProjectChatMessageList.as_view(),
         name="project-chat-messages",
     ),
     path(
-        "projects/<int:pk>/files/",
+        "projects/<int:id>/files/",
         ProjectChatFileList.as_view(),
         name="project-chat-files",
     ),

chats/views.py

@@ -86,9 +86,9 @@ class DirectChatDetail(RetrieveAPIView):
 
     def get(self, request, *args, **kwargs) -> Response:
         try:
-            assert "_" in self.kwargs["pk"], "pk must contain underscore"
+            assert "_" in self.kwargs["id"], "pk must contain underscore"
 
-            user1_id, user2_id = map(int, self.kwargs["pk"].split("_"))
+            user1_id, user2_id = map(int, self.kwargs["id"].split("_"))
 
             assert (
                 request.user.id == user1_id or request.user.id == user2_id
@@ -140,7 +140,7 @@ class DirectChatMessageList(ListCreateAPIView):
 
     def get_queryset(self):
         return (
-            self.request.user.direct_chats.get(id=self.kwargs["pk"])
+            self.request.user.direct_chats.get(id=self.kwargs["id"])
             .messages.filter(is_deleted=False)
             .order_by("-created_at")
             .all()
@@ -155,7 +155,7 @@ class ProjectChatMessageList(ListCreateAPIView):
     def get_queryset(self):
         try:
             return (
-                ProjectChat.objects.get(id=self.kwargs["pk"])
+                ProjectChat.objects.get(id=self.kwargs["id"])
                 .messages.filter(is_deleted=False)
                 .order_by("-created_at")
                 .all()
@@ -177,7 +177,8 @@ class DirectChatFileList(ListCreateAPIView):
     permission_classes = [IsAuthenticated]
 
     def get_queryset(self):
-        messages = self.request.user.direct_chats.get(id=self.kwargs["pk"]).messages.all()
+
+        messages = self.request.user.direct_chats.get(id=self.kwargs["id"]).messages.all()
 
         return get_all_files(messages)
 
@@ -188,7 +189,7 @@ class ProjectChatFileList(ListCreateAPIView):
 
     def get_queryset(self):
         try:
-            messages = ProjectChat.objects.get(id=self.kwargs["pk"]).messages.all()
+            messages = ProjectChat.objects.get(id=self.kwargs["id"]).messages.all()
             return get_all_files(messages)
         except ProjectChat.DoesNotExist:
             return UserFile.objects.none()

events/urls.py

@@ -7,6 +7,6 @@
 urlpatterns = [
     path("", EventsList.as_view()),
     path("<int:pk>/", EventDetail.as_view()),
-    path("<int:pk>/registered/", EventRegisteredUsersList.as_view()),
+    path("<int:id>/registered/", EventRegisteredUsersList.as_view()),
     path("types/", EventTypes.as_view()),
 ]

events/views.py

@@ -34,7 +34,7 @@ class EventRegisteredUsersList(generics.ListAPIView):
     permission_classes = [IsStaffOrReadOnly]
 
     def get_queryset(self):
-        users = Event.objects.get(pk=self.kwargs["pk"]).registered_users.all()
+        users = Event.objects.get(pk=self.kwargs["id"]).registered_users.all()
         return users
 
 

projects/urls.py

@@ -30,5 +30,5 @@
     path("steps/", ProjectSteps.as_view()),
     path("achievements/", AchievementList.as_view()),
     path("achievements/<int:pk>/", AchievementDetail.as_view()),
-    path("<int:pk>/responses/", ProjectVacancyResponses.as_view()),
+    path("<int:id>/responses/", ProjectVacancyResponses.as_view()),
 ]

projects/views.py

@@ -277,7 +277,7 @@ class ProjectVacancyResponses(generics.GenericAPIView):
     permission_classes = [IsAuthenticated]
 
     def get_queryset(self):
-        return VacancyResponse.objects.filter(vacancy__project_id=self.kwargs["pk"])
+        return VacancyResponse.objects.filter(vacancy__project_id=self.kwargs["id"])
 
     def get(self, request, pk):
         queryset = self.get_queryset()