wbcrm 1.56.0__tar.gz → 1.56.2__tar.gz

{wbcrm-1.56.0 → wbcrm-1.56.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcrm
-Version: 1.56.0
+Version: 1.56.2
 Summary: A workbench module that contains all the functionality related to a customer relationship management.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: django-eventtools==1.*

wbcrm-1.56.2/wbcrm/migrations/0018_activity_search_vector.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.0.12 on 2025-10-15 13:24
+
+import django.contrib.postgres.search
+import django.contrib.postgres.indexes
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wbcrm', '0017_event'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='activity',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(null=True),
+        ),
+        migrations.AddIndex(
+            model_name='activity',
+            index=django.contrib.postgres.indexes.GinIndex(fields=['search_vector'], name='activity_sv_gin_idx'),
+        ),
+    ]

{wbcrm-1.56.0 → wbcrm-1.56.2}/wbcrm/models/activities.py

@@ -1,6 +1,6 @@
 import zoneinfo
 from contextlib import suppress
-from datetime import date, datetime, timedelta
+from datetime import date, datetime, time, timedelta
 from typing import Any
 
 import arrow
@@ -8,8 +8,12 @@ import numpy as np
 from celery import shared_task
 from dateutil.rrule import rrulestr
 from django.conf import settings
+from django.contrib.postgres.aggregates import StringAgg
+from django.contrib.postgres.indexes import GinIndex
+from django.contrib.postgres.search import SearchVector, SearchVectorField
 from django.db import models, transaction
-from django.db.models import Exists, OuterRef, Q
+from django.db.backends.postgresql.psycopg_any import DateTimeTZRange
+from django.db.models import Exists, OuterRef, Q, Value
 from django.db.models.query import QuerySet
 from django.db.models.signals import m2m_changed, post_delete, post_save
 from django.dispatch import receiver
@@ -21,6 +25,7 @@ from django_fsm import FSMField, transition
 from dynamic_preferences.registries import global_preferences_registry
 from ics.alarm import DisplayAlarm
 from psycopg.types.range import TimestamptzRange
+from rest_framework.reverse import reverse
 from slugify import slugify
 from wbcore.contrib import workflow
 from wbcore.contrib.agenda.models import CalendarItem
