Merge remote-tracking branch 'origin/master'

# Conflicts:
#	chats/serializers.py

Author: VeryBigSad

.gitignore

@@ -58,6 +58,7 @@ coverage.xml
 
 # Django stuff:
 *.log
+*.log.zip
 local_settings.py
 *.sqlite3
 *.sqlite3-journal

Dockerfile

@@ -22,8 +22,6 @@ COPY poetry.lock pyproject.toml /procollab/
 RUN poetry config virtualenvs.create false \
     && poetry install  --no-root
 
-EXPOSE 8000
-
 RUN mkdir /procollab/staticfiles
 RUN mkdir /procollab/static
 

chats/serializers.py

@@ -12,43 +12,37 @@
 
 class DirectChatListSerializer(serializers.ModelSerializer):
     last_message = serializers.SerializerMethodField()
-    users = serializers.SerializerMethodField(read_only=True)
+    opponent = serializers.SerializerMethodField()
 
-    @classmethod
-    def get_users(cls, chat: ProjectChat):
-        return UserListSerializer(chat.get_users(), many=True).data
+    def get_opponent(self, chat: DirectChat):
+        user = self.context.get("opponent")
+        return UserDetailSerializer(user).data
 
     @classmethod
     def get_last_message(cls, chat: DirectChat):
         return DirectChatMessageListSerializer(chat.get_last_message()).data
 
-    def get_title(self, chat: DirectChat):
-        request = self.context.get("request")
-        user = request.user
-        return chat.get_other_user(user).get_full_name()
-
-    def get_image_address(self, chat: DirectChat):
-        request = self.context.get("request")
-        user = request.user
-        return chat.get_other_user(user).avatar
-
     class Meta:
         model = DirectChat
-        fields = ["id", "users", "last_message", "title", "image_address"]
+        fields = [
+            "id",
+            "opponent",
+            "last_message",
+        ]
 
 
 class DirectChatDetailSerializer(serializers.ModelSerializer):
-    users = serializers.SerializerMethodField(read_only=True)
+    opponent = serializers.SerializerMethodField()
 
-    @classmethod
-    def get_users(cls, chat: ProjectChat):
-        return UserListSerializer(chat.get_users(), many=True).data
+    def get_opponent(self, chat: DirectChat):
+        user = self.context.get("opponent")
+        return UserDetailSerializer(user).data
 
     class Meta:
         model = DirectChat
         fields = [
             "id",
-            "users",
+            "opponent",
         ]
 
 
@@ -59,17 +53,9 @@ class ProjectChatListSerializer(serializers.ModelSerializer):
     def get_last_message(cls, chat: ProjectChat):
         return ProjectChatMessageListSerializer(chat.get_last_message()).data
 
-    @classmethod
-    def get_image_address(cls, chat: ProjectChat):
-        return chat.project.image_address
-
-    @classmethod
-    def get_name(cls, chat: ProjectChat):
-        return chat.project.name
-
     class Meta:
         model = ProjectChat
-        fields = ["id", "project", "last_message", "name", "image_address"]
+        fields = ["id", "project", "last_message"]
 
 
 class ProjectChatDetailSerializer(serializers.ModelSerializer):

chats/views.py

@@ -22,6 +22,7 @@
     DirectChatDetailSerializer,
 )
 from chats.utils import get_all_files
+from files.models import UserFile
 from files.serializers import UserFileSerializer
 
 User = get_user_model()
@@ -35,6 +36,31 @@ def get_queryset(self):
         user = self.request.user
         return user.direct_chats.all()
 
+    def get(self, request, *args, **kwargs):
+        chats = self.get_queryset()
+        serialized_chats = []
+        for chat in chats:
+            # fixme: move to function like get_user() and get_opponent()
+            chat_id = chat.id
+            user1_id, user2_id = map(int, chat_id.split("_"))
+
+            try:
+                user1 = User.objects.get(pk=user1_id)
+                user2 = User.objects.get(pk=user2_id)
+            except User.DoesNotExist:
+                # fixme: show deleted profile
+                continue
+
+            if user1 == request.user:
+                opponent = user2
+            else:  # fixme: if user1 == user2
+                opponent = user1
+
+            context = {"opponent": opponent}
+            serialized_chat = DirectChatListSerializer(chat, context=context).data
+            serialized_chats.append(serialized_chat)
+        return Response(serialized_chats, status=status.HTTP_200_OK)
+
 
 class ProjectChatList(ListAPIView):
     serializer_class = ProjectChatListSerializer
@@ -69,16 +95,17 @@ def get(self, request, *args, **kwargs) -> Response:
             user1 = User.objects.get(pk=user1_id)
             user2 = User.objects.get(pk=user2_id)
 
-            data = DirectChatDetailSerializer(DirectChat.get_chat(user1, user2)).data
-
             if user1 == request.user:
-                # may be is better to use serializer or return dict -
-                # {"first_name": user2.first_name, "last_name": user2.last_name}
-                data["name"] = f"{user2.first_name} {user2.last_name}"
-                data["image_address"] = user2.avatar
+                opponent = user2
             else:
