Merge pull request #304 from PROCOLLAB-github/dev

Dev

Author: sh1nkey

chats/urls.py

@@ -16,26 +16,26 @@
 
 urlpatterns = [
     path("directs/", DirectChatList.as_view(), name="direct-chat-list"),
-    path("directs/<slug:pk>/", DirectChatDetail.as_view(), name="direct-chat-detail"),
+    path("directs/<slug:id>/", DirectChatDetail.as_view(), name="direct-chat-detail"),
     path(
-        "directs/<slug:pk>/messages/",
+        "directs/<slug:id>/messages/",
         DirectChatMessageList.as_view(),
         name="direct-chat-messages",
     ),
     path(
-        "directs/<slug:pk>/files/",
+        "directs/<slug:id>/files/",
         DirectChatFileList.as_view(),
         name="direct-chat-files",
     ),
     path("projects/", ProjectChatList.as_view(), name="project-chat-list"),
     path("projects/<int:pk>/", ProjectChatDetail.as_view(), name="project-chat-detail"),
     path(
-        "projects/<int:pk>/messages/",
+        "projects/<int:id>/messages/",
         ProjectChatMessageList.as_view(),
         name="project-chat-messages",
     ),
     path(
-        "projects/<int:pk>/files/",
+        "projects/<int:id>/files/",
         ProjectChatFileList.as_view(),
         name="project-chat-files",
     ),

chats/views.py

@@ -86,13 +86,13 @@ class DirectChatDetail(RetrieveAPIView):
 
     def get(self, request, *args, **kwargs) -> Response:
         try:
-            assert "_" in self.kwargs["pk"], "pk must contain underscore"
+            assert "_" in self.kwargs["id"], "processed id must contain underscore"
 
-            user1_id, user2_id = map(int, self.kwargs["pk"].split("_"))
+            user1_id, user2_id = map(int, self.kwargs["id"].split("_"))
 
             assert (
                 request.user.id == user1_id or request.user.id == user2_id
-            ), "current user id is not present in pk"
+            ), "current user id is not present in raw id"
 
             user1 = User.objects.get(pk=user1_id)
             user2 = User.objects.get(pk=user2_id)
@@ -117,7 +117,7 @@ def get(self, request, *args, **kwargs) -> Response:
         except ValueError:
             return Response(
                 status=status.HTTP_400_BAD_REQUEST,
-                data={"detail": "pk must contain two integers separated by underscore"},
+                data={"detail": "processed id must contain two integers separated by underscore"},
             )
         except AssertionError as e:
             return Response(status=status.HTTP_400_BAD_REQUEST, data={"detail": str(e)})
