Merge pull request #119 from PROCOLLAB-github/dev

Supermassive PR - too much fixes and features

Author: yakser

.gitignore

@@ -135,5 +135,4 @@ dmypy.json
 
 cache
 
-static
 staticfiles

chats/consumers/chat.py

@@ -205,8 +205,3 @@ async def __process_general_event(self, event: Event, room_name: str):
             # await self.close(200)
         else:
             raise ValueError("Unknown event type")
-
-
-class NotificationConsumer(AsyncJsonWebsocketConsumer):
-    # TODO: implement this
-    pass

chats/consumers/event_types/DirectEvent.py

@@ -1,7 +1,11 @@
 from chats.models import DirectChatMessage, DirectChat
 from chats.websockets_settings import Event, EventType
 from asgiref.sync import sync_to_async
-from chats.exceptions import WrongChatIdException, UserNotMessageAuthorException
+from chats.exceptions import (
+    WrongChatIdException,
+    UserNotMessageAuthorException,
+    UserIsNotAuthor,
+)
 from django.core.cache import cache
 from chats.utils import (
     get_user_channel_cache_key,
@@ -80,7 +84,7 @@ async def process_read_message_event(self, event: Event, room_name: str):
         msg = await sync_to_async(DirectChatMessage.objects.get)(
             pk=event.content["message_id"]
         )
-        if msg.chat_id != chat_id or msg.author_id != other_user:
+        if msg.chat_id != chat_id or msg.author_id != other_user.id:
             raise WrongChatIdException(
                 "Some of chat/message ids are wrong, you can't access this message"
             )
@@ -106,6 +110,10 @@ async def process_delete_message_event(self, event: Event, room_name: str):
         message_id = event.content["message_id"]
 
         message = await sync_to_async(DirectChatMessage.objects.get)(pk=message_id)
+
+        if self.user.id != message.author_id:
+            raise UserIsNotAuthor(f"User {self.user.id} is not author {message.text}")
+
         message.is_deleted = True
         await sync_to_async(message.save)()
 

chats/consumers/event_types/ProjectEvent.py

@@ -6,6 +6,7 @@
     WrongChatIdException,
     UserNotInChatException,
     UserNotMessageAuthorException,
+    UserIsNotAuthor,
 )
 
 from chats.serializers import (
@@ -74,7 +75,10 @@ async def process_read_message_event(self, event: Event, room_name: str):
             raise UserNotInChatException(
                 f"User {self.user.id} is not in project chat {msg.chat_id}"
             )
-        if msg.chat_id != event.content["chat_id"]:
+        same_chat = await sync_to_async(ProjectChat.objects.get)(
+            pk=event.content["chat_id"]
+        )
+        if msg.chat_id != same_chat.id:
             raise WrongChatIdException(
                 "Some of chat/message ids are wrong, you can't access this message"
             )
@@ -107,6 +111,9 @@ async def process_delete_message_event(self, event: Event, room_name: str):
         message = await sync_to_async(ProjectChatMessage.objects.get)(
             pk=event.content["message_id"]
         )
+
+        if self.user.id != message.author_id:
+            raise UserIsNotAuthor(f"User {self.user.id} is not author {chat_id}")
         message.is_deleted = True
         await sync_to_async(message.save)()
 

chats/consumers/notification.py

@@ -1,5 +1,6 @@
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
 
 
-class ChatConsumer(AsyncJsonWebsocketConsumer):
+class NotificationConsumer(AsyncJsonWebsocketConsumer):
+    # TODO: implement this
     pass

chats/exceptions.py

@@ -15,6 +15,10 @@ class UserNotInChatException(ChatException):
     pass
 
 
+class UserIsNotAuthor(ChatException):
+    pass
+
+
 class UserNotMessageAuthorException(ChatException):
     pass
 

chats/migrations/0007_remove_directchatmessage_file_url_and_more.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.1.3 on 2023-03-22 20:27
+# Generated by Django 4.1.3 on 2023-04-03 13:04
 
 from django.db import migrations
 
@@ -10,7 +10,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-
         migrations.DeleteModel(
             name="ChatAttachment",
         ),

chats/migrations/0011_alter_filetomessage_direct_message_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1.3 on 2023-04-04 11:48
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("chats", "0010_alter_filetomessage_file"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="filetomessage",
+            name="direct_message",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="file_to_message",
+                to="chats.directchatmessage",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="filetomessage",
+            name="project_message",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="file_to_message",
+                to="chats.projectchatmessage",
+            ),
+        ),
+    ]

chats/tests/__init__.py

@@ -0,0 +1,21 @@
+TEST_USER1 = {
+    "email": "only_for_test@test.test",
+    "password": "very_strong_password",
+    "first_name": "Test1",
+    "last_name": "Test1",
+    "birthday": "2000-01-01",
+}
+TEST_USER2 = {
+    "email": "test@test.test",
+    "password": "very_strong_password",
+    "first_name": "Test2",
+    "last_name": "Test2",
+    "birthday": "2000-01-01",
+}
+TEST_USER3 = {
+    "email": "test2@test.test",
+    "password": "very_strong_password",
+    "first_name": "Test3",
+    "last_name": "Test3",
+    "birthday": "2000-01-01",
+}