Use an optional "notMappedAssignee" user for unmapped assignees

Author: marko-bekhta

src/main/java/org/hibernate/infra/replicate/jira/JiraConfig.java

@@ -3,6 +3,7 @@
 import java.net.URI;
 import java.util.Base64;
 import java.util.Map;
+import java.util.Optional;
 
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
@@ -241,6 +242,17 @@ interface UserValueMapping extends ValueMapping {
 		 */
 		@WithDefault("accountId")
 		String mappedPropertyName();
+
+		/**
+		 * By default, if the assignee of the upstream issue is not mapped, the project
+		 * default will be used (i.e. assignee field will not be sent as part of the
+		 * sync request). If the {@code notMappedAssignee} is provided, this value will
+		 * be set as assignee for those issues where an upstream assignee is not mapped
+		 * to a downstream one. This can be useful to show that the issue is assign to
+		 * someone even though that particular user is not present in the downstream
+		 * Jira.
+		 */
+		Optional<String> notMappedAssignee();
 	}
 
 	/**

src/main/java/org/hibernate/infra/replicate/jira/service/jira/HandlerProjectContext.java

@@ -11,6 +11,7 @@
 import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraIssueBulk;
 import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraIssueBulkResponse;
 import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraIssues;
+import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraUser;
 
 import io.quarkus.logging.Log;
 
@@ -32,6 +33,7 @@ public final class HandlerProjectContext implements AutoCloseable {
 	private final JiraIssueBulk bulk;
 
 	private final String projectKeyWithDash;
+	private final JiraUser notMappedAssignee;
 
 	public HandlerProjectContext(String projectName, String projectGroupName, JiraRestClient sourceJiraClient,
 			JiraRestClient destinationJiraClient, HandlerProjectGroupContext projectGroupContext) {
@@ -44,6 +46,9 @@ public HandlerProjectContext(String projectName, String projectGroupName, JiraRe
 		this.currentIssueKeyNumber = new AtomicLong(getCurrentLatestJiraIssueKeyNumber());
 		this.bulk = new JiraIssueBulk(createIssuePlaceholder(), ISSUES_PER_REQUEST);
 		this.projectKeyWithDash = "%s-".formatted(project.projectKey());
+
+		this.notMappedAssignee = projectGroup().users().notMappedAssignee()
+				.map(v -> new JiraUser(projectGroup().users().mappedPropertyName(), v)).orElse(null);
 	}
 
 	public JiraConfig.JiraProject project() {
@@ -151,6 +156,10 @@ public void startProcessingEvent() throws InterruptedException {
 		projectGroupContext.startProcessingEvent();
 	}
 
+	public JiraUser notMappedAssignee() {
+		return notMappedAssignee;
+	}
+
 	private boolean requiredIssueKeyNumberShouldBeAvailable(Long key) {
 		return currentIssueKeyNumber.get() >= key;
 	}

src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueUpsertEventHandler.java

@@ -43,18 +43,8 @@ protected void doRun() {
 
 		try {
 			JiraIssue issue = issueToCreate(sourceIssue);
-			try {
-				context.destinationJiraClient().update(destinationKey, issue);
-			} catch (JiraRestException e) {
-				if (e.getMessage().contains("\"assignee\"")) {
-					failureCollector.warning(
-							"Unable to update issue %s with assignee, will try to update all but assignee field."
-									.formatted(sourceIssue.key),
-							e);
-					issue.fields.assignee = null;
-					context.destinationJiraClient().update(destinationKey, issue);
-				}
-			}
+
+			updateIssue(destinationKey, issue, sourceIssue, context.notMappedAssignee());
 			// remote "aka web" links cannot be added in the same request and are also not
 			// returned as part of the issue API.
 			// We "upsert" the remote link pointing to the "original/source" issue that
@@ -72,6 +62,29 @@ protected void doRun() {
 		}
 	}
 
+	private void updateIssue(String destinationKey, JiraIssue issue, JiraIssue sourceIssue, JiraUser assignee) {
+		try {
+			context.destinationJiraClient().update(destinationKey, issue);
+		} catch (JiraRestException e) {
+			if (issue.fields.assignee == null) {
+				// if we failed with no assignee then there's no point in retrying ...
+				throw e;
+			}
+			if (e.getMessage().contains("\"assignee\"")) {
+				// let's try updating with the assignee passed to the method (it may be the
+				// "notMappedAssignee")
+				failureCollector.warning(
+						"Unable to update issue %s with assignee %s, will try to update one more time with assignee %s."
+								.formatted(sourceIssue.key, issue.fields.assignee, assignee),
+						e);
+				issue.fields.assignee = assignee;
+				updateIssue(destinationKey, issue, sourceIssue, null);
+			} else {
+				throw e;
+			}
+		}
+	}
+
 	@Override
 	public String toString() {
 		return "JiraIssueUpsertEventHandler[" + "objectId=" + objectId + ", project=" + context.projectName() + ']';
@@ -135,7 +148,8 @@ private JiraIssue issueToCreate(JiraIssue sourceIssue) {
 		// also the description is going to include a section mentioning who created and
 		// who the issue is assigned to...
 		if (context.projectGroup().canSetReporter()) {
-			destinationIssue.fields.reporter = user(sourceIssue.fields.reporter).map(this::toUser).orElse(null);
+			destinationIssue.fields.reporter = user(sourceIssue.fields.reporter).map(this::toUser)
+					.orElseGet(context::notMappedAssignee);
 		}
 
 		destinationIssue.fields.assignee = user(sourceIssue.fields.assignee).map(this::toUser).orElse(null);

src/main/resources/application.properties

@@ -45,6 +45,7 @@ quarkus.scheduler.start-mode=forced
 # Just open a user profile and get the ID from the URl: https://hibernate.atlassian.net/jira/people/557058:18cf44bb-bc9b-4e8d-b1b7-882969ddc8e5
 #
 %prod,test.jira.project-group."hibernate".users.mapped-property-name=name
+%prod,test.jira.project-group."hibernate".users.not-mapped-assignee=[email protected]
 # Yoann:
 %dev.jira.project-group."hibernate".users.mapping."557058\:58fa1ced-171a-4c00-97e8-5d70d442cc4b"=557058:58fa1ced-171a-4c00-97e8-5d70d442cc4b
 %prod,test.jira.project-group."hibernate".users.mapping."557058\:58fa1ced-171a-4c00-97e8-5d70d442cc4b"=rh-ee-yrodiere