Revert "Feateure/metrics tasks (#248)"

This reverts commit 086d8fb.

chats/__init__.py

@@ -1,5 +0,0 @@
-# This will make sure the app is always imported when
-# Django starts so that shared_task will use this app.
-from .celery import app as celery_app
-
-__all__ = ("celery_app",)

chats/apps/api/v1/external/rooms/viewsets.py

@@ -1,6 +1,5 @@
 import json
 
-from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import IntegrityError
 from django.utils import timezone
@@ -16,7 +15,6 @@
 from chats.apps.dashboard.models import RoomMetrics
 from chats.apps.rooms.models import Room
 from chats.apps.rooms.views import (
-    close_room,
     get_editable_custom_fields_room,
     update_custom_fields,
     update_flows_custom_fields,
@@ -69,10 +67,6 @@ def close(
         instance.close(None, "agent")
         serialized_data = RoomFlowSerializer(instance=instance)
         instance.notify_queue("close")
-        if not settings.ACTIVATE_CALC_METRICS:
-            return Response(serialized_data.data, status=status.HTTP_200_OK)
-
-        close_room(str(instance.pk))
         return Response(serialized_data.data, status=status.HTTP_200_OK)
 
     def create(self, request, *args, **kwargs):

chats/apps/api/v1/rooms/viewsets.py

@@ -18,9 +18,9 @@
     TransferRoomSerializer,
 )
 from chats.apps.dashboard.models import RoomMetrics
+from chats.apps.msgs.models import Message
 from chats.apps.rooms.models import Room
 from chats.apps.rooms.views import (
-    close_room,
     get_editable_custom_fields_room,
     update_custom_fields,
     update_flows_custom_fields,
@@ -116,7 +116,44 @@ def close(
         if not settings.ACTIVATE_CALC_METRICS:
             return Response(serialized_data.data, status=status.HTTP_200_OK)
 
-        close_room(str(instance.pk))
+        messages_contact = (
+            Message.objects.filter(room=instance, contact__isnull=False)
+            .order_by("created_on")
+            .first()
+        )
+        messages_agent = (
+            Message.objects.filter(room=instance, user__isnull=False)
+            .order_by("created_on")
+            .first()
+        )
+
+        time_message_contact = 0
+        time_message_agent = 0
+
+        if messages_agent and messages_contact:
+            time_message_agent = messages_agent.created_on.timestamp()
+            time_message_contact = messages_contact.created_on.timestamp()
+        else:
+            time_message_agent = 0
+            time_message_contact = 0
+
+        difference_time = time_message_agent - time_message_contact
+
+        interation_time = (
+            Room.objects.filter(pk=instance.pk)
+            .aggregate(
+                avg_time=Sum(
+                    F("ended_at") - F("created_on"),
+                )
+            )["avg_time"]
+            .total_seconds()
+        )
+
+        metric_room = RoomMetrics.objects.get_or_create(room=instance)[0]
+        metric_room.message_response_time = difference_time
+        metric_room.interaction_time = interation_time
+        metric_room.save()
+
         return Response(serialized_data.data, status=status.HTTP_200_OK)
 
     def perform_create(self, serializer):

chats/apps/rooms/views.py

@@ -1,22 +1,10 @@
 from rest_framework import status
 from rest_framework.exceptions import APIException
-from django.conf import settings
-from django.db import transaction
 
-from chats.apps.dashboard.tasks import close_metrics, generate_metrics
 from chats.apps.api.v1.internal.rest_clients.flows_rest_client import FlowRESTClient
 from chats.apps.rooms.models import Room
 
 
-def close_room(room_pk: str):
-    if settings.USE_CELERY:
-        transaction.on_commit(
-            lambda: close_metrics.apply_async(
-                args=[room_pk], queue=settings.METRICS_CUSTOM_QUEUE
-            )
-        )
-    generate_metrics(room_pk)
-
 def update_custom_fields(room: Room, custom_fields_update: dict):
     room.custom_fields.update(custom_fields_update)
     room.save()

chats/settings.py

@@ -72,8 +72,6 @@
     "rest_framework",
     "rest_framework.authtoken",
     "corsheaders",
-    "django_celery_beat",
-    "django_celery_results",
 ]
 
 MIDDLEWARE = [
@@ -107,25 +105,24 @@
 
 WSGI_APPLICATION = "chats.wsgi.application"
 
-ASGI_APPLICATION = "chats.asgi.application"
-
-REDIS_URL = env.str("CHANNEL_LAYERS_REDIS", default="redis://localhost:6379/1")
-
 # channels
+ASGI_APPLICATION = "chats.asgi.application"
 
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels_redis.pubsub.RedisPubSubChannelLayer",
         "CONFIG": {
-            "hosts": [REDIS_URL],
+            "hosts": [
+                env.str("CHANNEL_LAYERS_REDIS", default="redis://127.0.0.1:6379/1")
+            ],
         },
     },
 }
 
 CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": REDIS_URL,
+        "LOCATION": env.str("CHANNEL_LAYERS_REDIS", default="redis://127.0.0.1:6379/1"),
         "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient"},
     }
 }
@@ -356,15 +353,3 @@
 
 CHATS_FLOWS_TAG = env.str("CHATS_FLOWS_TAG", default="chats")
 CHATS_CACHE_TIME = env.int("CHATS_CACHE_TIME", default=1 * 60 * 60)
-
-# Celery
-
-METRICS_CUSTOM_QUEUE = env("METRICS_CUSTOM_QUEUE", default="celery")
-
-USE_CELERY = env.bool("USE_CELERY", default=False)
-CELERY_BROKER_URL = env.str("CELERY_BROKER_URL", default=REDIS_URL)
-CELERY_RESULT_BACKEND = env.str("CELERY_RESULT_BACKEND", default="django-db")
-CELERY_ACCEPT_CONTENT = ["application/json"]
-CELERY_TASK_SERIALIZER = "json"
-CELERY_RESULT_SERIALIZER = "json"
-CELERY_TIMEZONE = TIME_ZONE