resolving conflicts in merge

weni-ai · Jan 25, 2024 · 7b3a865 · 7b3a865
2 parents 6a268ba + bcaaaa3
commit 7b3a865
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/chats/apps/api/v1/dashboard/repository.py b/chats/apps/api/v1/dashboard/repository.py
@@ -297,7 +297,6 @@ def active_chats(self, filters):
             self.rooms_filter.pop("created_on__gte")
 
         active_rooms = []
-        print("filtros", self.rooms_filter)
 
         if filters.user_request:
             rooms_query = self.model.filter(
@@ -452,7 +451,6 @@ def get_rooms_data(self, filters):
                 response_time=message_response_time_agg,
                 waiting_time=waiting_time_agg,
             )
-
             return general_data
 
 

diff --git a/chats/apps/api/v1/dashboard/service.py b/chats/apps/api/v1/dashboard/service.py
@@ -1,5 +1,4 @@
 from typing import List
-from urllib import parse
 
 from chats.apps.api.utils import create_room_dto
 from chats.apps.api.v1.dashboard.interfaces import CacheRepository, RoomsDataRepository
@@ -11,14 +10,12 @@
     DashboardTransferCountSerializer,
 )
 
-from .dto import Agent, Filters, RoomData, Sector
+from .dto import Agent, Filters, Sector
 from .repository import (
     ActiveChatsRepository,
     AgentRepository,
     ClosedRoomsRepository,
-    ORMRoomsDataRepository,
     QueueRoomsRepository,
-    RoomsCacheRepository,
     SectorRepository,
     TransferCountRepository,
 )
@@ -86,7 +83,11 @@ def __init__(
         self.rooms_data_repository = rooms_data_repository
         self.rooms_cache_repository = rooms_cache_repository
 
+<<<<<<< HEAD
     def get_rooms_data(self, filters: Filters):
+=======
+    def get_rooms_data(self, filters: Filters) -> List[DashboardRoomSerializer]:
+>>>>>>> feature/teste-merjeando-tudo
         get_cache_key = self.rooms_data_repository.get_cache_key(filters)
         get_cached_data = self.rooms_cache_repository.get(get_cache_key)
 

diff --git a/chats/apps/api/v1/dashboard/viewsets.py b/chats/apps/api/v1/dashboard/viewsets.py
@@ -8,7 +8,10 @@
 from rest_framework.response import Response
 
 from chats.apps.api.v1.dashboard.presenter import get_export_data
-from chats.apps.api.v1.dashboard.repository import ORMRoomsDataRepository
+from chats.apps.api.v1.dashboard.repository import (
+    ORMRoomsDataRepository,
+    RoomsCacheRepository,
+)
 from chats.apps.api.v1.dashboard.serializers import (
     DashboardAgentsSerializer,
     DashboardRawDataSerializer,
@@ -20,13 +23,7 @@
 from chats.core.excel_storage import ExcelStorage
 
 from .dto import Filters
-from .service import (
-    AgentsService,
-    RawDataService,
-    RoomsCacheRepository,
-    RoomsDataService,
-    SectorService,
-)
+from .service import AgentsService, RawDataService, RoomsDataService, SectorService
 
 
 class DashboardLiveViewset(viewsets.GenericViewSet):
@@ -55,8 +52,8 @@ def general(self, request, *args, **kwargs):
             end_date=params.get("end_date"),
             agent=params.get("agent"),
             sector=params.get("sector"),
-            queue=params.get("queue"),
             tag=params.get("tag"),
+            queue=params.get("queue"),
             user_request=user_permission,
             project=project,
             is_weni_admin=True
@@ -86,6 +83,7 @@ def agent(self, request, *args, **kwargs):
             agent=params.get("agent"),
             sector=params.get("sector"),
             tag=params.get("tag"),
+            queue=params.get("queue"),
             user_request=request.user,
             is_weni_admin=True
             if request.user and "weni.ai" in request.user.email
@@ -118,6 +116,7 @@ def division(self, request, *args, **kwargs):
             end_date=params.get("end_date"),
             agent=params.get("agent"),
             sector=params.get("sector"),
+            queue=params.get("queue"),
             tag=params.get("tag"),
             user_request=user_permission,
             project=project,
@@ -149,6 +148,7 @@ def raw_data(self, request, *args, **kwargs):
             end_date=params.get("end_date"),
             agent=params.get("agent"),
             sector=params.get("sector"),
+            queue=params.get("queue"),
             tag=params.get("tag"),
             user_request=user_permission,
             project=project,
@@ -243,6 +243,7 @@ def export_dashboard(self, request, *args, **kwargs):
             end_date=filter.get("end_date"),
             agent=filter.get("agent"),
             sector=filter.get("sector"),
+            queue=filter.get("queue"),
             tag=filter.get("tag"),
             user_request=user_permission,
             project=project,
@@ -342,7 +343,7 @@ def export_dashboard(self, request, *args, **kwargs):
                     index=False,
                 )
 
-            excel_buffer.seek(0)
+            excel_buffer.seek(0)  # Move o cursor para o início do buffer
             storage = ExcelStorage()
 
             bytes_archive = excel_buffer.getvalue()