Skip to content

Commit afa57c1

Browse files
committed
chats fix
1 parent e035056 commit afa57c1

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

chats/views.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ def get(self, request, *args, **kwargs) -> Response:
117117
except ValueError:
118118
return Response(
119119
status=status.HTTP_400_BAD_REQUEST,
120-
data={"detail": "processed id must contain two integers separated by underscore"},
120+
data={
121+
"detail": "processed id must contain two integers separated by underscore"
122+
},
121123
)
122124
except AssertionError as e:
123125
return Response(status=status.HTTP_400_BAD_REQUEST, data={"detail": str(e)})
@@ -223,10 +225,16 @@ def get(self, request, *args, **kwargs):
223225
project_chats = user.get_project_chats().prefetch_related("messages")
224226

225227
has_direct_messages_unread = (
226-
direct_messages.filter(messages__is_read=False).distinct().exists()
228+
direct_messages.filter(messages__is_read=False)
229+
.exclude(messages__is_deleted=True)
230+
.distinct()
231+
.exists()
227232
)
228233
has_project_messages_unread = (
229-
project_chats.filter(messages__is_read=False).distinct().exists()
234+
project_chats.filter(messages__is_read=False)
235+
.exclude(messages__is_deleted=True)
236+
.distinct()
237+
.exists()
230238
)
231239
return Response(
232240
{"has_unreads": has_direct_messages_unread or has_project_messages_unread}

0 commit comments

Comments
 (0)