diff --git a/src/main/java/org/hibernate/infra/replicate/jira/resource/JiraWebHookListenerResource.java b/src/main/java/org/hibernate/infra/replicate/jira/resource/JiraWebHookListenerResource.java index 91dbd96..2bc45cb 100644 --- a/src/main/java/org/hibernate/infra/replicate/jira/resource/JiraWebHookListenerResource.java +++ b/src/main/java/org/hibernate/infra/replicate/jira/resource/JiraWebHookListenerResource.java @@ -24,7 +24,7 @@ public class JiraWebHookListenerResource { @Consumes(MediaType.APPLICATION_JSON) public String somethingHappened(@RestPath @NotNull /* @ConfiguredProject */ String project, JiraWebHookEvent event) { - Log.debugf("Received a notification about %s project: %s", project, event); + Log.infof("Received a notification about %s project: %s", project, event); jiraService.acknowledge(project, event); return "ack"; } diff --git a/src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueAbstractEventHandler.java b/src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueAbstractEventHandler.java index 396fb60..2060ded 100644 --- a/src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueAbstractEventHandler.java +++ b/src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueAbstractEventHandler.java @@ -129,8 +129,7 @@ private JiraUser toUser(String value) { } private Optional prepareTransition(JiraIssue sourceIssue) { - return statusToTransition(sourceIssue.fields.status.id).map( - tr -> new JiraTransition(tr, "Upstream issue status updated to: " + sourceIssue.fields.status.name)); + return statusToTransition(sourceIssue.fields.status.id).map(JiraTransition::new); } protected Optional prepareParentLink(String destinationKey, JiraIssue sourceIssue) { @@ -169,12 +168,15 @@ private String prepareDescriptionQuote(JiraIssue issue) { Assigned to: %s. - Reported by: %s.{quote} + Reported by: %s. + + Upstream status: %s.{quote} """.formatted(issue.key, issueUri, assignee == null ? " Unassigned" : "[%s|%s]".formatted(assignee.name(), assignee.uri()), - reporter == null ? " Unknown" : "[%s|%s]".formatted(reporter.name(), reporter.uri())); + reporter == null ? " Unknown" : "[%s|%s]".formatted(reporter.name(), reporter.uri()), + issue.fields.status != null ? issue.fields.status.name : "Unknown"); } } diff --git a/src/main/java/org/hibernate/infra/replicate/jira/service/jira/model/rest/JiraTransition.java b/src/main/java/org/hibernate/infra/replicate/jira/service/jira/model/rest/JiraTransition.java index 632907c..871a029 100644 --- a/src/main/java/org/hibernate/infra/replicate/jira/service/jira/model/rest/JiraTransition.java +++ b/src/main/java/org/hibernate/infra/replicate/jira/service/jira/model/rest/JiraTransition.java @@ -13,6 +13,10 @@ public class JiraTransition extends JiraBaseObject { public JiraTransition() { } + public JiraTransition(String transitionId) { + this(transitionId, null); + } + public JiraTransition(String transitionId, String comment) { transition = new JiraIssueTransition(transitionId); if (comment != null && !comment.isBlank()) {