Adjust version upsert handling

Author: marko-bekhta

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

@@ -246,14 +246,25 @@ public String formatTimestamp(ZonedDateTime time) {
 	}
 
 	public JiraVersion fixVersion(JiraVersion version) {
-		JiraVersion v = destFixVersions.get(version.name);
-		if (v != null) {
-			return v;
+		return fixVersion(version, false);
+	}
+
+	public JiraVersion fixVersion(JiraVersion version, boolean force) {
+		if (!force) {
+			JiraVersion v = destFixVersions.get(version.name);
+			if (v != null) {
+				return v;
+			}
 		}
 		versionLock.lock();
 		try {
-			return destFixVersions.computeIfAbsent(version.name,
-					name -> upsert(project, projectGroupContext, destinationJiraClient, version, List.of()));
+			if (force) {
+				return destFixVersions.compute(version.name, (name, current) -> upsert(project, projectGroupContext,
+						destinationJiraClient, version, List.of()));
+			} else {
+				return destFixVersions.computeIfAbsent(version.name,
+						name -> upsert(project, projectGroupContext, destinationJiraClient, version, List.of()));
+			}
 		} catch (Exception e) {
 			Log.errorf(e,
 					"Couldn't create a copy of the fix version %s, version will not be synced for a particular Jira ticket.",

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

@@ -1,8 +1,5 @@
 package org.hibernate.infra.replicate.jira.service.jira.handler;
 
-import java.util.List;
-import java.util.Optional;
-
 import org.hibernate.infra.replicate.jira.service.jira.HandlerProjectContext;
 import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraVersion;
 import org.hibernate.infra.replicate.jira.service.reporting.ReportingConfig;
@@ -16,16 +13,7 @@ public JiraVersionUpsertEventHandler(ReportingConfig reportingConfig, HandlerPro
 	@Override
 	protected void doRun() {
 		JiraVersion version = context.sourceJiraClient().version(objectId);
-		List<JiraVersion> downstreamVersions = context.destinationJiraClient().versions(context.project().projectKey());
-
-		JiraVersion send = version.copyForProject(context.project());
-
-		Optional<JiraVersion> found = JiraVersion.findVersion(version.id, downstreamVersions);
-		if (found.isPresent()) {
-			context.destinationJiraClient().update(found.get().id, send);
-		} else {
-			context.destinationJiraClient().create(send);
-		}
+		context.fixVersion(version, true);
 	}
 
 	@Override