Ensure we don't duplicate counts of overlapping cascades

Author: steventux

manage_breast_screening/notifications/queries/aggregate.sql

@@ -25,9 +25,11 @@ AND    msg_fld.status = 'failed'
 LEFT OUTER JOIN notifications_channelstatus nhsapp_read ON nhsapp_read.message_id = msg_snt.id
 AND    nhsapp_read.channel = 'nhsapp'
 AND    nhsapp_read.status = 'read'
+AND    (nhsapp_read.status_updated_at::date - msg_snt.sent_at::date) <= 1
 LEFT OUTER JOIN notifications_channelstatus sms_dlv ON sms_dlv.message_id = msg_snt.id
 AND    sms_dlv.channel = 'sms'
 AND    sms_dlv.status = 'delivered'
+AND    (sms_dlv.status_updated_at::date - msg_snt.sent_at::date) <= 4
 LEFT OUTER JOIN notifications_channelstatus ltr_sent ON ltr_sent.message_id = msg_snt.id
 AND    ltr_sent.channel = 'letter'
 AND    ltr_sent.status = 'received'

manage_breast_screening/notifications/tests/queries/test_aggregate_query.py

@@ -30,10 +30,19 @@ def create_appointment_set(
             starts_at=date,
             episode_type=episode_type,
         )
-        message = MessageFactory(appointment=appt, status=message_status)
-        MessageStatusFactory(message=message, status=message_status)
+        message = MessageFactory(
+            appointment=appt, status=message_status, sent_at=datetime.now()
+        )
+        MessageStatusFactory(
+            message=message, status=message_status, status_updated_at=datetime.now()
+        )
         for channel, status in channel_statuses.items():
-            ChannelStatusFactory(message=message, channel=channel, status=status)
+            ChannelStatusFactory(
+                message=message,
+                channel=channel,
+                status=status,
+                status_updated_at=datetime.now(),
+            )
         return appt
 
     def test_query_aggregates_appointments_and_cascade_counts(self):
@@ -127,6 +136,74 @@ def test_aggregate_uses_date_range(self):
 
         assert len(results) == 1
 
+    def test_aggregate_cascade_overlaps_are_counted_once(self):
+        appt_date = datetime.now() - timedelta(days=20)
+        message_sent_at = datetime.now() - timedelta(days=6)
+        appt = AppointmentFactory(
+            clinic=ClinicFactory(code="BU006", bso_code="BSO6", name="BSU 6"),
+            starts_at=appt_date,
+            episode_type="S",
+        )
+        message = MessageFactory(
+            appointment=appt, status="delivered", sent_at=message_sent_at
+        )
+        MessageStatusFactory(message=message, status="delivered")
+        ChannelStatusFactory(
+            message=message,
+            channel="nhsapp",
+            status="read",
+            status_updated_at=(message_sent_at + timedelta(days=2)),
+        )
+        sms_status = ChannelStatusFactory(
+            message=message,
+            channel="sms",
+            status="delivered",
+            status_updated_at=(message_sent_at + timedelta(days=4)),
+        )
+
+        with connection.cursor() as cursor:
+            cursor.execute(AggregateQuery.sql(), ("1 month",))
+            results = cursor.fetchall()
+
+        assert list(results[0]) == [
+            appt_date.strftime("%Y-%m-%d"),
+            "BSO6",
+            "BU006",
+            "BSU 6",
+            "Self referral",
+            1,
+            0,
+            1,
+            0,
+            0,
+        ]
+
+        sms_status.status_updated_at = message_sent_at + timedelta(days=5)
+        sms_status.save()
+        ChannelStatusFactory(
+            message=message,
+            channel="letter",
+            status="received",
+            status_updated_at=(message_sent_at + timedelta(days=5)),
+        )
+
+        with connection.cursor() as cursor:
+            cursor.execute(AggregateQuery.sql(), ("1 month",))
+            results = cursor.fetchall()
+
+        assert list(results[0]) == [
+            appt_date.strftime("%Y-%m-%d"),
+            "BSO6",
+            "BU006",
+            "BSU 6",
+            "Self referral",
+            1,
+            0,
+            0,
+            1,
+            0,
+        ]
+
     def test_aggregate_columns(self):
         assert AggregateQuery.columns() == [
             "Appointment date",