fix(delete-teams): stop confirming project deletion before data is gone

posthog/tasks/email.py

@@ -2200,32 +2200,46 @@ def send_conversation_restore_email(email: str, team_id: int, restore_url: str)
     logger.info(f"Sent conversation restore email to {email} for team {team.id}")
 
 
+# Upper bound for erasing analytics event data after a project or organization is deleted. The
+# metadata delete is immediate, but event data is removed by a weekly batch job, so a deletion
+# waits at most one cycle.
+DATA_ERASURE_WINDOW_DAYS = 7
+
+
 @shared_task(**EMAIL_TASK_KWARGS)
 @skip_team_scope_audit
 def send_project_deleted_email(
     user_id: int,
     project_name: str,
 ) -> None:
-    """Send email notification when project deletion is complete."""
+    """Send email notification when project deletion starts.
+
+    The email goes out once the project metadata is removed. Analytics event data is then erased
+    by a scheduled batch job, so the email states the window rather than claiming completion.
+    """
     user = User.objects.filter(id=user_id).first()
     if not user:
         logger.warning(f"User {user_id} not found for project deletion email")
         return
 
+    data_erased_by = (timezone.now() + datetime.timedelta(days=DATA_ERASURE_WINDOW_DAYS)).strftime("%B %d, %Y")
     message = EmailMessage(
         use_http=True,
         campaign_key=f"project_deleted_{user_id}_{timezone.now().timestamp()}",
-        subject=f"Your project '{project_name}' has been deleted",
+        subject=f"Your project '{project_name}' is being deleted",
         template_name="project_deleted",
         template_context={
             "project_name": project_name,
+            # team_name aliases project_name for the remote Customer.io template; keep it until
+            # template 54 is confirmed to no longer read team_name.
             "team_name": project_name,
+            "data_erased_by": data_erased_by,
             "site_url": settings.SITE_URL,
         },
     )
     message.add_user_recipient(user)
     message.send()
-    logger.info(f"Sent project deletion confirmation email to user {user_id} for project {project_name}")
+    logger.info(f"Sent project deletion email to user {user_id} for project {project_name}")
 
 
 @shared_task(**EMAIL_TASK_KWARGS)
@@ -2235,26 +2249,32 @@ def send_organization_deleted_email(
     organization_name: str,
     project_names: list[str],
 ) -> None:
-    """Send email notification when organization deletion is complete."""
+    """Send email notification when organization deletion starts.
+
+    The email goes out once the organization metadata is removed. Analytics event data is then
+    erased by a scheduled batch job, so the email states the window rather than claiming completion.
+    """
     user = User.objects.filter(id=user_id).first()
     if not user:
         logger.warning(f"User {user_id} not found for organization deletion email")
         return
 
+    data_erased_by = (timezone.now() + datetime.timedelta(days=DATA_ERASURE_WINDOW_DAYS)).strftime("%B %d, %Y")
     message = EmailMessage(
         use_http=True,
         campaign_key=f"organization_deleted_{user_id}_{timezone.now().timestamp()}",
-        subject=f"Your organization '{organization_name}' has been deleted",
+        subject=f"Your organization '{organization_name}' is being deleted",
         template_name="organization_deleted",
         template_context={
             "organization_name": organization_name,
             "project_names": project_names,
+            "data_erased_by": data_erased_by,
             "site_url": settings.SITE_URL,
         },
     )
     message.add_user_recipient(user)
     message.send()
-    logger.info(f"Sent organization deletion confirmation email to user {user_id} for organization {organization_name}")
+    logger.info(f"Sent organization deletion email to user {user_id} for organization {organization_name}")
 
 
 @shared_task(ignore_result=True)

posthog/tasks/test/test_email.py

@@ -41,8 +41,10 @@
     send_matview_failure_immediate_email,
     send_member_join,
     send_new_ticket_notification,
+    send_organization_deleted_email,
     send_password_reset,
     send_posthog_ai_access_request,
+    send_project_deleted_email,
     send_project_secret_api_key_exposed,
     send_provisioning_welcome,
     send_wizard_pr_ready_email,
