wbintegrator_office365 1.55.9__tar.gz → 1.56.0__tar.gz

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/PKG-INFO

@@ -1,7 +1,8 @@
 Metadata-Version: 2.4
 Name: wbintegrator_office365
-Version: 1.55.9
+Version: 1.56.0
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
+Requires-Dist: boto3>=1.35.99
 Requires-Dist: bs4==0.0.*
 Requires-Dist: oauthlib==3.1.*
 Requires-Dist: requests-oauthlib==1.3.*

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/pyproject.toml

@@ -11,6 +11,7 @@ dependencies = [
   "oauthlib == 3.1.*",
   "requests-oauthlib == 1.3.*",
   "bs4 == 0.0.*",
+  "boto3>=1.35.99",
 ]
 
 [tool.uv.sources]

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/wbintegrator_office365/importer/api.py

@@ -22,7 +22,7 @@ class MicrosoftGraphAPI:
         self.graph_url = getattr(settings, "WBINTEGRATOR_OFFICE365_GRAPH_URL", "")
 
         global_preferences = global_preferences_registry.manager()
-        if global_preferences["wbintegrator_office365__access_token"] == "0":
+        if global_preferences["wbintegrator_office365__access_token"] == "0":  # noqa
             global_preferences["wbintegrator_office365__access_token"] = self._get_access_token()
 
     def _get_administrator_consent(self):
@@ -385,13 +385,13 @@ class MicrosoftGraphAPI:
             global_preferences = global_preferences_registry.manager()
             headers["Authorization"] = f'Bearer {global_preferences["wbintegrator_office365__access_token"]}'
         if method == "POST":
-            response = requests.post(url, data=data, headers=headers)
+            response = requests.post(url, data=data, headers=headers, timeout=10)
         elif method == "DELETE":
-            response = requests.delete(url, headers=headers)
+            response = requests.delete(url, headers=headers, timeout=10)
         elif method == "PATCH":
-            response = requests.patch(url, data=data, headers=headers)
+            response = requests.patch(url, data=data, headers=headers, timeout=10)
         else:
-            response = requests.get(url, headers=headers, params=params)
+            response = requests.get(url, headers=headers, params=params, timeout=10)
         if response.status_code == status.HTTP_401_UNAUTHORIZED:
             new_token = self._get_access_token()
             if new_token != global_preferences["wbintegrator_office365__access_token"]:

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/wbintegrator_office365/models/event.py

@@ -94,7 +94,7 @@ class Event(WBModel):
         )
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbintegrator_office365:event"
 
     @classmethod
@@ -254,7 +254,7 @@ class EventLog(WBModel):
     data = models.JSONField(default=dict, null=True, blank=True)
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbintegrator_office365:eventlog"
 
     @classmethod
@@ -301,8 +301,10 @@ class CallUser(WBModel):
                 contacts = TelephoneContact.objects.filter(number=self.tenant_user.tenant_id, entry__isnull=False)
                 if contacts.exists():
                     return str(contacts.first().entry)
-                elif self.tenant_user.tenant_id[0] == "+":
+                elif self.tenant_user.tenant_id and self.tenant_user.tenant_id[0] == "+":
                     return self.tenant_user.tenant_id
+                else:
+                    return self.tenant_user.display_name
 
     def __str__(self):
         if repr := self.get_humanized_repr():

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/wbintegrator_office365/models/subscription.py

@@ -59,7 +59,7 @@ class Subscription(WBModel):
             )
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbintegrator_office365:subscription"
 
     @classmethod

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/wbintegrator_office365/tasks.py

@@ -1,5 +1,8 @@
+import os
+from collections import defaultdict
 from datetime import date, timedelta
 
+import boto3
 import humanize
 from celery import shared_task
 from django.contrib.auth import get_user_model
@@ -23,6 +26,65 @@ def format_td(td: timedelta) -> str:
     return humanize.precisedelta(td, suppress=["hours"], minimum_unit="seconds", format="%0.0f")
 
 
