Skip to content

Commit 33bacc8

Browse files
committed
No errors in logs
1 parent af0a15c commit 33bacc8

6 files changed

Lines changed: 18 additions & 15 deletions

File tree

chats/urls.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@
1616

1717
urlpatterns = [
1818
path("directs/", DirectChatList.as_view(), name="direct-chat-list"),
19-
path("directs/<slug:pk>/", DirectChatDetail.as_view(), name="direct-chat-detail"),
19+
path("directs/<slug:id>/", DirectChatDetail.as_view(), name="direct-chat-detail"),
2020
path(
21-
"directs/<slug:pk>/messages/",
21+
"directs/<slug:id>/messages/",
2222
DirectChatMessageList.as_view(),
2323
name="direct-chat-messages",
2424
),
2525
path(
26-
"directs/<slug:pk>/files/",
26+
"directs/<slug:id>/files/",
2727
DirectChatFileList.as_view(),
2828
name="direct-chat-files",
2929
),
3030
path("projects/", ProjectChatList.as_view(), name="project-chat-list"),
3131
path("projects/<int:pk>/", ProjectChatDetail.as_view(), name="project-chat-detail"),
3232
path(
33-
"projects/<int:pk>/messages/",
33+
"projects/<int:id>/messages/",
3434
ProjectChatMessageList.as_view(),
3535
name="project-chat-messages",
3636
),
3737
path(
38-
"projects/<int:pk>/files/",
38+
"projects/<int:id>/files/",
3939
ProjectChatFileList.as_view(),
4040
name="project-chat-files",
4141
),

chats/views.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ class DirectChatDetail(RetrieveAPIView):
8686

8787
def get(self, request, *args, **kwargs) -> Response:
8888
try:
89-
assert "_" in self.kwargs["pk"], "pk must contain underscore"
89+
assert "_" in self.kwargs["id"], "pk must contain underscore"
9090

91-
user1_id, user2_id = map(int, self.kwargs["pk"].split("_"))
91+
user1_id, user2_id = map(int, self.kwargs["id"].split("_"))
9292

9393
assert (
9494
request.user.id == user1_id or request.user.id == user2_id
@@ -140,7 +140,7 @@ class DirectChatMessageList(ListCreateAPIView):
140140

141141
def get_queryset(self):
142142
return (
143-
self.request.user.direct_chats.get(id=self.kwargs["pk"])
143+
self.request.user.direct_chats.get(id=self.kwargs["id"])
144144
.messages.filter(is_deleted=False)
145145
.order_by("-created_at")
146146
.all()
@@ -155,7 +155,7 @@ class ProjectChatMessageList(ListCreateAPIView):
155155
def get_queryset(self):
156156
try:
157157
return (
158-
ProjectChat.objects.get(id=self.kwargs["pk"])
158+
ProjectChat.objects.get(id=self.kwargs["id"])
159159
.messages.filter(is_deleted=False)
160160
.order_by("-created_at")
161161
.all()
@@ -177,7 +177,8 @@ class DirectChatFileList(ListCreateAPIView):
177177
permission_classes = [IsAuthenticated]
178178

179179
def get_queryset(self):
180-
messages = self.request.user.direct_chats.get(id=self.kwargs["pk"]).messages.all()
180+
181+
messages = self.request.user.direct_chats.get(id=self.kwargs["id"]).messages.all()
181182

182183
return get_all_files(messages)
183184

@@ -188,7 +189,9 @@ class ProjectChatFileList(ListCreateAPIView):
188189

189190
def get_queryset(self):
190191
try:
191-
messages = ProjectChat.objects.get(id=self.kwargs["pk"]).messages.all()
192+
print("PK received:", self.kwargs)
193+
print("PK RECEIVED", self.args)
194+
messages = ProjectChat.objects.get(id=self.kwargs["id"]).messages.all()
192195
return get_all_files(messages)
193196
except ProjectChat.DoesNotExist:
194197
return UserFile.objects.none()

events/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
urlpatterns = [
88
path("", EventsList.as_view()),
99
path("<int:pk>/", EventDetail.as_view()),
10-
path("<int:pk>/registered/", EventRegisteredUsersList.as_view()),
10+
path("<int:id>/registered/", EventRegisteredUsersList.as_view()),
1111
path("types/", EventTypes.as_view()),
1212
]

events/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class EventRegisteredUsersList(generics.ListAPIView):
3434
permission_classes = [IsStaffOrReadOnly]
3535

3636
def get_queryset(self):
37-
users = Event.objects.get(pk=self.kwargs["pk"]).registered_users.all()
37+
users = Event.objects.get(pk=self.kwargs["id"]).registered_users.all()
3838
return users
3939

4040

projects/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
path("steps/", ProjectSteps.as_view()),
3131
path("achievements/", AchievementList.as_view()),
3232
path("achievements/<int:pk>/", AchievementDetail.as_view()),
33-
path("<int:pk>/responses/", ProjectVacancyResponses.as_view()),
33+
path("<int:id>/responses/", ProjectVacancyResponses.as_view()),
3434
]

projects/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class ProjectVacancyResponses(generics.GenericAPIView):
277277
permission_classes = [IsAuthenticated]
278278

279279
def get_queryset(self):
280-
return VacancyResponse.objects.filter(vacancy__project_id=self.kwargs["pk"])
280+
return VacancyResponse.objects.filter(vacancy__project_id=self.kwargs["id"])
281281

282282
def get(self, request, pk):
283283
queryset = self.get_queryset()

0 commit comments

Comments
 (0)