@@ -402,6 +404,34 @@ def test_send_provisioning_welcome_without_partner(self, MockEmailMessage: Magic
         assert "Set your password" in mocked_email_messages[0].html_body
         assert "via" not in mocked_email_messages[0].html_body
 
+    @freeze_time("2022-01-02 00:00:00")
+    def test_send_project_deleted_email_states_erasure_window(self, MockEmailMessage: MagicMock) -> None:
+        mocked_email_messages = mock_email_messages(MockEmailMessage)
+        _org, user = create_org_team_and_user("2022-01-01 00:00:00", "deleter@posthog.com")
+
+        send_project_deleted_email(user_id=user.id, project_name="My project")
+
+        assert len(mocked_email_messages) == 1
+        html = mocked_email_messages[0].html_body
+        # Event data is erased by a weekly batch job, so the email must give the upper-bound date
+        # and must not claim the data is already gone.
+        assert "January 09, 2022" in html
+        assert "started deleting its data" in html
+        assert mocked_email_messages[0].subject == "Your project 'My project' is being deleted"
+
+    @freeze_time("2022-01-02 00:00:00")
+    def test_send_organization_deleted_email_states_erasure_window(self, MockEmailMessage: MagicMock) -> None:
+        mocked_email_messages = mock_email_messages(MockEmailMessage)
+        _org, user = create_org_team_and_user("2022-01-01 00:00:00", "deleter@posthog.com")
+
+        send_organization_deleted_email(user_id=user.id, organization_name="My org", project_names=["A", "B"])
+
+        assert len(mocked_email_messages) == 1
+        html = mocked_email_messages[0].html_body
+        assert "January 09, 2022" in html
+        assert "started deleting the data" in html
+        assert mocked_email_messages[0].subject == "Your organization 'My org' is being deleted"
+
     @patch("posthog.tasks.email.ph_scoped_capture")
     def test_send_wizard_pr_ready_email_uses_customer_io_context(
         self, _mock_ph_scoped_capture: MagicMock, MockEmailMessage: MagicMock

posthog/templates/email/organization_deleted.html

@@ -1,8 +1,8 @@
 {% extends "email/base.html" %} {% load posthog_assets %} {% block section %}
 <p>
-    As requested, we've deleted your organization <strong>{{ organization_name }}</strong>{% if project_names %} and its project{{ project_names|length|pluralize }}: <strong>{{ project_names|join:", " }}</strong>{% endif %}.
+    As requested, we've removed your organization <strong>{{ organization_name }}</strong>{% if project_names %} and its project{{ project_names|length|pluralize }}: <strong>{{ project_names|join:", " }}</strong>{% endif %}, and started deleting the data.
 </p>
 <p>
-    This can't be undone, but hey, if you ever want to start fresh, we'll be here.
+    The analytics data is permanently erased by <strong>{{ data_erased_by }}</strong>. This can't be undone, but hey, if you ever want to start fresh, we'll be here.
 </p>
-{% endblock %}{% load posthog_filters %} {% block heading %}Organization deleted{% endblock %}
+{% endblock %}{% load posthog_filters %} {% block heading %}Deleting your organization{% endblock %}

posthog/templates/email/project_deleted.html

@@ -1,8 +1,8 @@
 {% extends "email/base.html" %} {% load posthog_assets %} {% block section %}
 <p>
-    As requested, we've deleted <strong>{{ project_name }}</strong> and all its data.
+    As requested, we've removed <strong>{{ project_name }}</strong> and started deleting its data.
 </p>
 <p>
-    This can't be undone, but hey, if you ever want to start fresh, we'll be here.
+    Its analytics data is permanently erased by <strong>{{ data_erased_by }}</strong>. This can't be undone, but hey, if you ever want to start fresh, we'll be here.
 </p>
-{% endblock %}{% load posthog_filters %} {% block heading %}Project deleted{% endblock %}
+{% endblock %}{% load posthog_filters %} {% block heading %}Deleting your project{% endblock %}