wbintegrator_office365 1.55.3__tar.gz → 1.55.5__tar.gz

{wbintegrator_office365-1.55.3 → wbintegrator_office365-1.55.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbintegrator_office365
-Version: 1.55.3
+Version: 1.55.5
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: bs4==0.0.*
 Requires-Dist: oauthlib==3.1.*

{wbintegrator_office365-1.55.3 → wbintegrator_office365-1.55.5}/wbintegrator_office365/models/event.py

@@ -290,15 +290,23 @@ class CallUser(WBModel):
         on_delete=models.deletion.SET_NULL,
     )
 
-    def __str__(self):
+    def get_humanized_repr(self) -> str | None:
         if self.tenant_user:
             if self.tenant_user.profile:
-                return f"{self.tenant_user.profile.computed_str}"
+                return str(self.tenant_user.profile)
             elif self.tenant_user.mail or self.tenant_user.display_name:
                 mail = self.tenant_user.mail if self.tenant_user.mail else self.tenant_user.id
                 return f"{self.tenant_user.display_name}({mail})"
             else:
-                return f"{self.tenant_user.tenant_id}"
+                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] == "+":
+                    return self.tenant_user.tenant_id
+
+    def __str__(self):
+        if repr := self.get_humanized_repr():
+            return repr
         return f"{self.id}"
 
     @classmethod

wbintegrator_office365-1.55.5/wbintegrator_office365/tasks.py

