Use project group context for handling events

instead of a project context. and remove dependency on project key in the requests

Author: marko-bekhta

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

@@ -98,6 +98,11 @@ interface JiraProjectGroup {
 		 * Allows customizing formatting options.
 		 */
 		Formatting formatting();
+
+		/**
+		 * Allows enabling signature verification.
+		 */
+		WebHookSecurity security();
 	}
 
 	interface Formatting {
@@ -188,11 +193,6 @@ interface JiraProject {
 		 */
 		String originalProjectKey();
 
-		/**
-		 * Allows enabling signature verification.
-		 */
-		WebHookSecurity security();
-
 		/**
 		 * Allows enabling signature verification of downstream events.
 		 */

src/main/java/org/hibernate/infra/replicate/jira/resource/JiraWebHookListenerResource.java

@@ -4,6 +4,7 @@
 import org.hibernate.infra.replicate.jira.service.jira.model.action.JiraActionEvent;
 import org.hibernate.infra.replicate.jira.service.jira.model.hook.JiraWebHookEvent;
 import org.hibernate.infra.replicate.jira.service.validation.ConfiguredProject;
+import org.hibernate.infra.replicate.jira.service.validation.ConfiguredProjectGroup;
 
 import org.jboss.resteasy.reactive.RestPath;
 
@@ -23,22 +24,22 @@ public class JiraWebHookListenerResource {
 	JiraService jiraService;
 
 	@POST
-	@Path("/{project}")
+	@Path("/source/{projectGroup}")
 	@Consumes(MediaType.APPLICATION_JSON)
-	public String somethingHappenedUpstream(@RestPath @NotNull @ConfiguredProject String project,
+	public String somethingHappenedUpstream(@RestPath @NotNull @ConfiguredProjectGroup String projectGroup,
 			@QueryParam("triggeredByUser") String triggeredByUser, JiraWebHookEvent event) {
-		Log.tracef("Received a notification about %s project: %.200s...", project, event);
-		jiraService.acknowledge(project, event, triggeredByUser);
+		Log.tracef("Received a notification about %s project group: %.200s...", projectGroup, event);
+		jiraService.acknowledge(projectGroup, event, triggeredByUser);
 		return "ack";
 	}
 
 	@POST
-	@Path("/mirror/{project}")
+	@Path("/mirror/{projectGroup}/{project}")
 	@Consumes(MediaType.APPLICATION_JSON)
-	public String somethingHappenedDownstream(@RestPath @NotNull @ConfiguredProject String project,
-			JiraActionEvent data) {
+	public String somethingHappenedDownstream(@RestPath @NotNull @ConfiguredProjectGroup String projectGroup,
+			@RestPath @NotNull @ConfiguredProject String project, JiraActionEvent data) {
 		Log.tracef("Received a downstream notification about %s project: %s...", project, data);
-		jiraService.downstreamAcknowledge(project, data);
+		jiraService.downstreamAcknowledge(projectGroup, data);
 		return "ack";
 	}
 }

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

@@ -1,7 +1,5 @@
 package org.hibernate.infra.replicate.jira.service.jira;
 
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,7 +17,6 @@
 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 org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraVersion;
 
 import io.quarkus.logging.Log;
@@ -34,46 +31,26 @@ public final class HandlerProjectContext implements AutoCloseable {
 	private final ReentrantLock versionLock = new ReentrantLock();
 
 	private final String projectName;
-	private final String projectGroupName;
-	private final JiraRestClient sourceJiraClient;
-	private final JiraRestClient destinationJiraClient;
 	private final HandlerProjectGroupContext projectGroupContext;
 	private final JiraConfig.JiraProject project;
 	private final AtomicLong currentIssueKeyNumber;
 	private final JiraIssueBulk bulk;
 
 	private final String projectKeyWithDash;
-	private final JiraUser notMappedAssignee;
-
-	private final Map<String, HandlerProjectContext> allProjectsContextMap;
-	private final Pattern sourceLabelPattern;
-	private final DateTimeFormatter formatter;
-
 	private final Map<String, JiraVersion> destFixVersions;
+	private final Pattern keyToUpdatePattern;
 
-	public HandlerProjectContext(String projectName, String projectGroupName, JiraRestClient sourceJiraClient,
-			JiraRestClient destinationJiraClient, HandlerProjectGroupContext projectGroupContext,
-			Map<String, HandlerProjectContext> allProjectsContextMap) {
+	public HandlerProjectContext(String projectName, HandlerProjectGroupContext projectGroupContext) {
 		this.projectName = projectName;
-		this.projectGroupName = projectGroupName;
-		this.sourceJiraClient = sourceJiraClient;
-		this.destinationJiraClient = destinationJiraClient;
 		this.projectGroupContext = projectGroupContext;
 		this.project = projectGroup().projects().get(projectName());
 		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);
-
-		this.allProjectsContextMap = allProjectsContextMap;
-		this.sourceLabelPattern = Pattern
-				.compile(projectGroupContext.projectGroup().formatting().labelTemplate().formatted(".+"));
-		this.formatter = DateTimeFormatter.ofPattern(projectGroupContext.projectGroup().formatting().timestampFormat());
-
-		this.destFixVersions = getAndCreateMissingCurrentFixVersions(project, projectGroupContext, sourceJiraClient,
-				destinationJiraClient);
+		this.destFixVersions = getAndCreateMissingCurrentFixVersions(project, projectGroupContext,
+				projectGroupContext.sourceJiraClient(), projectGroupContext.destinationJiraClient());
+		this.keyToUpdatePattern = Pattern.compile("^%s-\\d+".formatted(project.originalProjectKey()));
 	}
 
 	public JiraConfig.JiraProject project() {
@@ -84,18 +61,6 @@ public String projectName() {
 		return projectName;
 	}
 
-	public String projectGroupName() {
-		return projectGroupName;
-	}
-
-	public JiraRestClient sourceJiraClient() {
-		return sourceJiraClient;
-	}
-
-	public JiraRestClient destinationJiraClient() {
-		return destinationJiraClient;
-	}
-
 	public JiraConfig.JiraProjectGroup projectGroup() {
 		return projectGroupContext.projectGroup();
 	}
@@ -105,8 +70,9 @@ public AtomicLong currentIssueKeyNumber() {
 	}
 
 	public Long getLargestSyncedJiraIssueKeyNumber() {
-		JiraIssues issues = destinationJiraClient.find("project = %s and summary !~\"%s\" ORDER BY key DESC"
-				.formatted(project.projectId(), SYNC_ISSUE_PLACEHOLDER_SUMMARY), 0, 1);
+		JiraIssues issues = projectGroupContext.destinationJiraClient()
+				.find("project = %s and summary !~\"%s\" ORDER BY key DESC".formatted(project.projectId(),
+						SYNC_ISSUE_PLACEHOLDER_SUMMARY), 0, 1);
 		if (issues.issues.isEmpty()) {
 			return 0L;
 		} else {
@@ -123,7 +89,7 @@ public Optional<JiraIssue> getNextIssueToSync(Long latestSyncedJiraIssueKeyNumbe
 			query = "project = %s ORDER BY key ASC".formatted(project.originalProjectKey(),
 					project.originalProjectKey());
 		}
-		JiraIssues issues = sourceJiraClient.find(query, 0, 1);
+		JiraIssues issues = projectGroupContext.sourceJiraClient().find(query, 0, 1);
 		if (issues.issues.isEmpty()) {
 			return Optional.empty();
 		} else {
@@ -133,7 +99,7 @@ public Optional<JiraIssue> getNextIssueToSync(Long latestSyncedJiraIssueKeyNumbe
 
 	private Long getCurrentLatestJiraIssueKeyNumber() {
 		try {
-			JiraIssues issues = destinationJiraClient
+			JiraIssues issues = projectGroupContext.destinationJiraClient()
 					.find("project = %s ORDER BY created DESC".formatted(project.projectId()), 0, 1);
 			if (issues.issues.isEmpty()) {
 				return 0L;
@@ -165,7 +131,7 @@ public void createNextPlaceholderBatch(Long upToKeyNumber) {
 		}
 		try {
 			do {
-				JiraIssueBulkResponse response = destinationJiraClient.create(bulk);
+				JiraIssueBulkResponse response = projectGroupContext.destinationJiraClient().create(bulk);
 				response.issues.stream().mapToLong(i -> JiraIssue.keyToLong(i.key)).max()
 						.ifPresent(currentIssueKeyNumber::set);
 				Log.infof(
@@ -185,10 +151,6 @@ public void startProcessingDownstreamEvent() throws InterruptedException {
 		projectGroupContext.startProcessingDownstreamEvent();
 	}
 
-	public JiraUser notMappedAssignee() {
-		return notMappedAssignee;
-	}
-
 	private boolean requiredIssueKeyNumberShouldBeAvailable(Long key) {
 		return currentIssueKeyNumber.get() >= key;
 	}
@@ -214,15 +176,13 @@ private JiraIssue createIssuePlaceholder() {
 
 	@Override
 	public String toString() {
-		return "HandlerProjectContext[" + "projectName=" + projectName + ", " + "projectGroupName=" + projectGroupName
-				+ ", " + "sourceJiraClient=" + sourceJiraClient + ", " + "destinationJiraClient="
-				+ destinationJiraClient + ", " + "projectGroup=" + projectGroupContext.projectGroup() + ", "
-				+ "currentIssueKeyNumber=" + currentIssueKeyNumber + ']';
+		return "HandlerProjectContext[" + "projectName=" + projectName + ", " + "projectGroup="
+				+ projectGroupContext.projectGroup() + ", " + "currentIssueKeyNumber=" + currentIssueKeyNumber + ']';
 	}
 
 	@Override
 	public void close() {
-		projectGroupContext.close();
+		// do nothing
 	}
 
 	public int pendingEventsInCurrentContext() {
@@ -241,22 +201,6 @@ public void submitDownstreamTask(Runnable runnable) {
 		projectGroupContext.submitDownstreamTask(runnable);
 	}
 
-	public Optional<HandlerProjectContext> contextForProjectInSameGroup(String project) {
-		if (!projectGroup().projects().containsKey(project)) {
-			// different project group, don't bother
-			return Optional.empty();
-		}
-		return Optional.ofNullable(allProjectsContextMap.get(project));
-	}
-
-	public boolean isSourceLabel(String label) {
-		return sourceLabelPattern.matcher(label).matches();
-	}
-
-	public String formatTimestamp(ZonedDateTime time) {
-		return time != null ? time.format(formatter) : "";
-	}
-
 	public JiraVersion fixVersion(JiraVersion version) {
 		return fixVersion(version, false);
 	}
@@ -271,11 +215,13 @@ public JiraVersion fixVersion(JiraVersion version, boolean force) {
 		versionLock.lock();
 		try {
 			if (force) {
-				return destFixVersions.compute(version.name, (name, current) -> upsert(project, projectGroupContext,
-						destinationJiraClient, version, destinationJiraClient().versions(project.projectKey())));
+				return destFixVersions.compute(version.name,
+						(name, current) -> upsert(project, projectGroupContext,
+								projectGroupContext.destinationJiraClient(), version,
+								projectGroupContext.destinationJiraClient().versions(project.projectKey())));
 			} else {
-				return destFixVersions.computeIfAbsent(version.name,
-						name -> upsert(project, projectGroupContext, destinationJiraClient, version, List.of()));
+				return destFixVersions.computeIfAbsent(version.name, name -> upsert(project, projectGroupContext,
+						projectGroupContext.destinationJiraClient(), version, List.of()));
 			}
 		} catch (Exception e) {
 			Log.errorf(e,
@@ -291,8 +237,8 @@ public void refreshFixVersions() {
 		versionLock.lock();
 		try {
 			destFixVersions.clear();
-			destFixVersions.putAll(getAndCreateMissingCurrentFixVersions(project, projectGroupContext, sourceJiraClient,
-					destinationJiraClient));
+			destFixVersions.putAll(getAndCreateMissingCurrentFixVersions(project, projectGroupContext,
+					projectGroupContext.sourceJiraClient(), projectGroupContext.destinationJiraClient()));
 		} finally {
 			versionLock.unlock();
 		}
@@ -360,19 +306,22 @@ private static boolean versionNeedsUpdate(JiraVersion upstreamVersion, JiraVersi
 				|| !Objects.equals(upstreamVersion.releaseDate, downstreamVersion.releaseDate);
 	}
 
-	public boolean isUserIgnored(String triggeredByUser) {
-		return projectGroupContext.projectGroup().users().ignoredUpstreamUsers().contains(triggeredByUser);
-	}
-
-	public boolean isDownstreamUserIgnored(String triggeredByUser) {
-		return projectGroupContext.projectGroup().users().ignoredDownstreamUsers().contains(triggeredByUser);
-	}
-
 	public String upstreamUser(String mappedValue) {
 		return projectGroupContext.upstreamUser(mappedValue);
 	}
 
 	public String upstreamStatus(String mappedValue) {
 		return projectGroupContext.upstreamStatus(mappedValue);
 	}
+
+	public String toDestinationKey(String key) {
+		if (keyToUpdatePattern.matcher(key).matches()) {
+			return "%s-%d".formatted(project().projectKey(), JiraIssue.keyToLong(key));
+		}
+		return key;
+	}
+
+	public String toSourceKey(String key) {
+		return "%s-%d".formatted(project().originalProjectKey(), JiraIssue.keyToLong(key));
+	}
 }