610: Add support for other issue tracker email addresses than @openjd…

…k.org

Reviewed-by: ehelin

bots/notify/src/main/java/org/openjdk/skara/bots/notify/issue/IssueNotifier.java

@@ -77,14 +77,25 @@ private Optional<String> findIssueUsername(CommitMetadata commit) {
         var authorEmail = EmailAddress.from(commit.author().email());
         if (authorEmail.domain().equals("openjdk.org")) {
             return Optional.of(authorEmail.localPart());
+        } else {
+            var user = issueProject.findUser(authorEmail.address());
+            if (user.isPresent()) {
+                return Optional.of(user.get().userName());
+            }
         }
 
         var committerEmail = EmailAddress.from(commit.committer().email());
-        if (!committerEmail.domain().equals("openjdk.org")) {
+        if (committerEmail.domain().equals("openjdk.org")) {
+            return Optional.of(committerEmail.localPart());
+        } else {
+            var user = issueProject.findUser(committerEmail.address());
+            if (user.isPresent()) {
+                return Optional.of(user.get().userName());
+            }
+
             log.severe("Cannot determine issue tracker user name from committer email: " + committerEmail);
             return Optional.empty();
         }
-        return Optional.of(committerEmail.localPart());
     }
 
     @Override

bots/notify/src/test/java/org/openjdk/skara/bots/notify/issue/IssueNotifierTests.java

@@ -408,6 +408,49 @@ void testIssue(TestInfo testInfo) throws IOException {
         }
     }
 
+    @Test
+    void testIssueOtherDomain(TestInfo testInfo) throws IOException {
+        try (var credentials = new HostCredentials(testInfo);
+             var tempFolder = new TemporaryDirectory()) {
+
+            var repo = credentials.getHostedRepository();
+            var repoFolder = tempFolder.path().resolve("repo");
+            var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
+            credentials.commitLock(localRepo);
+            localRepo.pushAll(repo.url());
+
+            var issueProject = credentials.getIssueProject();
+            var storageFolder = tempFolder.path().resolve("storage");
+            var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object());
+            var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
+
+            // Initialize history
+            TestBotRunner.runPeriodicItems(notifyBot);
+
+            // Create an issue and commit a fix
+            var authorEmailAddress = issueProject.issueTracker().currentUser().userName() + "@otherjdk.org";
+            var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
+            var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue", "Duke", authorEmailAddress);
+            localRepo.push(editHash, repo.url(), "master");
+            TestBotRunner.runPeriodicItems(notifyBot);
+
+            // The changeset should be reflected in a comment
+            var updatedIssue = issueProject.issue(issue.id()).orElseThrow();
+
+            var comments = updatedIssue.comments();
+            assertEquals(1, comments.size());
+            var comment = comments.get(0);
+            assertTrue(comment.body().contains(editHash.abbreviate()));
+
+            // As well as a fixVersion
+            assertEquals(Set.of("0.1"), fixVersions(updatedIssue));
+
+            // The issue should be assigned and resolved
+            assertEquals(RESOLVED, updatedIssue.state());
+            assertEquals(List.of(issueProject.issueTracker().currentUser()), updatedIssue.assignees());
+        }
+    }
+
     @Test
     void testIssueNoVersion(TestInfo testInfo) throws IOException {
         try (var credentials = new HostCredentials(testInfo);

issuetracker/src/main/java/org/openjdk/skara/issuetracker/IssueProject.java

@@ -22,6 +22,7 @@
  */
 package org.openjdk.skara.issuetracker;
 
+import org.openjdk.skara.host.HostUser;
 import org.openjdk.skara.json.JSONValue;
 
 import java.net.URI;
@@ -34,4 +35,5 @@ public interface IssueProject {
     Optional<Issue> issue(String id);
     List<Issue> issues();
     String name();
+    Optional<HostUser> findUser(String findBy);
 }

issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraProject.java

@@ -22,6 +22,7 @@
  */
 package org.openjdk.skara.issuetracker.jira;
 
+import org.openjdk.skara.host.HostUser;
 import org.openjdk.skara.issuetracker.*;
 import org.openjdk.skara.json.*;
 import org.openjdk.skara.network.*;
@@ -386,4 +387,24 @@ public List<Issue> issues() {
     public String name() {
         return projectName.toUpperCase();
     }
+
+    @Override
+    public Optional<HostUser> findUser(String findBy) {
+        var user = request.get("user/search")
+                          .param("username", findBy)
+                          .onError(r -> r.statusCode() == 404 ? Optional.of(JSON.object().put("NOT_FOUND", true)) : Optional.empty())
+                          .execute();
+        if (user.contains("NOT_FOUND")) {
+            return Optional.empty();
+        }
+        if (user.asArray().size() != 1) {
+            log.severe("Multiple results returned for user query: " + findBy);
+            return Optional.empty();
+        }
+        var data = user.asArray().get(0);
+        return Optional.of(new HostUser(data.get("name").asString(),
+                                        data.get("name").asString(),
+                                        data.get("displayName").asString(),
+                                        data.get("emailAddresss").asString()));
+    }
 }

test/src/main/java/org/openjdk/skara/test/TestHost.java

@@ -22,6 +22,7 @@
  */
 package org.openjdk.skara.test;
 
+import org.openjdk.skara.email.EmailAddress;
 import org.openjdk.skara.forge.*;
 import org.openjdk.skara.host.*;
 import org.openjdk.skara.issuetracker.*;
@@ -129,6 +130,14 @@ public Optional<HostUser> user(String username) {
                          .findAny();
     }
 
+    Optional<HostUser> findUser(String findBy) {
+        var findByLocalPart = EmailAddress.parse(findBy).localPart();
+        return data.users.stream()
+                         .filter(user -> user.userName().equals(findBy) ||
+                                 user.userName().equals(findByLocalPart))
+                         .findAny();
+    }
+
     @Override
     public HostUser currentUser() {
         return data.users.get(currentUser);

test/src/main/java/org/openjdk/skara/test/TestIssueProject.java

@@ -22,6 +22,7 @@
  */
 package org.openjdk.skara.test;
 
+import org.openjdk.skara.host.HostUser;
 import org.openjdk.skara.issuetracker.*;
 import org.openjdk.skara.json.JSONValue;
 import org.openjdk.skara.network.URIBuilder;
@@ -75,4 +76,9 @@ public List<Issue> issues() {
     public String name() {
         return projectName.toUpperCase();
     }
+
+    @Override
+    public Optional<HostUser> findUser(String findBy) {
+        return host.findUser(findBy);
+    }
 }