Support removal of mapped field (#899)

* Add working default field mappings

* Add tests for empty values code paths

Author: leplatrem

jbi/models.py

@@ -81,15 +81,23 @@ class ActionParams(BaseModel, frozen=True):
     labels_brackets: Literal["yes", "no", "both"] = "no"
     status_map: dict[str, str] = {}
     priority_map: dict[str, str] = {
+        "": "(none)",
         "P1": "P1",
         "P2": "P2",
         "P3": "P3",
         "P4": "Low",
         "P5": "Lowest",
     }
     resolution_map: dict[str, str] = {}
-    severity_map: dict[str, str] = {}
+    severity_map: dict[str, str] = {
+        "": "N/A",
+        "S1": "S1",
+        "S2": "S2",
+        "S3": "S3",
+        "S4": "S4",
+    }
     cf_fx_points_map: dict[str, int] = {
+        "": 0,
         "?": 0,
         "1": 1,
         "2": 2,

jbi/steps.py

@@ -210,6 +210,14 @@ def _maybe_update_issue_mapped_field(
     source_value = getattr(context.bug, source_field, None) or ""
     target_field = getattr(parameters, f"jira_{source_field}_field")
     target_value = getattr(parameters, f"{source_field}_map").get(source_value)
+
+    # If field is empty on create, or update is about another field, then nothing to do.
+    if (context.operation == Operation.CREATE and source_value == "") or (
+        context.operation == Operation.UPDATE
+        and source_field not in context.event.changed_fields()
+    ):
+        return (StepStatus.NOOP, context)
+
     if target_value is None:
         logger.info(
             f"Bug {source_field} %r was not in the {source_field} map.",
@@ -220,12 +228,6 @@ def _maybe_update_issue_mapped_field(
         )
         return (StepStatus.INCOMPLETE, context)
 
-    if (
-        context.operation == Operation.UPDATE
-        and source_field not in context.event.changed_fields()
-    ):
-        return (StepStatus.NOOP, context)
-
     resp = jira_service.update_issue_field(
         context,
         target_field,

tests/unit/test_steps.py

@@ -728,6 +728,54 @@ def test_change_to_unknown_resolution_with_resolution_map(
     ]
 
 
+def test_create_issue_empty_priority(
+    action_context_factory,
+    mocked_jira,
+    action_params_factory,
+):
+    action_context = action_context_factory(
+        operation=Operation.CREATE, bug__priority=None
+    )
+    params = action_params_factory(
+        jira_project_key=action_context.jira.project,
+    )
+
+    result, _ = steps.maybe_update_issue_priority(
+        action_context, parameters=params, jira_service=JiraService(mocked_jira)
+    )
+
+    assert result == steps.StepStatus.NOOP
+
+
+def test_update_issue_remove_priority(
+    action_context_factory,
+    mocked_jira,
+    action_params_factory,
+    webhook_event_change_factory,
+):
+    action_context = action_context_factory(
+        operation=Operation.UPDATE,
+        jira__issue="JBI-234",
+        bug__priority=None,
+        current_step="maybe_update_issue_priority",
+        event__changes=[
+            webhook_event_change_factory(field="priority", removed="P1", added="--")
+        ],
+    )
+    params = action_params_factory(
+        jira_project_key=action_context.jira.project,
+    )
+
+    result, _ = steps.maybe_update_issue_priority(
+        action_context, parameters=params, jira_service=JiraService(mocked_jira)
+    )
+
+    assert result == steps.StepStatus.SUCCESS
+    mocked_jira.update_issue_field.assert_called_with(
+        key="JBI-234", fields={"priority": {"name": "(none)"}}
+    )
+
+
 def test_update_issue_priority(
     action_context_factory,
     mocked_jira,