Merge pull request #333 from weni-ai/feature/changing-spacing-in-expo…

…rter-excel

Feature/changing spacing in exporter excel

chats/apps/api/v1/dashboard/dto.py

@@ -26,6 +26,7 @@ class Filters:
     end_date: str = None
     agent: str = None
     sector: str = None
+    queue: str = None
     tag: str = None
     is_weni_admin: bool = None
     user_request: ProjectPermission = None

chats/apps/api/v1/dashboard/repository.py

@@ -270,10 +270,7 @@ def _filter_date_range(self, filters, tz):
             self.rooms_filter["is_active"] = False
             self.rooms_filter["user__isnull"] = False
         else:
-            self.rooms_filter["created_on__range"] = [
-                initial_datetime,
-                initial_datetime,
-            ]
+            self.rooms_filter["created_on__gte"] = initial_datetime
             self.rooms_filter["user__isnull"] = False
             self.rooms_filter["is_active"] = True
 

chats/apps/api/v1/dashboard/serializers.py

@@ -67,9 +67,6 @@ def dashboard_general_data(context: dict, project):
     message_response_time_agg = Avg("metric__message_response_time")
     waiting_time_agg = Avg("metric__waiting_time")
 
-    # chave do cache será criada no repository do orm django
-    # no else do room data service, vai chamar o repository orm e se tiver valor cria a chave
-    # e chama o set passando essa chave criada mais o resultado da consulta, igual feito na linha 94.
     rooms_filter_general_time_key = DASHBOARD_ROOMS_CACHE_KEY.format(
         filter=parse.urlencode(rooms_filter), metric="general_time"
     )

chats/apps/api/v1/dashboard/service.py

@@ -29,6 +29,12 @@ def get_agents_data(self, filters: Filters, project) -> List[Agent]:
 
 class RawDataService:
     def get_raw_data(self, filters: Filters):
+        active_rooms_repository = ActiveChatsRepository()
+        active_rooms_data = active_rooms_repository.active_chats(filters)
+        active_rooms_count = DashboardActiveRoomsSerializer(
+            active_rooms_data, many=True
+        )
+
         closed_rooms_repository = ClosedRoomsRepository()
         closed_rooms_data = closed_rooms_repository.closed_rooms(filters)
         closed_rooms_count = DashboardClosedRoomSerializer(closed_rooms_data, many=True)
@@ -43,12 +49,6 @@ def get_raw_data(self, filters: Filters):
         queue_rooms_data = queue_rooms_repository.queue_rooms(filters)
         queue_rooms_count = DashboardQueueRoomsSerializer(queue_rooms_data, many=True)
 
-        active_rooms_repository = ActiveChatsRepository()
-        active_rooms_data = active_rooms_repository.active_chats(filters)
-        active_rooms_count = DashboardActiveRoomsSerializer(
-            active_rooms_data, many=True
-        )
-
         serialized_active_rooms = active_rooms_count.data
         serialized_closed_rooms = closed_rooms_count.data
         serialized_transfer_count = transfer_count.data

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

@@ -53,6 +53,7 @@ def general(self, request, *args, **kwargs):
             agent=params.get("agent"),
             sector=params.get("sector"),
             tag=params.get("tag"),
+            queue=params.get("queue"),
             user_request=user_permission,
             project=project,
             is_weni_admin=True
@@ -82,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
@@ -114,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,
@@ -145,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,
@@ -239,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,
@@ -247,7 +252,6 @@ def export_dashboard(self, request, *args, **kwargs):
             else False,
         )
 
-        print("filter", filter)
         # Rooms Data
         rooms_service = RoomsDataService(
             ORMRoomsDataRepository(), RoomsCacheRepository()
@@ -306,31 +310,38 @@ def export_dashboard(self, request, *args, **kwargs):
                 data_frame.to_excel(
                     writer,
                     sheet_name="dashboard_infos",
-                    startrow=1,
+                    startrow=0,
                     startcol=0,
                     index=False,
                 )
+
+                start_row_1 = len(data_frame.index) + 2
                 data_frame_1.to_excel(
                     writer,
                     sheet_name="dashboard_infos",
-                    startrow=4 + len(data_frame.index),
+                    startrow=start_row_1,
                     startcol=0,
                     index=False,
                 )
+
+                start_row_2 = start_row_1 + len(data_frame_1.index) + 2
                 data_frame_2.to_excel(
                     writer,
                     sheet_name="dashboard_infos",
-                    startrow=8 + len(data_frame_1.index),
+                    startrow=start_row_2,
                     startcol=0,
                     index=False,
                 )
+
+                start_row_3 = start_row_2 + len(data_frame_2.index) + 2
                 data_frame_3.to_excel(
                     writer,
                     sheet_name="dashboard_infos",
-                    startrow=12 + len(data_frame_1.index),
+                    startrow=start_row_3,
                     startcol=0,
                     index=False,
                 )
+
             excel_buffer.seek(0)  # Move o cursor para o início do buffer
             storage = ExcelStorage()