Checks if incident participant is a task assignee not owner before al…

…lowing them to leave the incident conversation (#2737)

* Checks if reporter is a task assignee not owner when they leave the incident conversation

* Improves template messaging

* More messaging updates

src/dispatch/incident/flows.py

@@ -1522,15 +1522,16 @@ def incident_remove_participant_flow(
 
     for task in incident.tasks:
         if task.status == TaskStatus.open:
-            if task.owner == participant:
-                # we add the participant back to the conversation
-                add_participants_to_conversation([user_email], incident, db_session)
+            for assignee in task.assignees:
+                if assignee == participant:
+                    # we add the participant back to the conversation
+                    add_participants_to_conversation([user_email], incident, db_session)
 
-                # we ask the participant to resolve or re-assign
-                # their tasks before leaving the incident
-                send_incident_open_tasks_ephemeral_message(user_email, incident, db_session)
+                    # we ask the participant to resolve or re-assign
+                    # their tasks before leaving the incident conversation
+                    send_incident_open_tasks_ephemeral_message(user_email, incident, db_session)
 
-                return
+                    return
 
     if user_email == incident.commander.individual.email:
         # we add the incident commander back to the conversation

src/dispatch/incident/messaging.py

@@ -954,7 +954,7 @@ def send_incident_open_tasks_ephemeral_message(
 ):
     """
     Sends an ephemeral message to the participant asking them to resolve or re-assign
-    their open tasks before leaving the incident.
+    their open tasks before leaving the incident conversation.
     """
     convo_plugin = plugin_service.get_active_instance(
         db_session=db_session, project_id=incident.project.id, plugin_type="conversation"

src/dispatch/messaging/strings.py

@@ -236,8 +236,8 @@ class MessageType(DispatchEnum):
 INCIDENT_TASK_LIST_DESCRIPTION = """The following are open incident tasks."""
 
 INCIDENT_OPEN_TASKS_DESCRIPTION = """
-Please resolve or transfer ownership of all the open incident tasks owned by you directly in the incident documents or using the <{{dispatch_ui_url}}|Dispatch Web UI>,
-then wait about 30 seconds for Dispatch to update the tasks before leaving the incident channel.
+Please resolve or transfer ownership of all the open incident tasks assigned to you in the incident documents or using the <{{dispatch_ui_url}}|Dispatch Web UI>,
+then wait about 30 seconds for Dispatch to update the tasks before leaving the incident conversation.
 """.replace(
     "\n", " "
 ).strip()