Add support for priority and severity

Author: leplatrem

docs/actions.md

@@ -149,7 +149,9 @@ linked Jira issue status to "Closed". If the bug changes to a status not listed
 - `update_issue`
 - `add_jira_comments_for_changes`
 - `maybe_assign_jira_user`
+- `maybe_update_issue_priority`
 - `maybe_update_issue_resolution`
+- `maybe_update_issue_severity`
 - `maybe_update_issue_status`
 - `create_comment`
 - `sync_keywords_labels`

jbi/jira/service.py

@@ -310,7 +310,9 @@ def update_issue_summary(self, context: ActionContext):
 
     def update_issue_resolution(self, context: ActionContext, jira_resolution: str):
         """Update the resolution of the Jira issue."""
-        return self.update_issue_named_field(context, field="resolution", value=jira_resolution)
+        return self.update_issue_named_field(
+            context, field="resolution", value=jira_resolution
+        )
 
     def update_issue_components(
         self,

jbi/models.py

@@ -75,7 +75,23 @@ class ActionParams(BaseModel, frozen=True):
     jira_components: JiraComponents = JiraComponents()
     labels_brackets: Literal["yes", "no", "both"] = "no"
     status_map: dict[str, str] = {}
+    priority_map: dict[str, str] = {
+        "P1": "1",
+        "P2": "2",
+        "P3": "3",
+        "P4": "4",
+        "P5": "5",
+        "--": "10000",
+    }
     resolution_map: dict[str, str] = {}
+    severity_map: dict[str, str] = {
+        "S1": "1",
+        "S2": "2",
+        "S3": "3",
+        "S4": "4",
+        "N/A": "--",
+        "--": "--",
+    }
     issue_type_map: dict[str, str] = {"task": "Task", "defect": "Bug"}
 
 

jbi/steps.py

@@ -220,19 +220,34 @@ def _maybe_update_issue_mapped_field(
         return (StepStatus.INCOMPLETE, context)
 
     if context.operation == Operation.CREATE:
-        resp = jira_service.update_issue_named_field(context, target_field, target_value)
+        resp = jira_service.update_issue_named_field(
+            context, target_field, target_value
+        )
         context.append_responses(resp)
         return (StepStatus.SUCCESS, context)
 
     if context.operation == Operation.UPDATE:
         if source_field in context.event.changed_fields():
-            resp = jira_service.update_issue_named_field(context, target_field, target_value)
+            resp = jira_service.update_issue_named_field(
+                context, target_field, target_value
+            )
             context.append_responses(resp)
             return (StepStatus.SUCCESS, context)
 
     return (StepStatus.NOOP, context)
 
 
+def maybe_update_issue_priority(
+    context: ActionContext, *, parameters: ActionParams, jira_service: JiraService
+) -> StepResult:
+    """
+    Update the Jira issue priority
+    """
+    return _maybe_update_issue_mapped_field(
+        "priority", "priority", context, parameters, jira_service
+    )
+
+
 def maybe_update_issue_resolution(
     context: ActionContext, *, parameters: ActionParams, jira_service: JiraService
 ) -> StepResult:
@@ -245,6 +260,17 @@ def maybe_update_issue_resolution(
     )
 
 
+def maybe_update_issue_severity(
+    context: ActionContext, *, parameters: ActionParams, jira_service: JiraService
+) -> StepResult:
+    """
+    Update the Jira issue severity
+    """
+    return _maybe_update_issue_mapped_field(
+        "severity", "severity", context, parameters, jira_service
+    )
+
+
 def maybe_update_issue_status(
     context: ActionContext, *, parameters: ActionParams, jira_service: JiraService
 ) -> StepResult:

tests/unit/jira/test_service.py

@@ -203,7 +203,9 @@ def test_update_issue_resolution(
         jira_service.update_issue_resolution(context=context, jira_resolution="DONEZO")
 
     before, after = capturelogs.messages
-    assert before == "Updating resolution of Jira issue JBI-234 to DONEZO for Bug 654321"
+    assert (
+        before == "Updating resolution of Jira issue JBI-234 to DONEZO for Bug 654321"
+    )
     assert after == "Updated resolution of Jira issue JBI-234 to DONEZO for Bug 654321"
 
 
@@ -230,7 +232,9 @@ def test_update_issue_resolution_raises(
             )
 
     [message] = capturelogs.messages
-    assert message == "Updating resolution of Jira issue JBI-234 to DONEZO for Bug 654321"
+    assert (
+        message == "Updating resolution of Jira issue JBI-234 to DONEZO for Bug 654321"
+    )
 
 
 def test_create_jira_issue(

tests/unit/test_steps.py

@@ -728,6 +728,74 @@ def test_change_to_unknown_resolution_with_resolution_map(
     ]
 
 
+def test_update_issue_priority(
+    action_context_factory,
+    mocked_jira,
+    action_params_factory,
+    webhook_event_change_factory,
+):
+    action_context = action_context_factory(
+        operation=Operation.UPDATE,
+        current_step="maybe_update_issue_priority",
+        bug__see_also=["https://mozilla.atlassian.net/browse/JBI-234"],
+        jira__issue="JBI-234",
+        bug__priority="P1",
+        event__action="modify",
+        event__changes=[
+            webhook_event_change_factory(field="priority", removed="--", added="P1")
+        ],
+    )
+
+    params = action_params_factory(
+        jira_project_key=action_context.jira.project,
+        priority_map={
+            "P1": "Urgent",
+        },
+    )
+    steps.maybe_update_issue_priority(
+        action_context, parameters=params, jira_service=JiraService(mocked_jira)
+    )
+
+    mocked_jira.create_issue.assert_not_called()
+    mocked_jira.update_issue_field(
+        key="JBI-234", fields={"priority": {"name": "Urgent"}}
+    )
+
+
+def test_update_issue_severity(
+    action_context_factory,
+    mocked_jira,
+    action_params_factory,
+    webhook_event_change_factory,
+):
+    action_context = action_context_factory(
+        operation=Operation.UPDATE,
+        current_step="maybe_update_issue_severity",
+        bug__see_also=["https://mozilla.atlassian.net/browse/JBI-234"],
+        jira__issue="JBI-234",
+        bug__severity="S3",
+        event__action="modify",
+        event__changes=[
+            webhook_event_change_factory(field="severity", removed="--", added="S3")
+        ],
+    )
+
+    params = action_params_factory(
+        jira_project_key=action_context.jira.project,
+        status_map={
+            "S3": "Moderate",
+        },
+    )
+    steps.maybe_update_issue_severity(
+        action_context, parameters=params, jira_service=JiraService(mocked_jira)
+    )
+
+    mocked_jira.create_issue.assert_not_called()
+    mocked_jira.update_issue_field(
+        key="JBI-234", fields={"severity": {"name": "Moderate"}}
+    )
+
+
 @pytest.mark.parametrize(
     "project_components,bug_component,config_components,expected_jira_components,expected_logs",
     [