change counting method for new attendances

connect/billing/utils.py

@@ -3,6 +3,7 @@
 from typing import Tuple
 from connect.billing.models import Contact
 import pendulum
+from itertools import groupby
 
 
 def day_period(day: DateTime) -> Tuple[DateTime, ...]:
@@ -34,3 +35,31 @@ def get_attendances(project: Project, start: str, end: str) -> int:
         total_per_project += day_attendances
 
     return total_per_project
+
+
+def count_attendances(contact_group: list):
+    attendances = 1
+    base_contact = contact_group[0]
+
+    for contact in contact_group:
+        date_period = pendulum.instance(base_contact.last_seen_on) - pendulum.instance(contact.last_seen_on)
+        if abs(date_period.days) >= 1:
+            attendances += 1
+            base_contact = contact
+
+    return attendances
+
+
+def custom_get_attendances(project: Project, start: str, end: str):
+    start = pendulum.parse(start)
+    end = pendulum.parse(end)
+    total_attendances = 0
+
+    contacts = Contact.objects.filter(last_seen_on__range=(start, end), project=project).order_by("contact_flow_uuid", "-last_seen_on")
+    grouped_contacts = groupby(contacts, lambda contact: contact.contact_flow_uuid)
+
+    for _, group in grouped_contacts:
+        contact_group = list(group)
+        total_attendances += count_attendances(contact_group)
+
+    return total_attendances

connect/common/models.py

@@ -1006,17 +1006,18 @@ def send_email_invite_project(self, email):
 
     def get_contacts(self, before: str, after: str, counting_method: str = None):
         from connect.billing.models import Contact
-        from connect.billing.utils import get_attendances
+        from connect.billing.utils import get_attendances, custom_get_attendances
 
         if not counting_method:
             counting_method = self.organization.organization_billing.plan_method
 
         if counting_method == BillingPlan.ACTIVE_CONTACTS:
             return Contact.objects.filter(project=self).filter(last_seen_on__range=(after, before)).distinct("contact_flow_uuid").count()
+
+        if pendulum.parse(after) < pendulum.parse(settings.NEW_ATTENDANCE_DATE).end_of("day"):
+            return get_attendances(self, str(after), str(before))
 
-        total = get_attendances(self, str(after), str(before))
-
-        return total
+        return custom_get_attendances(self, str(after), str(before))
 
 
 class OpenedProject(models.Model):

connect/settings.py

@@ -572,3 +572,5 @@
     EDA_BROKER_PASSWORD = env.str("EDA_BROKER_PASSWORD", default="guest")
     EDA_VIRTUAL_HOST = env.str("EDA_VIRTUAL_HOST", default="/")
     EDA_WAIT_TIME_RETRY = env.int("EDA_WAIT_TIME_RETRY", default=5)
+
+NEW_ATTENDANCE_DATE = env.str("NEW_ATTENDANCE_DATE")