@@ -0,0 +1,154 @@
+from datetime import date, timedelta
+
+import humanize
+from celery import shared_task
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Group
+from django.db.models import DurationField, ExpressionWrapper, F, Q
+from wbcore.contrib.directory.models import Person
+from wbcore.contrib.notifications.dispatch import send_notification
+from wbcore.permissions.shortcuts import get_internal_users
+
+from wbintegrator_office365.importer import MicrosoftGraphAPI
+from wbintegrator_office365.models.event import CallEvent
+from wbintegrator_office365.models.subscription import Subscription
+
+
+def format_td(td: timedelta) -> str:
+    total_seconds = td.total_seconds()
+    if total_seconds == 0:
+        return "Missed"
+    elif total_seconds < 60:
+        return "< 1min"
+    return humanize.precisedelta(td, suppress=["hours"], minimum_unit="seconds", format="%0.0f")
+
+
+@shared_task
+def send_call_summary(
+    to_emails: list,
+    profile_ids: list[int] | None = None,
+    group_id: int | None = None,
+    offset: int = 0,
+    include_detail: bool = True,
+):
+    internal_users = get_internal_users().filter(is_active=True)
+    profiles = Person.objects.filter(user_account__in=internal_users)
+    if profile_ids:
+        profiles = profiles.filter(id__in=profile_ids)
+    elif group_id:
+        profiles = profiles.filter(user_account__in=Group.objects.get(id=group_id).user_set.all())
+
+    end_date = date.today()
+    start_date = end_date - timedelta(days=offset)
+    if offset == 0:
+        frequency_repr = "Daily"
+        date_repr = start_date.strftime("%Y-%m-%d")
+    elif offset == 7:
+        frequency_repr = "Weekly"
+        date_repr = f"From {start_date:%Y-%m-%d} To {end_date:%Y-%m-%d}"
+    else:
+        frequency_repr = f"{offset} days"
+        date_repr = f"From {start_date:%Y-%m-%d} To {end_date:%Y-%m-%d}"
+
+    date_repr = f"{date_repr} ({frequency_repr})"
+    calls = CallEvent.objects.filter(
+        start__date__gte=start_date,
+        end__date__lte=end_date,
+    ).annotate(duration=ExpressionWrapper(F("end") - F("start"), output_field=DurationField()))
+    if profiles.exists():
+        message = """
+        <div style="background-color: white; width: 720px;  margin-bottom: 50px">
+        """
+        for profile in profiles:
+            call_events = calls.filter(
+                participants__tenant_user__profile=profile,
+            ).order_by("start")
+
+            message += f"""
+            <div style="text-align: left;">
+                <p><b>{profile.computed_str}</b></p>
+                <table width="100%; table-layout: fixed; border-collapse: collapse;">
+                    <tr>
+                        <td style="width: 33.33%; text-align: center;">Total Calls: <b>{call_events.count()}</b></td>
+                        <td style="width: 33.33%; text-align: center;">under 1 minute: <b>{call_events.filter(duration__lte=timedelta(seconds=60)).count()}</b></td>
+                        <td style="width: 33.33%; text-align: center;">above 1 minute: <b>{call_events.filter(duration__gt=timedelta(seconds=60)).count()}</b></td>
+                    </tr>
+                </table>
+            </div>
+            """
+            if include_detail:
+                for call_date in call_events.dates("start", "day"):
+                    call_day_events = call_events.filter(start__date=call_date)
+                    if call_day_events.exists():
+                        message += f"<p><b>{call_date:%Y-%m-%d}:</b></p>"
+                        message += "<table style='border-collapse: collapse; width: 720px; table-layout: fixed;'> \
+                                    <tr style='color: white; background-color: #1868ae;'> \
+                                        <th style='border: 1px solid #ddd;padding: 2px 7px; width: 20px;' >Start</th> \
+                                        <th style='border: 1px solid #ddd;padding: 2px 7px; width: 20px;' >End</th> \
+                                        <th style='border: 1px solid #ddd;padding: 2px 7px; width: 60px;' >Duration</th> \
+                                        <th style='border: 1px solid #ddd;padding: 2px 7px; width: 80px;' >Organized by</th> \
+                                        <th style='border: 1px solid #ddd;padding: 2px 7px; width: 150px;' >Participants</th> \
+                                    </tr>"
+                        for call in call_day_events:
+                            participants = ",".join(
+                                filter(
+                                    None,
+                                    [
+                                        p.get_humanized_repr()
+                                        for p in call.participants.exclude(tenant_user__profile=profile)
+                                    ],
+                                )
+                            )
+                            message += f"<tr> \
+                                        <td style='border: 1px solid #ddd;padding: 2px; width: 20px;' >{call.start.astimezone():%H:%M}</td> \
+                                        <td style='border: 1px solid #ddd;padding: 2px; width: 20px;' >{call.end.astimezone():%H:%M}</td> \
+                                        <td style='border: 1px solid #ddd;padding: 2px; width: 60px;' text-align:center;><b>{format_td(call.end - call.start)}</b></td> \
+                                        <td style='border: 1px solid #ddd;padding: 2px; width: 80px;' ><b>{call.organizer}</b></td> \
+                                        <td style='border: 1px solid #ddd;padding: 2px; width: 150px;' >{participants}</td> \
+                                    </tr>"
+                        message += "</table><br/>"
+
+        message += "</div>"
+        for to_email in to_emails:
+            recipient = get_user_model().objects.get(email=to_email)
+            send_notification(
+                code="wbintegrator_office365.callevent.call_summary",
+                title=f"Call summary - {date_repr}",
+                body=message,
+                user=recipient,
+            )
+
+
+@shared_task
+def notify_no_active_call_record_subscription(to_email):
+    recipient = get_user_model().objects.filter(email=to_email)
+    ms_subscriptions = [elt.get("id") for elt in MicrosoftGraphAPI().subscriptions()]
+    qs_subscriptions = Subscription.objects.filter(
+        Q(is_enable=True) & Q(subscription_id__isnull=False) & Q(type_resource=Subscription.TypeResource.CALLRECORD)
+    )
+    enable_subcriptions = qs_subscriptions.filter(subscription_id__in=ms_subscriptions)
+    if recipient.exists() and (
+        len(ms_subscriptions) == 0 or (qs_subscriptions.count() > 0 and enable_subcriptions.count() == 0)
+    ):
+        _day = date.today()
+        send_notification(
+            code="wbintegrator_office365.callevent.notify",
+            title=f"No active Call Record subscriptions in Microsoft - {_day}",
+            body=f"""<p>There are currently no active Call record subscriptions in Microsoft, so we are no longer receiving calls, Please check</p>
+            <ul>
+                <li>Number of subscriptions on Microsoft: <b>{len(ms_subscriptions)}</b></li>
+                <li>Number of Call subscriptions: <b>{qs_subscriptions.count()}</b></li>
+                <li>Number of enabled calling subscriptions: <b>{enable_subcriptions.count()}</b></li>
+
+            </ul>
+            """,
+            user=recipient.first(),
+        )
+
+
+@shared_task
+def periodic_resubscribe_task():
+    for subscription in Subscription.objects.filter(
+        is_enable=True, type_resource=Subscription.TypeResource.CALLRECORD, subscription_id__isnull=False
+    ):
+        subscription.resubscribe()

wbintegrator_office365-1.55.3/wbintegrator_office365/tasks.py

@@ -1,109 +0,0 @@
-import math
-from datetime import date, timedelta
-
-from celery import shared_task
-from django.contrib.auth import get_user_model
-from django.db.models import Q
-from wbcore.contrib.directory.models import Person
-from wbcore.contrib.notifications.dispatch import send_notification
-
-from wbintegrator_office365.importer import MicrosoftGraphAPI
-from wbintegrator_office365.models.event import CallEvent
-from wbintegrator_office365.models.subscription import Subscription
-
-
-@shared_task
-def send_call_summary(to_emails: list, profile_ids: list, offset: int = 1):
-    for to_email in to_emails:
-        if (recipient := get_user_model().objects.filter(email=to_email).first()) and (
-            profiles := Person.objects.filter(id__in=profile_ids)
-        ):
-            _day = date.today() - timedelta(days=offset)
-
-            message = "<html><head><style> #summery_table tr:nth-child(even){background-color: #f2f2f2;}</style></head><body>"
-
-            for profile in profiles:
-                call_events = CallEvent.objects.filter(
-                    participants__tenant_user__profile__computed_str__icontains=profile.computed_str,
-                    start__date=_day,
-                    end__date=_day,
-                ).order_by("start")
-
-                message += f"<p> \
-                                <span><b> {profile.computed_str} </b></span><br/> \
-                                <span>Date: <b>{_day}</b> </span><br/> \
-                                <span>Total number of calls: <b>{call_events.count()}</b> </span> \
-                            </p>"
-                if call_events.count():
-                    message += "<table id='summery_table' style='border-collapse: collapse;'> \
-                                <tr style='color: white; background-color: #1868ae;'> \
-                                    <th style='border: 1px solid #ddd;padding: 10px 7px;' >Start</th> \
-                                    <th style='border: 1px solid #ddd;padding: 10px 7px;' >End</th> \
-                                    <th style='border: 1px solid #ddd;padding: 10px 7px;' >Duration (min)</th> \
-                                    <th style='border: 1px solid #ddd;padding: 10px 7px;' >Organized by</th> \
-                                    <th style='border: 1px solid #ddd;padding: 10px 7px;' >Participants</th> \
-                                </tr>"
-                    for call in call_events:
-                        participants = ""
-                        count = 0
-                        total_participants = call.participants.exclude(tenant_user__profile=profile).count()
-                        for participant in call.participants.exclude(tenant_user__profile=profile):
-                            count += 1
-                            participants += f"{participant.__str__()}"
-                            if count < total_participants:
-                                participants += ", "
-
-                        delta_in_minutes = divmod((call.end - call.start).total_seconds(), 60)
-                        _duration = f"{math.floor(delta_in_minutes[0])}:{math.floor(delta_in_minutes[1])}"
-                        message += f"<tr> \
-                                    <td style='border: 1px solid #ddd;padding: 2px;' >{call.start.astimezone().strftime('%Y-%m-%d %H:%M:%S')}</td> \
-                                    <td style='border: 1px solid #ddd;padding: 2px;' >{call.end.astimezone().strftime('%Y-%m-%d %H:%M:%S')}</td> \
-                                    <td style='border: 1px solid #ddd;padding: 0px;' text-align:center;><b>{_duration}</b></td> \
-                                    <td style='border: 1px solid #ddd;padding: 2px;' ><b>{call.organizer.__str__()}</b></td> \
-                                    <td style='border: 1px solid #ddd;padding: 2px;' >{participants}</td> \
-                                </tr>"
-                    message += "</table><br/>"
-
-            message += "</body></html>"
-
-        send_notification(
-            code="wbintegrator_office365.callevent.call_summary",
-            title=f"Call summary - {_day}",
-            body=message,
-            user=recipient,
-        )
-
-
-@shared_task
-def notify_no_active_call_record_subscription(to_email):
-    recipient = get_user_model().objects.filter(email=to_email)
-    ms_subscriptions = [elt.get("id") for elt in MicrosoftGraphAPI().subscriptions()]
-    qs_subscriptions = Subscription.objects.filter(
-        Q(is_enable=True) & Q(subscription_id__isnull=False) & Q(type_resource=Subscription.TypeResource.CALLRECORD)
-    )
-    enable_subcriptions = qs_subscriptions.filter(subscription_id__in=ms_subscriptions)
-    if recipient.exists() and (
-        len(ms_subscriptions) == 0 or (qs_subscriptions.count() > 0 and enable_subcriptions.count() == 0)
-    ):
-        _day = date.today()
-        send_notification(
-            code="wbintegrator_office365.callevent.notify",
-            title=f"No active Call Record subscriptions in Microsoft - {_day}",
-            body=f"""<p>There are currently no active Call record subscriptions in Microsoft, so we are no longer receiving calls, Please check</p>
-            <ul>
-                <li>Number of subscriptions on Microsoft: <b>{len(ms_subscriptions)}</b></li>
-                <li>Number of Call subscriptions: <b>{qs_subscriptions.count()}</b></li>
-                <li>Number of enabled calling subscriptions: <b>{enable_subcriptions.count()}</b></li>
-
-            </ul>
-            """,
-            user=recipient.first(),
-        )
-
-
-@shared_task
-def periodic_resubscribe_task():
-    for subscription in Subscription.objects.filter(
-        is_enable=True, type_resource=Subscription.TypeResource.CALLRECORD, subscription_id__isnull=False
-    ):
-        subscription.resubscribe()