@@ -51,6 +56,7 @@ from wbcore.utils.models import (
 
 from wbcrm.models.llm.activity_summaries import analyze_activity
 from wbcrm.models.recurrence import Recurrence
+from wbcrm.signals import add_employee_activity_to_daily_brief
 from wbcrm.synchronization.activity.shortcuts import get_backend
 from wbcrm.typings import Activity as ActivityDTO
 from wbcrm.typings import ParticipantStatus as ParticipantStatusDTO
@@ -216,6 +222,9 @@ class Activity(Recurrence):
     class Meta:
         verbose_name = _("Activity")
         verbose_name_plural = _("Activities")
+        indexes = [
+            GinIndex(fields=["search_vector"], name="activity_sv_gin_idx"),  # type: ignore
+        ]
         notification_types = [
             create_notification_type(
                 "wbcrm.activity.participant",
@@ -233,9 +242,18 @@ class Activity(Recurrence):
                 gettext("Notifies a user of a finished activity that can be reviewed."),
             ),
             create_notification_type(
-                "wbcrm.activity.daily_summary",
+                "wbcrm.activity.global_daily_summary",
                 gettext("Daily Summary"),
-                gettext("Sends out a daily summary of a user's upcoming day."),
+                gettext("Sends out a the global employees daily activities report"),
+                web=False,
+                mobile=False,
+                email=True,
+                is_lock=True,
+            ),
+            create_notification_type(
+                "wbcrm.activity.daily_brief",
+                gettext("Daily Brief"),
+                gettext("Sends out a daily brief for the user's upcoming day."),
                 web=False,
                 mobile=False,
                 email=True,
@@ -447,10 +465,25 @@ class Activity(Recurrence):
         verbose_name=_("Without Participating Company"),
     )
     metadata = models.JSONField(default=dict, blank=True)
+    search_vector = SearchVectorField(null=True)
 
     def __str__(self):
         return "%s" % (self.title,)
 
+    def update_search_vectors(self):
+        # Create the combined search vector manually
+        vector = (
+            SearchVector(Value(self.title), weight="A", config="english")
+            + SearchVector(Value(self.description), weight="B", config="english")
+            + SearchVector(Value(self.result), weight="B", config="english")
+        )
+        if self.id:
+            if participants_str := self.participants.aggregate(agg=StringAgg("computed_str", delimiter=" "))["agg"]:
+                vector += SearchVector(Value(participants_str), weight="C", config="english")
+            if companies_str := self.companies.aggregate(agg=StringAgg("computed_str", delimiter=" "))["agg"]:
+                vector += SearchVector(Value(companies_str), weight="C", config="english")
+        self.search_vector = vector
+
     def is_private_for_user(self, user) -> bool:
         return (
             self.visibility == CalendarItem.Visibility.PRIVATE
@@ -520,6 +553,7 @@ class Activity(Recurrence):
             )  # type
         self.is_cancelled = self.status == self.Status.CANCELLED
 
+        self.update_search_vectors()
         # Logic to be called after a save happens (e.g synchronization). We get the activity DTO before saving that we passed around in the signal
         super().save(*args, **kwargs)
 
@@ -851,6 +885,9 @@ def m2m_changed_participants(sender, instance: Activity, action: str, pk_set: se
                     send_employee_notification.delay(instance.id, participant_id)
             else:
                 rel.delete()
+        if action == "post_add":
+            instance.update_search_vectors()
+            Activity.objects.filter(id=instance.id).update(search_vector=instance.search_vector)
 
 
 @receiver(m2m_changed, sender=Activity.companies.through)
@@ -879,6 +916,10 @@ def m2m_changed_companies(sender, instance: Activity, action: str, pk_set: set[i
                         activity=instance,
                     ).save()
 
+        if action == "post_add":
+            instance.update_search_vectors()
+            Activity.objects.filter(id=instance.id).update(search_vector=instance.search_vector)
+
 
 @receiver(m2m_changed, sender=Activity.groups.through)  # type: ignore
 def m2m_changed_groups(sender, instance: Activity, action, pk_set, **kwargs):
@@ -1345,3 +1386,37 @@ def add_employer_to_activities(eer_id: int):
                 activity.entities.add(eer_obj.employer)
             if eer_obj.employer not in activity.companies.all():
                 activity.companies.add(eer_obj.employer)
+
+
+@receiver(add_employee_activity_to_daily_brief, sender="directory.Person")
+def daily_activity_summary(sender, instance: Person, val_date: date, **kwargs) -> tuple[str, str] | None:
+    tz_info = timezone.get_current_timezone()
+    period = DateTimeTZRange(
+        lower=datetime.combine(val_date, time(0, 0, 0), tzinfo=tz_info),
+        upper=datetime.combine(val_date + timedelta(days=1), time(0, 0, 0), tzinfo=tz_info),
+    )
+
+    # Get all the employee's activities from that day
+    activity_qs: QuerySet[Activity] = (
+        Activity.objects.exclude(status=Activity.Status.CANCELLED)
+        .filter(period__overlap=period, participants=instance)
+        .order_by("period__startswith")
+    )
+
+    # Create the formatted activity dictionaries
+    activity_list = []
+    message = ""
+    for activity in activity_qs:
+        activity_list.append(
+            {
+                "type": activity.type.title,
+                "title": activity.title,
+                "start": activity.period.lower,
+                "end": activity.period.upper,
+                "endpoint": reverse("wbcrm:activity-detail", args=[activity.pk]),
+            }
+        )
+    if activity_list:
+        context = {"activities": activity_list}
+        message = render_to_string("email/daily_summary.html", context)
+    return "Daily Activity Summary", message

{wbcrm-1.56.0 → wbcrm-1.56.2}/wbcrm/serializers/activities.py

@@ -140,7 +140,7 @@ class ActivityCompanyThroughModelRepresentationSerializer(wb_serializers.Represe
 
     def to_representation(self, value):
         rep = super().to_representation(value)
-        rep["id"] = value.company.id
+        rep["id"] = value.company_id
         return rep
 
     class Meta:

wbcrm-1.56.2/wbcrm/signals.py

@@ -0,0 +1,4 @@
+from django.db.models.signals import ModelSignal
+
+# this signal gathers all activity report needed to be inserted into the daily brief
+add_employee_activity_to_daily_brief = ModelSignal(use_caching=True)

{wbcrm-1.56.0 → wbcrm-1.56.2}/wbcrm/synchronization/activity/controller.py

@@ -4,7 +4,6 @@ import operator
 from functools import reduce
 from typing import Any
 
-from django.conf import settings
 from django.db import transaction
 from django.db.models import Q, QuerySet
 from django.http import HttpRequest, HttpResponse
@@ -47,8 +46,6 @@ class ActivityController:
     ]
 
     def __init__(self, backend: SyncBackend):
-        if settings.DEBUG:
-            raise ValueError("DEBUG Mode -> activity sync disabled")
         self.backend = backend()
 
     def _is_valid(self, activity_dto: ActivityDTO) -> bool:

wbcrm-1.56.2/wbcrm/synchronization/activity/shortcuts.py

@@ -0,0 +1,16 @@
+from contextlib import suppress
+
+from django.conf import settings
+from dynamic_preferences.exceptions import NotFoundInRegistry
+from dynamic_preferences.registries import global_preferences_registry
+from wbcore.utils.importlib import import_from_dotted_path
+
+
+def get_backend():
+    from wbcrm.synchronization.activity.controller import ActivityController
+
+    if not settings.DEBUG:
+        with suppress(NotFoundInRegistry):
+            if backend := global_preferences_registry.manager()["wbactivity_sync__sync_backend_calendar"]:
+                backend = import_from_dotted_path(backend)
+                return ActivityController(backend=backend)

{wbcrm-1.56.0 → wbcrm-1.56.2}/wbcrm/tasks.py

@@ -5,6 +5,7 @@ from datetime import date, datetime, time, timedelta
 
 from celery import shared_task
 from django.contrib.auth import get_user_model
+from django.db.backends.postgresql.psycopg_any import DateTimeTZRange
 from django.db.models import (
     F,
     FloatField,
@@ -23,12 +24,12 @@ from django.utils import timezone
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext as _
 from dynamic_preferences.registries import global_preferences_registry
-from psycopg.types.range import TimestamptzRange
 from rest_framework.reverse import reverse
 from wbcore.contrib.directory.models import Company, Person
 from wbcore.contrib.notifications.dispatch import send_notification
 
 from wbcrm.models import Activity, ActivityType
+from wbcrm.signals import add_employee_activity_to_daily_brief
 
 logger = logging.getLogger()
 User = get_user_model()
@@ -54,10 +55,10 @@ def notify(time_offset: int = 60, now: datetime | None = None):
     for reminder in reminder_choices:
         # get the reminder correspondance in minutes
         reminder_minutes = Activity.ReminderChoice.get_minutes_correspondance(reminder)
-        reminder_range = TimestamptzRange(
+        reminder_range = DateTimeTZRange(
             now + timedelta(minutes=reminder_minutes),
             now + timedelta(minutes=reminder_minutes) + timedelta(seconds=time_offset),
-        )  # type: ignore #ErrMsg: Expected no arguments to "TimestamptzRange" constructor
+        )  # type: ignore #ErrMsg: Expected no arguments to "DateTimeTZRange" constructor
         # get all incoming activity with same reminder that happen during the notify interval
         upcoming_occurence = base_queryset.filter(
             reminder_choice=reminder, period__startswith__contained_by=reminder_range
@@ -108,7 +109,7 @@ def yesterdays_activity_summary(yesterday: date | None = None, report_receiver_u
     if not yesterday:
         yesterday = date.today() - timedelta(days=1)
     yesterday = datetime.combine(yesterday, time(0, 0, 0))  # we convert the date to datetime
-    time_range = TimestamptzRange(make_aware(yesterday), make_aware(yesterday + timedelta(days=1)))  # type: ignore #ErrMsg: Expected no arguments to "TimestamptzRange" constructor
+    time_range = DateTimeTZRange(make_aware(yesterday), make_aware(yesterday + timedelta(days=1)))  # type: ignore #ErrMsg: Expected no arguments to "DateTimeTZRange" constructor
 
     # Create the list of all employees' activities for yesterday
     employees_list: list[Person] = list(Person.objects.filter_only_internal())
@@ -132,8 +133,8 @@ def yesterdays_activity_summary(yesterday: date | None = None, report_receiver_u
                     {
                         "type": activity.type.title,
                         "title": activity.title,
-                        "start": activity.period.lower,  # type: ignore #ErrMsg: Cannot access member "lower" for type "TimestamptzRange"
-                        "end": activity.period.upper,  # type: ignore #ErrMsg: Cannot access member "upper" for type "TimestamptzRange"
+                        "start": activity.period.lower,  # type: ignore #ErrMsg: Cannot access member "lower" for type "DateTimeTZRange"
+                        "end": activity.period.upper,  # type: ignore #ErrMsg: Cannot access member "upper" for type "DateTimeTZRange"
                         "endpoint": reverse("wbcrm:activity-detail", args=[activity.pk]),
                     }
                     for activity in employees_activities
@@ -150,7 +151,7 @@ def yesterdays_activity_summary(yesterday: date | None = None, report_receiver_u
         }
         message = render_to_string("email/global_daily_summary.html", context)
         send_notification(
-            code="wbcrm.activity.daily_summary",
+            code="wbcrm.activity.global_daily_summary",
             title=_("Activity Summary {}").format(yesterday.strftime("%d.%m.%Y")),
             body=message,
             user=user,
@@ -158,50 +159,28 @@ def yesterdays_activity_summary(yesterday: date | None = None, report_receiver_u
 
 
 @shared_task
-def todays_activity_summary(today: date | None = None):
-    """Creates a summary of the daily upcoming activities for all employees
-
+def daily_brief(today: date | None = None, **kwargs):
+    """Creates a summary of the daily brief for all internal employees
     Args:
         today (date | None, optional): Date of today. Defaults to None.
     """
 
     if not today:
         today = date.today()
-    tz_info = timezone.get_current_timezone()
-    today_range = TimestamptzRange(
-        lower=datetime.combine(today, time(0, 0, 0)).replace(tzinfo=tz_info),
-        upper=datetime.combine(today + timedelta(days=1), time(0, 0, 0).replace(tzinfo=tz_info)),
-    )
-
     for employee in Person.objects.filter_only_internal():
-        # Get all the employee's activities from that day
-        activity_qs: QuerySet[Activity] = (
-            Activity.objects.exclude(status=Activity.Status.CANCELLED)
-            .filter(period__overlap=today_range, participants=employee)
-            .order_by("period__startswith")
-        )
-
-        # Create the formatted activity dictionaries
-        activity_list = []
-        for activity in activity_qs:
-            activity_list.append(
-                {
-                    "type": activity.type.title,
-                    "title": activity.title,
-                    "start": activity.period.lower,
-                    "end": activity.period.upper,
-                    "endpoint": reverse("wbcrm:activity-detail", args=[activity.pk]),
-                }
-            )
-
-        # Create the proper notification for each employee
-        if activity_list and employee.primary_email_contact():
-            context = {"activities": activity_list}
-            message = render_to_string("email/daily_summary.html", context)
+        daily_brief = ""
+        for receiver, res in add_employee_activity_to_daily_brief.send(  # noqa: B007
+            sender=Person, instance=employee, val_date=today, **kwargs
+        ):
+            if res:
+                title, html = res
+                daily_brief += f"<h2 text-align: center;>{title}</h2>\n<div style='margin-bottom: 1.5em; text-align: left;'>{html}</div>\n"
+
+        if daily_brief:
             send_notification(
-                code="wbcrm.activity.daily_summary",
-                title=_("Your Schedule for Today"),
-                body=message,
+                code="wbcrm.activity.daily_brief",
+                title=_("Your Daily Brief"),
+                body=daily_brief,
                 user=employee.user_account,
             )
 

{wbcrm-1.56.0 → wbcrm-1.56.2}/wbcrm/viewsets/activities.py

@@ -95,7 +95,7 @@ class ActivityViewSet(RecurrenceModelViewSetMixin, CalendarItemViewSet):
     LIST_DOCUMENTATION = "wbcrm/markdown/documentation/activity.md"
 
     ordering = ["-edited", "id"]
-    search_fields = ("title", "description", "result")
+    search_fields = ("search_vector",)
     serializer_class = crm_serializers.ActivityModelSerializer
     display_config_class = ActivityDisplay
     title_config_class = ActivityTitleConfig
@@ -180,11 +180,7 @@ class ActivityViewSet(RecurrenceModelViewSetMixin, CalendarItemViewSet):
         return (
             Activity.get_activities_for_user(user, base_qs=super().get_queryset())
             .select_related("latest_reviewer", "type")
-            .prefetch_related(
-                "groups",
-                "participants",
-                "companies",
-            )
+            .prefetch_related("groups", "participants", "companies", "activity_companies")
         )
 
     def add_messages(self, request, instance: Activity | None = None, **kwargs):

wbcrm-1.56.0/wbcrm/synchronization/activity/shortcuts.py

@@ -1,14 +0,0 @@
-from contextlib import suppress
-
-from dynamic_preferences.exceptions import NotFoundInRegistry
-from dynamic_preferences.registries import global_preferences_registry
-from wbcore.utils.importlib import import_from_dotted_path
-
-
-def get_backend():
-    from wbcrm.synchronization.activity.controller import ActivityController
-
-    with suppress(NotFoundInRegistry):
-        if backend := global_preferences_registry.manager()["wbactivity_sync__sync_backend_calendar"]:
-            backend = import_from_dotted_path(backend)
-            return ActivityController(backend=backend)