Follow-up of #1212: set value to 'None' when unset (#1220)

Author: leplatrem

config/config.prod.yaml

@@ -389,7 +389,8 @@
     status_map: *basic-status-map
     resolution_map: *basic-resolution-map
     priority_map:
-      "--": (None)
+      "": None
+      "--": None
       P1: P1
       P2: P2
       P3: P3

jbi/models.py

@@ -97,8 +97,8 @@ class ActionParams(BaseModel, frozen=True):
     labels_brackets: Literal["yes", "no", "both"] = "no"
     status_map: dict[str, str] = {}
     priority_map: dict[str, str] = {
-        "": "(None)",
-        "--": "(None)",
+        "": "None",
+        "--": "None",
         "P1": "P1",
         "P2": "P2",
         "P3": "P3",

jbi/steps.py

@@ -280,11 +280,6 @@ def _maybe_update_issue_mapped_field(
         )
         return (StepStatus.INCOMPLETE, context)
 
-    # Special handling for clearing fields in Jira.
-    if target_value == "(None)":
-        target_value = None
-        wrap_value = None
-
     resp = jira_service.update_issue_field(
         context,
         target_field,

tests/unit/test_steps.py

@@ -841,7 +841,7 @@ def test_update_issue_remove_priority(
 
     assert result == steps.StepStatus.SUCCESS
     mocked_jira.update_issue_field.assert_called_with(
-        key="JBI-234", fields={"priority": None}
+        key="JBI-234", fields={"priority": {"name": "None"}}
     )