Merge pull request #104 from PROCOLLAB-github/dev

Dev

Author: VeryBigSad

chats/consumers.py

@@ -90,6 +90,7 @@ async def receive_json(self, content, **kwargs):
             EventType.TYPING,
             EventType.READ_MESSAGE,
             EventType.DELETE_MESSAGE,
+            EventType.EDIT_MESSAGE,
         ]:
             room_name = f"{EventGroupType.CHATS_RELATED}_{event.content.get('chat_id')}"
             try:
@@ -112,6 +113,8 @@ async def __process_chat_related_event(self, event, room_name):
             await self.__process_read_message_event(event, room_name)
         elif event.type == EventType.DELETE_MESSAGE:
             await self.__process_delete_message_event(event, room_name)
+        elif event.type == EventType.EDIT_MESSAGE:
+            await self.__process_edit_message_event(event, room_name)
 
     async def __process_new_message_event(self, event, room_name):
         if event.content["chat_type"] == ChatType.DIRECT:
@@ -149,9 +152,11 @@ async def __process_new_direct_message_event(self, event: Event):
             "content": {
                 "message_id": msg.id,
                 "chat_id": msg.chat_id,
+                "chat_type": ChatType.PROJECT,
                 "author_id": msg.author.pk,
                 "text": msg.text,
                 "created_at": msg.created_at.timestamp(),
+                "is_edited": msg.is_edited,
             },
         }
         # send message to user's channel
@@ -193,6 +198,7 @@ async def __process_new_project_message_event(self, event: Event, room_name: str
                     "author_id": msg.author.pk,
                     "text": msg.text,
                     "created_at": msg.created_at.timestamp(),
+                    "is_edited": msg.is_edited,
                 },
             },
         )
@@ -280,6 +286,12 @@ async def __process_delete_message_event(self, event: Event, room_name: str):
         elif event.content["chat_type"] == ChatType.PROJECT:
             await self.__process_delete_project_message_event(event, room_name)
 
+    async def __process_edit_message_event(self, event, room_name):
+        if event.content["chat_type"] == ChatType.DIRECT:
+            await self.__process_edit_direct_message_event(event)
+        elif event.content["chat_type"] == ChatType.PROJECT:
+            await self.__process_edit_project_message_event(event, room_name)
+
     async def __process_delete_direct_message_event(self, event):
         message_id = event.content["message_id"]
 
@@ -349,6 +361,9 @@ async def set_online(self, event: Event):
     async def set_offline(self, event: Event):
         await self.send(json.dumps(event))
 
+    async def edit_message(self, event: Event):
+        await self.send(json.dumps(event))
+
     async def __process_general_event(self, event: Event, room_name: str):
         cache_key = get_user_online_cache_key(self.user)
         if event.type == EventType.SET_ONLINE:
@@ -371,6 +386,72 @@ async def __process_general_event(self, event: Event, room_name: str):
         else:
             raise ValueError("Unknown event type")
 
+    async def __process_edit_direct_message_event(self, event):
+        chat_id, other_user = await get_chat_and_user_ids_from_content(
+            event.content, self.user
+        )
+        # if chat_id == 17_7, then chat_id will be == 7_17
+        chat_id = DirectChat.get_chat_id_from_users(self.user, other_user)
+
+        # check if chat exists ( this raises exception if not )
+        await sync_to_async(DirectChat.objects.get)(pk=chat_id)
+
+        msg = await sync_to_async(DirectChatMessage.objects.get)(
+            pk=event.content["message_id"]
+        )
+        msg.text = event.content["message"]
+        msg.is_edited = True
+        await sync_to_async(msg.save)()
+        content = {
+            "type": EventType.EDIT_MESSAGE,
+            "content": {
+                "message_id": msg.id,
+                "chat_id": msg.chat_id,
+                "author_id": msg.author_id,
+                "text": msg.text,
+                "created_at": msg.created_at.timestamp(),
+                "is_edited": msg.is_edited,
+            },
+        }
+        # send message to user's channel
+        other_user_channel = cache.get(get_user_channel_cache_key(other_user), None)
+        await self.channel_layer.send(self.channel_name, content)
+
+        if other_user_channel is None:
+            return
+
+        await self.channel_layer.send(other_user_channel, content)
+
+    async def __process_edit_project_message_event(self, event, room_name):
+        chat_id = event.content["chat_id"]
+        chat = await sync_to_async(ProjectChat.objects.get)(pk=chat_id)
+
+        # check that user is in this chat
+        users = await sync_to_async(chat.get_users)()
+        if self.user not in users:
+            raise UserNotInChatException(
+                f"User {self.user.id} is not in project chat {chat_id}"
+            )
+
+        message = await sync_to_async(ProjectChatMessage.objects.get)(
+            pk=event.content["message_id"]
+        )
+        message.text = event.content["text"]
+        message.is_edited = True
+        await sync_to_async(message.save)()
+        content = {
+            "message_id": message.id,
+            "chat_id": message.chat_id,
+            "author_id": message.author.pk,
+            "text": message.text,
+            "created_at": message.created_at.timestamp(),
+            "is_edited": message.is_edited,
+        }
+        await self.channel_layer.group_send(
+            room_name,
+            {"type": EventType.EDIT_MESSAGE, "content": content},
+        )
+
 
 class NotificationConsumer(AsyncJsonWebsocketConsumer):
     # TODO: implement this

