Updated schema migration logic

openjdk · Jun 12, 2020 · c939a1b · c939a1b
1 parent 203cdbe
commit c939a1b
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/bots/notify/src/main/java/org/openjdk/skara/bots/notify/PullRequestWorkItem.java b/bots/notify/src/main/java/org/openjdk/skara/bots/notify/PullRequestWorkItem.java
@@ -191,13 +191,14 @@ public Collection<WorkItem> run(Path scratchPath) {
         var storedState = stored.stream()
                 .filter(ss -> ss.prId().equals(state.prId()))
                 .findAny();
-        if (storedState.isPresent()) {
-            // The stored entry could be old and be missing commit information - if so, upgrade it
-            if (storedState.get().commitId().isPresent() && storedState.get().commitId().get().equals(Hash.zero())) {
-                var hash = resultingCommitHashFor(pr);
-                storedState = Optional.of(new PullRequestState(pr, issues, hash));
-            }
+        // The stored entry could be old and be missing commit information - if so, upgrade it
+        if (storedState.isPresent() && storedState.get().commitId().equals(Optional.of(Hash.zero()))) {
+            var hash = resultingCommitHashFor(pr);
+            storedState = Optional.of(new PullRequestState(pr, storedState.get().issueIds(), hash));
+            storage.put(storedState.get());
+        }
 
+        if (storedState.isPresent()) {
             var storedIssues = storedState.get().issueIds();
             storedIssues.stream()
                         .filter(issue -> !issues.contains(issue))