Generalize code of resolution field

Author: leplatrem

jbi/jira/service.py

@@ -250,6 +250,29 @@ def assign_jira_user(self, context: ActionContext, email: str):
                 f"Could not assign {jira_user_id} to issue {issue_key}"
             ) from exc
 
+    def update_issue_named_field(self, context: ActionContext, field: str, value: str):
+        bug = context.bug
+        issue_key = context.jira.issue
+        logger.info(
+            f"Updating {field} of Jira issue %s to %s for Bug %s",
+            issue_key,
+            value,
+            bug.id,
+            extra=context.model_dump(),
+        )
+        fields: dict[str, Any] = {
+            field: {"name": value},
+        }
+        response = self.client.update_issue_field(key=issue_key, fields=fields)
+        logger.info(
+            f"Updated {field} of Jira issue %s to %s for Bug %s",
+            issue_key,
+            value,
+            bug.id,
+            extra={"response": response, **context.model_dump()},
+        )
+        return response
+
     def update_issue_status(self, context: ActionContext, jira_status: str):
         """Update the status of the Jira issue"""
         issue_key = context.jira.issue
@@ -287,26 +310,7 @@ def update_issue_summary(self, context: ActionContext):
 
     def update_issue_resolution(self, context: ActionContext, jira_resolution: str):
         """Update the resolution of the Jira issue."""
-        issue_key = context.jira.issue
-        assert issue_key  # Until we have more fine-grained typing of contexts
-
-        logger.info(
-            "Updating resolution of Jira issue %s to %s",
-            issue_key,
-            jira_resolution,
-            extra=context.model_dump(),
-        )
-        response = self.client.update_issue_field(
-            key=issue_key,
-            fields={"resolution": {"name": jira_resolution}},
-        )
-        logger.info(
-            "Updated resolution of Jira issue %s to %s",
-            issue_key,
-            jira_resolution,
-            extra={"response": response, **context.model_dump()},
-        )
-        return response
+        return self.update_issue_named_field(context, field="resolution", value=jira_resolution)
 
     def update_issue_components(
         self,

jbi/steps.py

@@ -200,41 +200,51 @@ def maybe_assign_jira_user(
     return (StepStatus.NOOP, context)
 
 
-def maybe_update_issue_resolution(
-    context: ActionContext, *, parameters: ActionParams, jira_service: JiraService
+def _maybe_update_issue_mapped_field(
+    source_field: str,
+    target_field: str,
+    context: ActionContext,
+    parameters: ActionParams,
+    jira_service: JiraService,
 ) -> StepResult:
-    """
-    Update the Jira issue status
-    https://support.atlassian.com/jira-cloud-administration/docs/what-are-issue-statuses-priorities-and-resolutions/
-    """
-
-    bz_resolution = context.bug.resolution or ""
-    jira_resolution = parameters.resolution_map.get(bz_resolution)
-
-    if jira_resolution is None:
+    source_value = getattr(context.bug, source_field, None) or ""
+    target_value = getattr(parameters, f"{source_field}_map").get(source_value)
+    if target_value is None:
         logger.info(
-            "Bug resolution %r was not in the resolution map.",
-            bz_resolution,
+            f"Bug {source_field} %r was not in the {source_field} map.",
+            source_value,
             extra=context.update(
                 operation=Operation.IGNORE,
             ).model_dump(),
         )
         return (StepStatus.INCOMPLETE, context)
 
     if context.operation == Operation.CREATE:
-        resp = jira_service.update_issue_resolution(context, jira_resolution)
+        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 "resolution" in context.event.changed_fields():
-            resp = jira_service.update_issue_resolution(context, jira_resolution)
+        if source_field in context.event.changed_fields():
+            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_resolution(
+    context: ActionContext, *, parameters: ActionParams, jira_service: JiraService
+) -> StepResult:
+    """
+    Update the Jira issue status
+    https://support.atlassian.com/jira-cloud-administration/docs/what-are-issue-statuses-priorities-and-resolutions/
+    """
+    return _maybe_update_issue_mapped_field(
+        "resolution", "resolution", context, parameters, jira_service
+    )
+
+
 def maybe_update_issue_status(
     context: ActionContext, *, parameters: ActionParams, jira_service: JiraService
 ) -> StepResult:

tests/unit/jira/test_service.py

@@ -203,8 +203,8 @@ 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"
-    assert after == "Updated resolution of Jira issue JBI-234 to DONEZO"
+    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"
 
 
 def test_update_issue_resolution_raises(
@@ -230,7 +230,7 @@ def test_update_issue_resolution_raises(
             )
 
     [message] = capturelogs.messages
-    assert message == "Updating resolution of Jira issue JBI-234 to DONEZO"
+    assert message == "Updating resolution of Jira issue JBI-234 to DONEZO for Bug 654321"
 
 
 def test_create_jira_issue(