@@ -140,7 +140,7 @@ class DirectChatMessageList(ListCreateAPIView):
 
     def get_queryset(self):
         return (
-            self.request.user.direct_chats.get(id=self.kwargs["pk"])
+            self.request.user.direct_chats.get(id=self.kwargs["id"])
             .messages.filter(is_deleted=False)
             .order_by("-created_at")
             .all()
@@ -155,7 +155,7 @@ class ProjectChatMessageList(ListCreateAPIView):
     def get_queryset(self):
         try:
             return (
-                ProjectChat.objects.get(id=self.kwargs["pk"])
+                ProjectChat.objects.get(id=self.kwargs["id"])
                 .messages.filter(is_deleted=False)
                 .order_by("-created_at")
                 .all()
@@ -177,7 +177,8 @@ class DirectChatFileList(ListCreateAPIView):
     permission_classes = [IsAuthenticated]
 
     def get_queryset(self):
-        messages = self.request.user.direct_chats.get(id=self.kwargs["pk"]).messages.all()
+
+        messages = self.request.user.direct_chats.get(id=self.kwargs["id"]).messages.all()
 
         return get_all_files(messages)
 
@@ -188,7 +189,7 @@ class ProjectChatFileList(ListCreateAPIView):
 
     def get_queryset(self):
         try:
-            messages = ProjectChat.objects.get(id=self.kwargs["pk"]).messages.all()
+            messages = ProjectChat.objects.get(id=self.kwargs["id"]).messages.all()
             return get_all_files(messages)
         except ProjectChat.DoesNotExist:
             return UserFile.objects.none()

docker-compose.dev-ci.yml

@@ -1,5 +1,7 @@
 version: '3.9'
- 
+
+
+
 services:
   web:
     container_name: web
@@ -9,7 +11,7 @@ services:
     image: ghcr.io/procollab-github/api:latest
     restart: always
     volumes:
-      - log:/procollab/log
+      - ./log:/procollab/log
     env_file:
       - .env
     environment:
@@ -35,27 +37,25 @@ services:
     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
+  loki:
+    image: grafana/loki:2.9.0
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+  promtail:
+    image: grafana/promtail:2.9.0
+    volumes:
+      - /var/log:/var/log
+      - ./promtail:/etc/promtail
+      - ./log:/procollab/log
+    command: -config.file=/etc/promtail/config.yml
 
   redis:
     container_name: redis
@@ -64,11 +64,11 @@ services:
       - 6379
     volumes:
       - redis-data:/data
-
 volumes:
   grafana-data:
   grafana-configs:
   prom-data:
   prom-configs:
   log:
+  promtail:
   redis-data:

docker-compose.yml

@@ -1,5 +1,7 @@
 version: '3.9'
 
+
+
 services:
   web:
     container_name: web
@@ -9,7 +11,7 @@ services:
     image: ghcr.io/procollab-github/api:latest
     restart: always
     volumes:
-      - log:/procollab/log
+      - ./log:/procollab/log
     env_file:
       - .env
     environment:
@@ -35,27 +37,26 @@ services:
     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
+  loki:
+    image: grafana/loki:2.9.0
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+  promtail:
+    image: grafana/promtail:2.9.0
+    volumes:
+      - /var/log:/var/log
+      - ./promtail:/etc/promtail
+      - ./log:/procollab/log
+    command: -config.file=/etc/promtail/config.yml
+
   redis:
     container_name: redis
     image: redis:latest
@@ -69,4 +70,5 @@ volumes:
   prom-data:
   prom-configs:
   log:
+  promtail:
   redis-data:

events/urls.py

@@ -7,6 +7,6 @@
 urlpatterns = [
     path("", EventsList.as_view()),
     path("<int:pk>/", EventDetail.as_view()),
-    path("<int:pk>/registered/", EventRegisteredUsersList.as_view()),
+    path("<int:id>/registered/", EventRegisteredUsersList.as_view()),
     path("types/", EventTypes.as_view()),
 ]

events/views.py

@@ -34,7 +34,7 @@ class EventRegisteredUsersList(generics.ListAPIView):
     permission_classes = [IsStaffOrReadOnly]
 
     def get_queryset(self):
-        users = Event.objects.get(pk=self.kwargs["pk"]).registered_users.all()
+        users = Event.objects.get(pk=self.kwargs["id"]).registered_users.all()
         return users
 
 

loki/loki-config.yaml

@@ -0,0 +1,50 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+  grpc_listen_port: 9096
+
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /tmp/loki
+  storage:
+    filesystem:
+      chunks_directory: /tmp/loki/chunks
+      rules_directory: /tmp/loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+query_range:
+  results_cache:
+    cache:
+      embedded_cache:
+        enabled: true
+        max_size_mb: 100
+
+schema_config:
+  configs:
+    - from: 2020-10-24
+      store: boltdb-shipper
+      object_store: filesystem
+      schema: v11
+      index:
+        prefix: index_
+        period: 24h
+
+ruler:
+  alertmanager_url: http://localhost:9093
+
+# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration
+# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/
+#
+# Statistics help us better understand how Loki is used, and they show us performance
+# levels for most users. This helps us prioritize features and documentation.
+# For more information on what's sent, look at
+# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go
+# Refer to the buildReport method to see what goes into a report.
+#
+# If you would like to disable reporting, uncomment the following lines:
+#analytics:
+#  reporting_enabled: false

news/serializers.py

@@ -73,8 +73,8 @@ class NewsFeedListSerializer(serializers.ModelSerializer):
     image_address = serializers.SerializerMethodField()
     is_user_liked = serializers.SerializerMethodField()
     files = UserFileSerializer(many=True)
-    views_count = serializers.IntegerField(default=0)
-    likes_count = serializers.IntegerField(default=0)
+    views_count = serializers.SerializerMethodField()
+    likes_count = serializers.SerializerMethodField()
     content_object = serializers.SerializerMethodField()
     type_model = serializers.SerializerMethodField()
 
@@ -106,8 +106,15 @@ def get_content_object(self, obj):
             serialized_obj = VacancyDetailSerializer(obj.content_object)
             return serialized_obj.data
 
+    def get_views_count(self, obj):
+        return get_views_count(obj)
+
+    def get_likes_count(self, obj):
+        return get_likes_count(obj)
+
     def get_name(self, obj):
-        return NewsMapping.get_name(obj.content_object)
+        if obj.content_type.model == CustomUser.__name__.lower():
+            return f"{obj.content_object.first_name} {obj.content_object.last_name}"
 
     def get_image_address(self, obj):
         return NewsMapping.get_image_address(obj.content_object)