+#################################################
+################# TEMPORARY #####################
+#################################################
+
+
+def convert_user(user):
+    email = user["Attributes"][0]["Value"]
+    first = user["Attributes"][3]["Value"]
+    last = user["Attributes"][2]["Value"]
+
+    return f"{email} ({first} {last})"
+
+
+def get_fundy_users():
+    access_key = os.environ["FUNDY_BOTO_ACCESS_KEY"]
+    secret_access_key = os.environ["FUNDY_BOTO_SECRET_ACCESS_KEY"]
+
+    client = boto3.client(
+        "cognito-idp", region_name="eu-north-1", aws_access_key_id=access_key, aws_secret_access_key=secret_access_key
+    )
+
+    pagination_token = None
+    users = []
+    while True:
+        if not pagination_token:
+            response = client.list_users(
+                UserPoolId="eu-north-1_IFRQriJAf",
+            )
+        else:
+            response = client.list_users(
+                UserPoolId="eu-north-1_IFRQriJAf",
+                PaginationToken=pagination_token,
+            )
+
+        users.extend(response["Users"])
+        if response.get("PaginationToken", None) is None:
+            break
+        else:
+            pagination_token = response["PaginationToken"]
+
+    users_date = defaultdict(list)
+    for user in sorted(users, key=lambda x: x["UserCreateDate"]):
+        users_date[user["UserCreateDate"].date()].append(convert_user(user))
+    return users_date, len(users)
+
+
+def get_fundy_user_statistics():
+    today = date.today()
+    users, total_users = get_fundy_users()
+
+    yesterday_users = users.get(today - timedelta(days=1), [])
+    return yesterday_users, len(yesterday_users), total_users
+
+
+#################################################
+################ TEMPORARY END ##################
+#################################################
+
+
 @shared_task
 def send_call_summary(
     to_emails: list,
@@ -109,6 +171,21 @@ def send_call_summary(
                         message += "</table><br/>"
 
         message += "</div>"
+
+        ######## TEMPORARY START ########
+        yesterday_users, yesterday_users_count, total_users_count = get_fundy_user_statistics()
+        message += f"""
+        <div>
+        <h3>FUNDY USER STATISTICS</h3>
+        <strong>Yesterday Users:</strong> {yesterday_users_count}
+        <strong>Total Users:</strong> {total_users_count}
+        <ul>
+        """
+        for user in yesterday_users:
+            message += f"<li>{user}</li>"
+        message += "</ul></div>"
+        ######## TEMPORARY END ########
+
         title = f"Call summary - {date_repr}"
         if include_detail:
             title = "Detailed " + title

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/wbintegrator_office365/tests/test_admin.py

@@ -6,6 +6,7 @@ from django.contrib.messages import get_messages, storage
 from rest_framework import status
 from rest_framework.test import APIRequestFactory
 from wbcore.test.utils import get_or_create_superuser
+
 from wbintegrator_office365.admin import SubscriptionAdmin, TenantUserAdmin
 from wbintegrator_office365.factories import TenantUserFactory
 from wbintegrator_office365.models import Subscription, TenantUser

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/wbintegrator_office365/tests/test_models.py

@@ -1,6 +1,7 @@
 from unittest.mock import patch
 
 import pytest
+
 from wbintegrator_office365.factories import EventFactory, SubscriptionFactory
 from wbintegrator_office365.importer import DisableSignals
 from wbintegrator_office365.models import (

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/wbintegrator_office365/tests/test_tasks.py

@@ -6,6 +6,7 @@ import phonenumbers
 import pytest
 from rest_framework import status
 from wbcore.contrib.directory.factories import TelephoneContactFactory
+
 from wbintegrator_office365.factories import SubscriptionFactory, TenantUserFactory
 from wbintegrator_office365.importer import parse
 from wbintegrator_office365.models import CallEvent, Subscription

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/wbintegrator_office365/tests/test_views.py

@@ -7,6 +7,7 @@ from rest_framework.test import APIRequestFactory
 from wbcore.contrib.authentication.factories import InternalUserFactory
 from wbcore.test.utils import get_or_create_superuser
 from wbhuman_resources.factories import EmployeeHumanResourceFactory
+
 from wbintegrator_office365.factories import CallEventFactory, CallUserFactory
 from wbintegrator_office365.viewsets.viewsets import (
     CallEventReceptionTime,
@@ -63,7 +64,7 @@ class TestView:
     )
     @patch("wbintegrator_office365.importer.MicrosoftGraphAPI._get_access_token")
     @patch("wbintegrator_office365.importer.MicrosoftGraphAPI.users")
-    def test_get_plotly_CallEventSummaryGraph(self, mock_users, mock_acess, mvs, factory, empty_compare_employee):
+    def test_get_plotly_calleventsummarygraph(self, mock_users, mock_acess, mvs, factory, empty_compare_employee):
         request = APIRequestFactory().get("")
         request.user = get_or_create_superuser()
 

{wbintegrator_office365-1.55.9 → wbintegrator_office365-1.56.0}/wbintegrator_office365/viewsets/viewsets.py

@@ -445,7 +445,7 @@ class CallEventSummaryGraph(viewsets.ChartViewSet):
             df = df.sort_values(by=["day"]).reset_index()
         return df
 
-    def get_plotly(self, queryset):
+    def get_plotly(self, queryset):  # noqa: C901
         fig = go.Figure()
         if queryset.exists():
             df = pd.DataFrame(queryset.annotate(day=F("created__date")).values("start", "end", "day"))
@@ -740,5 +740,5 @@ def listen(request):
             for notification in notifications:
                 # print(colored(f"{timezone.now():%Y-%m-%d %H:%M:%S.%f} {notification}", 'blue'))
                 if (resource_data := notification.get("resource_data")) and (id_event := resource_data.get("id")):
-                    transaction.on_commit(lambda: handle_event_from_webhook.delay(id_event, notification))
+                    transaction.on_commit(lambda obj=notification: handle_event_from_webhook.delay(id_event, obj))
     return HttpResponse(notifications, content_type="text/plain")