Skip to content

Commit 9e13647

Browse files
authored
Merge pull request #188 from PROCOLLAB-github/dev
Пофиксил 500-ки в чатах драфтовых проеектов
2 parents a9c4787 + e800337 commit 9e13647

1 file changed

Lines changed: 15 additions & 9 deletions

File tree

chats/views.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
DirectChatDetailSerializer,
2323
)
2424
from chats.utils import get_all_files
25+
from files.models import UserFile
2526
from files.serializers import UserFileSerializer
2627

2728
User = get_user_model()
@@ -124,12 +125,15 @@ class ProjectChatMessageList(ListCreateAPIView):
124125
pagination_class = MessageListPagination
125126

126127
def get_queryset(self):
127-
return (
128-
ProjectChat.objects.get(id=self.kwargs["pk"])
129-
.messages.filter(is_deleted=False)
130-
.order_by("-created_at")
131-
.all()
132-
)
128+
try:
129+
return (
130+
ProjectChat.objects.get(id=self.kwargs["pk"])
131+
.messages.filter(is_deleted=False)
132+
.order_by("-created_at")
133+
.all()
134+
)
135+
except ProjectChat.DoesNotExist:
136+
return ProjectChat.objects.none()
133137

134138
def post(self, request, *args, **kwargs):
135139
# TODO: try to create a message in a chat. If chat doesn't exist, create it and then create a message.
@@ -155,6 +159,8 @@ class ProjectChatFileList(ListCreateAPIView):
155159
permission_classes = [IsProjectChatMember]
156160

157161
def get_queryset(self):
158-
messages = ProjectChat.objects.get(id=self.kwargs["pk"]).messages.all()
159-
160-
return get_all_files(messages)
162+
try:
163+
messages = ProjectChat.objects.get(id=self.kwargs["pk"]).messages.all()
164+
return get_all_files(messages)
165+
except ProjectChat.DoesNotExist:
166+
return UserFile.objects.none()

0 commit comments

Comments
 (0)