wbcrm 1.49.3__tar.gz → 1.49.5__tar.gz

{wbcrm-1.49.3 → wbcrm-1.49.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcrm
-Version: 1.49.3
+Version: 1.49.5
 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.49.3 → wbcrm-1.49.5}/wbcrm/models/activities.py

@@ -9,7 +9,7 @@ from celery import shared_task
 from dateutil.rrule import rrulestr
 from django.conf import settings
 from django.db import models, transaction
-from django.db.models import Q
+from django.db.models import Exists, OuterRef, Q
 from django.db.models.query import QuerySet
 from django.db.models.signals import m2m_changed, post_delete, post_save
 from django.dispatch import receiver
@@ -687,6 +687,20 @@ class Activity(Recurrence):
             self.last_event_id = last_event.id
             self.save()
 
+    def get_participants_for_employer(self, employer: Entry) -> QuerySet[Person]:
+        rels = (
+            ActivityParticipant.objects.filter(activity=self)
+            .annotate(
+                is_employee=Exists(
+                    EmployerEmployeeRelationship.objects.filter(
+                        employee=OuterRef("participant"), employer=employer, primary=True
+                    )
+                )
+            )
+            .filter(is_employee=True)
+        )
+        return Person.objects.filter(id__in=rels.values("participant"))
+
     @staticmethod
     def get_inrange_activities(
         queryset: QuerySet["Activity"], start_date: date, end_date: date
@@ -857,7 +871,7 @@ def m2m_changed_companies(sender, instance: Activity, action: str, pk_set: set[i
                 entry = Entry.objects.get(id=company_id)
                 if action == "post_add":
                     instance.entities.add(entry)
-                elif not instance.participants.annotate_all().filter(primary_employer=company_id).exists():
+                elif not instance.get_participants_for_employer(entry).exists():
                     instance.entities.remove(entry)
         if action == "post_add":
             for company_id in pk_set:
@@ -1099,12 +1113,7 @@ class ActivityParticipant(models.Model):
         with suppress(EmployerEmployeeRelationship.DoesNotExist):
             rel = EmployerEmployeeRelationship.objects.get(employee=self.participant, primary=True)
             # delete only if no other participants are of the same company
-            if (
-                not self.activity.participants.annotate_all()
-                .exclude(id=rel.employee.id)
-                .filter(primary_employer=rel.employer)
-                .exists()
-            ):
+            if not self.activity.get_participants_for_employer(rel.employer).exclude(id=rel.employee.id).exists():
                 self.activity.companies.remove(rel.employer)
                 self.activity.entities.remove(rel.employer.entry_ptr)
         if self.activity.is_active: