Dep updates; StalledDiscussionFlow progress

.env

@@ -20,6 +20,7 @@ bot.enable.pr-review=false
 bot.enable.state-machine=false
 bot.enable.create-draft=true
 
+BOT_STALLED_DISCUSSION_FLOW_POLL_DURATION=86400s
 
 ## Stuff required by the github app framework
 

pom.xml

@@ -13,9 +13,9 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    <quarkus.platform.version>2.7.5.Final</quarkus.platform.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-    <quarkus-github-app.version>1.8.4</quarkus-github-app.version>
+    <quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
+    <surefire-plugin.version>3.0.0</surefire-plugin.version>
+    <quarkus-github-app.version>1.16.0</quarkus-github-app.version>
 
   </properties>
   <dependencyManagement>

src/main/java/org/bf2/arch/bot/ArchBotConfig.java

@@ -15,11 +15,13 @@ public class ArchBotConfig {
     /**
      * Github login name of the bot itself.
      */
+    @JsonDeserialize
     String botUserLogin;
 
     /**
      * The time, in minutes, to wait between checking for stalled discussions.
      */
+    @JsonDeserialize
     long stalledDiscussionPollTimeMins;
 
     /**
@@ -31,7 +33,8 @@ public class ArchBotConfig {
     /**
      * The URL at which the site is published.
      */
-    String publishedUrl = "https://architecture.appservices.tech";
+    @JsonDeserialize
+    String publishedUrl;
 
     @Override
     public String toString() {

src/main/java/org/bf2/arch/bot/CreateDraftRecordFlow.java

@@ -11,14 +11,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import io.quarkiverse.githubapp.ConfigFile;
-import io.quarkiverse.githubapp.event.IssueComment;
-import org.bf2.arch.bot.model.record.RecordPage;
 import org.bf2.arch.bot.model.record.RecordId;
+import org.bf2.arch.bot.model.record.RecordPage;
 import org.bf2.arch.bot.model.record.RecordType;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.kohsuke.github.GHBranch;
 import org.kohsuke.github.GHCommit;
 import org.kohsuke.github.GHContent;
@@ -32,6 +28,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.quarkiverse.githubapp.ConfigFile;
+import io.quarkiverse.githubapp.event.IssueComment;
+import io.smallrye.common.constraint.NotNull;
+import io.smallrye.common.constraint.Nullable;
+
 /**
  * Flow for creating a Draft record (AP, ADR, PADR), and possibly superseding an existing record.
  *

src/main/java/org/bf2/arch/bot/StalledDiscussionFlow.java

@@ -16,15 +16,15 @@
  */
 package org.bf2.arch.bot;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Date;
+import java.util.Optional;
 import java.util.Set;
 
-import io.quarkiverse.githubapp.runtime.github.GitHubService;
-import io.quarkus.scheduler.Scheduled;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kohsuke.github.GHDirection;
 import org.kohsuke.github.GHIssue;
@@ -34,6 +34,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.quarkiverse.githubapp.ConfigFile;
+import io.quarkiverse.githubapp.GitHubConfigFileProvider;
+import io.quarkiverse.githubapp.runtime.github.GitHubService;
+import io.quarkus.scheduler.Scheduled;
+
 @ApplicationScoped
 public class StalledDiscussionFlow {
 
@@ -52,23 +57,27 @@ public class StalledDiscussionFlow {
     private Date lastRan = new Date(0);
 
     GitHub client;
-    //ArchBotConfig config;
+    ArchBotConfig config;
+
+    @Inject
+    GitHubService service;
 
     @Inject
-    void init(GitHubService service) {
+    void init(GitHubConfigFileProvider configFileProvider) throws IOException {
         if (!enabled) {
             LOG.debug("Ignoring init: disabled due to {}=false", ENABLE);
         } else if (installationId != null) {
             // TODO parameterise this installationId
             client = service.getInstallationClient(installationId);
-            // TODO load the config
+
+            Optional<ArchBotConfig> oconfig = configFileProvider.fetchConfigFile(client.getRepository(repositoryPath),
+                                                                                 Util.CONFIG_REPO_PATH, ConfigFile.Source.DEFAULT, ArchBotConfig.class);
+            config = oconfig.orElseThrow();
         } else {
             throw new RuntimeException("installation id is requied");
         }
     }
 
-
-
     /**
      * When
      * every N hours
@@ -89,7 +98,7 @@ void init(GitHubService service) {
      * If the PR has been opened for > Y hours then "stalled-discussion"
      */
     // TODO similar method as this, but for OVERDUE
-    @Scheduled(every="60s")
+    @Scheduled(every = "{BOT_STALLED_DISCUSSION_FLOW_POLL_DURATION}")
     public void checkForStalledDiscussions() throws IOException {
         if (!enabled) {
             LOG.debug("Ignoring scheduled trigger: disabled due to {}=false", ENABLE);
@@ -98,7 +107,9 @@ public void checkForStalledDiscussions() throws IOException {
         long now = System.currentTimeMillis();
         long thresh = now - 24*40*60*1000L;
         LOG.info("Checking for stalled discussions");
-        // TODO need a parameter for this installation id
+
+        LOG.debug("Updating installation client to get new token (expires every 1h)");
+        client = service.getInstallationClient(installationId);
 
         var results = client.searchIssues()
                 .isOpen()
@@ -112,13 +123,7 @@ public void checkForStalledDiscussions() throws IOException {
                 .order(GHDirection.ASC)
                 .list();
         LOG.info("Top-level query found {} PRs", results.getTotalCount());
-        int processed = 0;
         for (GHIssue issue : results) {
-//            if () {
-//                lastRan = new Date();
-//                break;
-//            }
-            processed++;
             try {
                 GHPullRequest pullRequest = Util.findPullRequest(issue);
                 if (pullRequest == null) {
@@ -132,15 +137,16 @@ public void checkForStalledDiscussions() throws IOException {
                 // https://docs.github.com/en/rest/pulls/comments#list-review-comments-in-a-repository
                 // but the client doesn't expose them
                 Date lastCommentDate;
+                LOG.info("COMMENTS COUNT: {}", pullRequest.listReviewComments().toList().size());
                 var mostRecent = pullRequest.listReviewComments().toList().stream()
-//                        .filter(pr -> {
-//                            try {
-//                                return !Util.isThisBot(config, pr.getUser());
-//                            } catch (IOException e) {
-//                                return true;
-//                            }
-//                        })
-                        .map(comment -> {
+                    .filter(pr -> {
+                            try {
+                                return !Util.isThisBot(config, pr.getUser());
+                            } catch (IOException e) {
+                                return true;
+                            }
+                        })
+                    .map(comment -> {
                             try {
                                 LOG.info("Comment: {}", comment.getBody());
                                 LOG.info("User: {}", comment.getUser().getLogin());
@@ -151,16 +157,16 @@ public void checkForStalledDiscussions() throws IOException {
                         }).max(Date::compareTo);
 
                 lastCommentDate = mostRecent.orElseGet(() -> {
-                    try {
-                        return pullRequest.getUpdatedAt();
-                    } catch (IOException e) {
                         try {
-                            return pullRequest.getCreatedAt();
-                        } catch (IOException ex) {
-                            return new Date(0);
+                            return pullRequest.getUpdatedAt();
+                        } catch (IOException e) {
+                            try {
+                                return pullRequest.getCreatedAt();
+                            } catch (IOException ex) {
+                                return new Date(0);
+                            }
                         }
-                    }
-                });
+                    });
                 LOG.info("PR#{}: Last comment time {}", pullRequest.getNumber(), lastCommentDate);
 
                 if (lastCommentDate.getTime() < thresh) {

src/main/java/org/bf2/arch/bot/Util.java

@@ -21,7 +21,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jetbrains.annotations.NotNull;
 import org.kohsuke.github.GHIssue;
 import org.kohsuke.github.GHLabel;
 import org.kohsuke.github.GHPullRequest;
@@ -30,6 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.smallrye.common.constraint.NotNull;
+
 /**
  * Common helper functions
  */

src/main/resources/application.properties

@@ -1 +1,4 @@
-quarkus.log.level=DEBUG
+quarkus.log.level=DEBUG
+bot.enable.stalled-discussion=true
+bot.enable.create-draft=true
+BOT_STALLED_DISCUSSION_FLOW_POLL_DURATION=86400s

src/test/java/org/bf2/arch/bot/CreateDraftRecordFlowTest.java

@@ -70,6 +70,8 @@ public void renderTemplateTest() throws IOException {
                 "- \"me\"\n" +
                 "tags:\n" +
                 "- \"bar\"\n" +
+                "applies_padrs: null\n" +
+                "applies_patterns: null\n" +
                 "---\n" +
                 "Hello, world\n", rendered.toContentString());
     }
@@ -92,6 +94,8 @@ public void renderSupersededTemplateTest() throws IOException {
                         "- \"me\"\n" +
                         "tags:\n" +
                         "- \"bar\"\n" +
+                        "applies_padrs: null\n" +
+                        "applies_patterns: null\n" +
                         "---\n" +
                         "Hello, world\n", rendered.toContentString());
     }
@@ -137,4 +141,4 @@ public void testGetPage() throws IOException {
 
     // TODO test supersededContent
 
-}
+}

src/test/resources/application.properties

@@ -27,4 +27,5 @@ FqD6xNtjmuaS5enErcCAMbZtzA7TNzvGaVO+xB/GfQ2QHS8/mrTesvQsTUZwC+ji\
 E0/FAoGATJvuAfgy9uiKR7za7MigYVacE0u4aD1sF7v6D4AFqBOGquPQQhePSdz9\
 G/UUwySoo+AQ+rd2EPhyexjqXBhRGe+EDGFVFivaQzTT8/5bt/VddbTcw2IpmXYj\
 LW6V8BbcP5MRhd2JQSRh16nWwSQJ2BdpUZFwayEEQ6UcrMfqvA0=\
------END RSA PRIVATE KEY-----
+-----END RSA PRIVATE KEY-----
+BOT_STALLED_DISCUSSION_FLOW_POLL_DURATION=86400s