Skip to content

Commit a2fed70

Browse files
committed
Use a transition ID and not name to close the issue deleted upstream
1 parent 131f04b commit a2fed70

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

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

+8-10
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.hibernate.infra.replicate.jira.service.jira.client.JiraRestException;
1212
import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraFields;
1313
import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraIssue;
14-
import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraIssueTransition;
1514
import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraTransition;
1615
import org.hibernate.infra.replicate.jira.service.reporting.ReportingConfig;
1716

@@ -83,15 +82,14 @@ private void handleDeletedMovedIssue(String type) {
8382
private Optional<JiraTransition> prepareTransition(JiraIssue issue) {
8483
Optional<String> deletedStatus = context.projectGroup().statuses().deletedStatus();
8584
if (deletedStatus.isPresent()) {
86-
prepareTransition(deletedStatus.get(), issue);
87-
JiraTransition transition = new JiraTransition();
88-
transition.transition = new JiraIssueTransition(deletedStatus.get());
89-
90-
Optional<String> deletedResolution = context.projectGroup().statuses().deletedResolution();
91-
deletedResolution.ifPresent(
92-
name -> transition.properties().put("fields", Map.of("resolution", Map.of("name", name))));
93-
94-
return Optional.of(transition);
85+
Optional<JiraTransition> transition = prepareTransition(deletedStatus.get(), issue);
86+
87+
return transition.map(tr -> {
88+
Optional<String> deletedResolution = context.projectGroup().statuses().deletedResolution();
89+
deletedResolution
90+
.ifPresent(name -> tr.properties().put("fields", Map.of("resolution", Map.of("name", name))));
91+
return tr;
92+
});
9593
}
9694

9795
return Optional.empty();

0 commit comments

Comments
 (0)