chats/migrations/0004_directchatmessage_is_edited_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.3 on 2023-03-12 19:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("chats", "0003_reply_to_constaint"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="directchatmessage",
+            name="is_edited",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="projectchatmessage",
+            name="is_edited",
+            field=models.BooleanField(default=False),
+        ),
+    ]

chats/models.py

@@ -196,6 +196,7 @@ class BaseMessage(models.Model):
     text = models.TextField(max_length=8192)
     is_read = models.BooleanField(default=False)
     is_deleted = models.BooleanField(default=False)
+    is_edited = models.BooleanField(default=False)
     created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):

chats/pagination.py

@@ -0,0 +1,7 @@
+from rest_framework import pagination
+
+
+class MessageListPagination(pagination.LimitOffsetPagination):
+    default_limit = 15
+    limit_query_param = "next"
+    offset_query_param = "previous"

chats/views.py

@@ -6,6 +6,7 @@
 from rest_framework.response import Response
 
 from chats.models import ProjectChat, DirectChat
+from chats.pagination import MessageListPagination
 from chats.serializers import (
     DirectChatListSerializer,
     DirectChatMessageListSerializer,
@@ -94,6 +95,7 @@ def get(self, request, *args, **kwargs) -> Response:
 class DirectChatMessageList(ListCreateAPIView):
     serializer_class = DirectChatMessageListSerializer
     permission_classes = [IsAuthenticated]
+    pagination_class = MessageListPagination
 
     def get_queryset(self):
         return (
@@ -106,6 +108,7 @@ def get_queryset(self):
 class ProjectChatMessageList(ListCreateAPIView):
     serializer_class = ProjectChatMessageListSerializer
     permission_classes = [IsAuthenticated]
+    pagination_class = MessageListPagination
 
     def get_queryset(self):
         return (

chats/websockets_settings.py

@@ -13,6 +13,7 @@ class EventType(str, Enum):
     DELETE_MESSAGE = "delete_message"
     READ_MESSAGE = "message_read"
     TYPING = "user_typing"
+    EDIT_MESSAGE = "edit_message"
 
     # GENERAL EVENTS
     SET_ONLINE = "set_online"

core/permissions.py

@@ -43,3 +43,14 @@ def has_object_permission(self, request, view, obj) -> bool:
         if request.user in obj.chat.users.all():
             return True
         return False
+
+
+class IsAuthenticatedOrWriteOnly(BasePermission):
+    """
+    Access if you Authenticated or for POST request
+    """
+
+    def has_object_permission(self, request, view, obj) -> bool:
+        if request.user and request.user.is_authenticated or request.method == "POST":
+            return True
+        return False

users/helpers.py

@@ -1,3 +1,10 @@
+from rest_framework_simplejwt.tokens import RefreshToken
+from django.contrib.sites.shortcuts import get_current_site
+from django.urls import reverse
+
+from core.utils import Email
+
+
 ADMIN = 0
 MEMBER = 1
 MENTOR = 2
@@ -16,3 +23,43 @@
     (EXPERT, "Эксперт"),
     (INVESTOR, "Инвестор"),
 )
+
+REDIRECT_URL = "https://app.procollab.ru/auth/verification/"
+
+
+def reset_email(user, request):
+    access_token = RefreshToken.for_user(user).access_token
+    refresh_token = RefreshToken.for_user(user)
+
+    relative_link = reverse("users:password_reset_sent")
+
+    current_site = get_current_site(request).domain
+    absolute_url = f"https://{current_site}{relative_link}?access_token={access_token}&refresh_token={refresh_token}"
+
+    email_body = f"Hi, {user.first_name} {user.last_name}! Use link below for reset password {absolute_url}"
+
+    data = {
+        "email_body": email_body,
+        "email_subject": "Reset password",
+        "to_email": user.email,
+    }
+
+    Email.send_email(data)
+
+
+def verify_email(user, request):
+    token = RefreshToken.for_user(user).access_token
+
+    relative_link = reverse("users:account_email_verification_sent")
+    current_site = get_current_site(request).domain
+    absolute_url = f"https://{current_site}{relative_link}?token={token}"
+
+    email_body = f"Hi, {user.first_name} {user.last_name}! Use link below verify your email {absolute_url}"
+
+    data = {
+        "email_body": email_body,
+        "email_subject": "Verify your email",
+        "to_email": user.email,
+    }
+
+    Email.send_email(data)

users/views.py

@@ -3,12 +3,10 @@
 import jwt
 from django.apps import apps
 from django.conf import settings
-from django.contrib.auth import get_user_model
-from django.contrib.sites.shortcuts import get_current_site
 from django.db import transaction
 from django.db.models import Q
 from django.shortcuts import redirect
-from django.urls import reverse
+from django.contrib.auth import get_user_model
 from django_filters import rest_framework as filters
 from rest_framework import status
 from rest_framework.generics import (
@@ -23,10 +21,15 @@
 from rest_framework.views import APIView
 from rest_framework_simplejwt.tokens import RefreshToken, TokenError
 
-from core.permissions import IsOwnerOrReadOnly
-from core.utils import Email
+from core.permissions import IsOwnerOrReadOnly, IsAuthenticatedOrWriteOnly
 from projects.serializers import ProjectListSerializer
-from users.helpers import VERBOSE_ROLE_TYPES, VERBOSE_USER_TYPES
+from users.helpers import (
+    REDIRECT_URL,
+    VERBOSE_ROLE_TYPES,
+    VERBOSE_USER_TYPES,
+    reset_email,
+    verify_email,
+)
 from users.models import UserAchievement, LikesOnProject
 from users.permissions import IsAchievementOwnerOrReadOnly
 from users.serializers import (
@@ -46,7 +49,7 @@
 
 class UserList(ListCreateAPIView):
     queryset = User.objects.get_active()
-    permission_classes = [AllowAny]  # FIXME: change to IsAuthorized
+    permission_classes = [IsAuthenticatedOrWriteOnly]
     serializer_class = UserListSerializer
     filter_backends = (filters.DjangoFilterBackend,)
     filterset_class = UserFilter
@@ -59,23 +62,7 @@ def post(self, request, *args, **kwargs):
 
         user = User.objects.get(email=serializer.data["email"])
 
-        token = RefreshToken.for_user(user).access_token
-
-        relative_link = reverse("users:account_email_verification_sent")
-        current_site = get_current_site(request).domain
-        absolute_url = "http://" + current_site + relative_link + "?token=" + str(token)
-
-        email_body = "Hi, {} {}! Use link below verify your email {}".format(
-            user.first_name, user.last_name, absolute_url
-        )
-
-        data = {
-            "email_body": email_body,
-            "email_subject": "Verify your email",
-            "to_email": user.email,
-        }
-
-        Email.send_email(data)
+        verify_email(user, request)
 
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
 
@@ -171,7 +158,6 @@ class VerifyEmail(GenericAPIView):
 
     def get(self, request):
         token = request.GET.get("token")
-        REDIRECT_URL = "https://app.procollab.ru/auth/verification/"
         try:
             payload = jwt.decode(jwt=token, key=settings.SECRET_KEY, algorithms=["HS256"])
             user = User.objects.get(id=payload["user_id"])
@@ -212,30 +198,7 @@ def post(self, request, *args, **kwargs):
 
         user = User.objects.get(email=serializer.data["email"])
 
-        access_token = RefreshToken.for_user(user).access_token
-        refresh_token = RefreshToken.for_user(user)
-
-        relative_link = reverse("users:password_reset_sent")
-
-        current_site = get_current_site(request).domain
-        absolute_url = (
-            "http://"
-            + current_site
-            + relative_link
-            + f"?access_token={access_token}&refresh_token={refresh_token}"
-        )
-
-        email_body = "Hi, {} {}! Use link below for reset password {}".format(
-            user.first_name, user.last_name, absolute_url
-        )
-
-        data = {
-            "email_body": email_body,
-            "email_subject": "Reset password",
-            "to_email": user.email,
-        }
-
-        Email.send_email(data)
+        reset_email(user, request)
 
         return Response(serializer.data, status=status.HTTP_201_CREATED)