-                data["name"] = f"{user1.first_name} {user1.last_name}"
-                data["image_address"] = user1.avatar
+                opponent = user1
+            context = {"opponent": opponent}
+            data = DirectChatDetailSerializer(
+                DirectChat.get_chat(user1, user2), context=context
+            ).data
+
+            data["name"] = f"{opponent.first_name} {opponent.last_name}"
+            data["image_address"] = opponent.avatar
 
             return Response(
                 status=status.HTTP_200_OK,
@@ -124,12 +151,15 @@ class ProjectChatMessageList(ListCreateAPIView):
     pagination_class = MessageListPagination
 
     def get_queryset(self):
-        return (
-            ProjectChat.objects.get(id=self.kwargs["pk"])
-            .messages.filter(is_deleted=False)
-            .order_by("-created_at")
-            .all()
-        )
+        try:
+            return (
+                ProjectChat.objects.get(id=self.kwargs["pk"])
+                .messages.filter(is_deleted=False)
+                .order_by("-created_at")
+                .all()
+            )
+        except ProjectChat.DoesNotExist:
+            return ProjectChat.objects.none()
 
     def post(self, request, *args, **kwargs):
         # TODO: try to create a message in a chat. If chat doesn't exist, create it and then create a message.
@@ -155,6 +185,8 @@ class ProjectChatFileList(ListCreateAPIView):
     permission_classes = [IsProjectChatMember]
 
     def get_queryset(self):
-        messages = ProjectChat.objects.get(id=self.kwargs["pk"]).messages.all()
-
-        return get_all_files(messages)
+        try:
+            messages = ProjectChat.objects.get(id=self.kwargs["pk"]).messages.all()
+            return get_all_files(messages)
+        except ProjectChat.DoesNotExist:
+            return UserFile.objects.none()

core/log/middleware.py

@@ -0,0 +1,35 @@
+from loguru import logger
+from django.conf import settings
+import logging
+from core.log.utils import InterceptHandler
+
+
+class CustomLoguruMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+        logging.basicConfig(handlers=[InterceptHandler()], level=0, force=True)
+
+        if settings.DEBUG:
+            logger.add(
+                f"{settings.BASE_DIR}/log/debug.log",
+                level="DEBUG",
+                **settings.LOGURU_LOGGING,
+            )
+        logger.add(
+            f"{settings.BASE_DIR}/log/info.log",
+            level="INFO",
+            **settings.LOGURU_LOGGING,
+        )
+        logger.add(
+            f"{settings.BASE_DIR}/log/warning.log",
+            level="WARNING",
+            **settings.LOGURU_LOGGING,
+        )
+
+    def __call__(self, request):
+        response = self.get_response(request)
+        logger.info(f"{request.method} {request.get_full_path()}")
+        return response
+
+    def process_exception(self, request, exception):
+        logger.warning(f"{exception} http_path={request.get_full_path()}")

core/log/utils.py

@@ -0,0 +1,18 @@
+import logging
+import sys
+from loguru import logger
+
+
+class InterceptHandler(logging.Handler):
+    def emit(self, record):
+        try:
+            level = logger.level(record.levelname).name
+        except ValueError:
+            level = record.levelno
+
+        frame, depth = sys._getframe(6), 6
+        while frame and frame.f_code.co_filename == logging.__file__:
+            frame = frame.f_back
+            depth += 1
+
+        logger.opt(depth=depth, exception=record.exc_info).log(level, record.getMessage())

docker-compose.dev-ci.yml

@@ -1,19 +1,64 @@
-version: "3.4"
+version: '3.9'
+ 
 services:
-  server:
-    ports:
-      - "8000:8000"
+  web:
+    container_name: web
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: ./Dockerfile
+    image: ghcr.io/procollab-github/api:latest
+    restart: always
+    volumes:
+      - log:/procollab/log
     env_file:
       - .env
-    restart: always
-    networks:
-      template-network:
-
-networks:
-  template-network:
-
+    environment:
+      HOST: 0.0.0.0
+    expose:
+      - 8000
+  grafana:
+    container_name: grafana
+    image: grafana/grafana:latest
+    expose:
+      - 3000
+    volumes:
+      - grafana-data:/var/lib/grafana
+      - grafana-configs:/etc/grafana
+    environment:
+      - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:%(http_port)s/grafana
+      - GF_SERVER_SERVE_FROM_SUB_PATH=true
+  prometheus:
+    container_name: prometheus
+    image: prom/prometheus:v2.36.0
+    expose:
+      - 9090
+    volumes:
+      - prom-data:/prometheus
+      - ./prometheus:/etc/prometheus
+  node-exporter:
+    container_name: node-exporter
+    image: prom/node-exporter:v1.3.1
+    expose:
+      - 9100
+    volumes:
+      - /proc:/host/proc:ro
+      - /sys:/host/sys:ro
+      - /:/rootfs:ro
+    command:
+      - '--path.procfs=/host/proc'
+      - '--path.sysfs=/host/sys'
+      - '--collector.filesystem.mount-points-exclude'
+      - '^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)'
+  nginx:
+    container_name: nginx
+    build: ./nginx
+    depends_on:
+      - web
+    ports:
+      - 8000:80
 volumes:
-  db-volume:
+  grafana-data:
+  grafana-configs:
+  prom-data:
+  prom-configs:
+  log: