Milestone Picker

src/main/java/backend/Logic.java

@@ -215,6 +215,22 @@ public CompletableFuture<Boolean> replaceIssueLabels(TurboIssue issue, List<Stri
                 .exceptionally(Futures.withResult(false));
     }
 
+    public CompletableFuture<Boolean> replaceIssueMilestone(TurboIssue issue, Integer milestone) {
+        logger.info("Changing milestone for " + issue + " on GitHub");
+        return repoIO.replaceIssueMilestone(issue, milestone)
+                .thenApply(resultingIssue -> {
+                    logger.info("Changing milestone for " + issue + " on UI");
+                    if (resultingIssue.getMilestone() != null) {
+                        issue.setMilestoneById(resultingIssue.getMilestone().getNumber());
+                    } else {
+                        issue.setMilestoneById(null);
+                    }
+                    refreshUI();
+                    return true;
+                })
+                .exceptionally(Futures.withResult(false));
+    }
+
     /**
      * Determines data to be sent to the GUI to refresh the entire GUI with the current model in Logic,
      * and then sends the data to the GUI.

src/main/java/backend/RepoIO.java

@@ -6,9 +6,11 @@
 import backend.json.JSONStore;
 import backend.resource.Model;
 import backend.resource.TurboIssue;
+import backend.resource.TurboMilestone;
 import backend.resource.serialization.SerializableModel;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.logging.log4j.Logger;
+import org.eclipse.egit.github.core.Issue;
 import ui.UI;
 import util.HTLog;
 import util.events.ShowErrorDialogEvent;
@@ -164,6 +166,10 @@ public CompletableFuture<List<String>> replaceIssueLabels(TurboIssue issue, List
         return repoSource.replaceIssueLabels(issue, labels);
     }
 
+    public CompletableFuture<Issue> replaceIssueMilestone(TurboIssue issue, Integer milestone) {
+        return repoSource.replaceIssueMilestone(issue, milestone);
+    }
+
     public CompletableFuture<ImmutablePair<Integer, Long>> getRateLimitResetTime() {
         return repoSource.getRateLimitResetTime();
     }

src/main/java/backend/github/GitHubRepo.java

@@ -13,6 +13,8 @@
 import org.apache.logging.log4j.Logger;
 import org.eclipse.egit.github.core.*;
 import org.eclipse.egit.github.core.client.*;
+import org.eclipse.egit.github.core.Issue;
+import org.eclipse.egit.github.core.Milestone;
 import org.eclipse.egit.github.core.service.CollaboratorService;
 import org.eclipse.egit.github.core.service.IssueService;
 import org.eclipse.egit.github.core.service.MilestoneService;
@@ -259,6 +261,23 @@ public List<Label> setLabels(String repoId, int issueId, List<String> labels) th
         );
     }
 
+
+    @Override
+    public Issue setMilestone(String repoId, int issueId, String issueTitle, Integer issueMilestone) throws IOException {
+        Milestone gitHubMilestone = new Milestone();
+        if (issueMilestone != null) {
+            gitHubMilestone.setNumber(issueMilestone);
+        }
+
+        // github api requires at least id and title
+        Issue createdIssue = new Issue();
+        createdIssue.setNumber(issueId);
+        createdIssue.setTitle(issueTitle);
+        createdIssue.setMilestone(gitHubMilestone);
+
+        return issueService.editIssue(RepositoryId.createFromId(repoId), createdIssue);
+    }
+
     @Override
     public boolean isRepositoryValid(String repoId) {
         String repoURL = SEGMENT_REPOS + "/" + repoId;

src/main/java/backend/github/GitHubSource.java

@@ -6,8 +6,10 @@
 import backend.interfaces.RepoSource;
 import backend.resource.Model;
 import backend.resource.TurboIssue;
+import backend.resource.TurboMilestone;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.logging.log4j.Logger;
+import org.eclipse.egit.github.core.Issue;
 import util.HTLog;
 
 import java.util.List;
@@ -64,6 +66,12 @@ public CompletableFuture<List<String>> replaceIssueLabels(TurboIssue issue, List
         return addTask(new ReplaceIssueLabelsTask(this, gitHub, issue.getRepoId(), issue.getId(), labels)).response;
     }
 
+    @Override
+    public CompletableFuture<Issue> replaceIssueMilestone(TurboIssue issue, Integer milestone) {
+        return addTask(new ReplaceIssueMilestoneTask(this, gitHub, issue.getRepoId(), issue.getId(), issue.getTitle(),
+                milestone)).response;
+    }
+
 @Override
     public CompletableFuture<ImmutablePair<Integer, Long>> getRateLimitResetTime() {
         return addTask(new CheckRateLimitTask(this, gitHub)).response;

src/main/java/backend/github/ReplaceIssueMilestoneTask.java

@@ -0,0 +1,34 @@
+package backend.github;
+
+import backend.interfaces.Repo;
+import backend.interfaces.TaskRunner;
+import org.eclipse.egit.github.core.Issue;
+
+import java.io.IOException;
+
+public class ReplaceIssueMilestoneTask extends GitHubRepoTask<Issue> {
+    private final String repoId;
+    private final int issueId;
+    private final String issueTitle;
+    private final Integer issueMilestone;
+
+    public ReplaceIssueMilestoneTask(TaskRunner taskRunner, Repo repo, String repoId, int issueId, String issueTitle,
+                                     Integer issueMilestone) {
+        super(taskRunner, repo);
+        this.repoId = repoId;
+        this.issueId = issueId;
+        this.issueMilestone = issueMilestone;
+        this.issueTitle = issueTitle;
+    }
+
+    @Override
+    public void run() {
+        try {
+            response.complete(
+                    repo.setMilestone(repoId, issueId, issueTitle, issueMilestone)
+            );
+        } catch (IOException e) {
+            response.completeExceptionally(e);
+        }
+    }
+}

src/main/java/backend/interfaces/Repo.java

@@ -10,6 +10,7 @@
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.eclipse.egit.github.core.Comment;
+import org.eclipse.egit.github.core.Issue;
 import org.eclipse.egit.github.core.Label;
 import org.eclipse.egit.github.core.PullRequest;
 
@@ -41,6 +42,8 @@ public interface Repo {
 
     boolean isRepositoryValid(String repoId);
     List<Label> setLabels(String repoId, int issueId, List<String> labels) throws IOException;
+
+    Issue setMilestone(String repoId, int issueId, String issueTitle, Integer issueMilestone) throws IOException;
     ImmutablePair<Integer, Long> getRateLimitResetTime() throws IOException;
 
 }

src/main/java/backend/interfaces/RepoSource.java

@@ -4,7 +4,9 @@
 import backend.UserCredentials;
 import backend.resource.Model;
 import backend.resource.TurboIssue;
+import backend.resource.TurboMilestone;
 import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.eclipse.egit.github.core.Issue;
 
 import java.util.List;
 import java.util.Map;
@@ -42,6 +44,8 @@ public void execute(Runnable r) {
 
     public abstract CompletableFuture<List<String>> replaceIssueLabels(TurboIssue issue, List<String> labels);
 
+    public abstract CompletableFuture<Issue> replaceIssueMilestone(TurboIssue issue, Integer milestone);
+
     public abstract CompletableFuture<ImmutablePair<Integer, Long>> getRateLimitResetTime();
 
 }

src/main/java/backend/resource/TurboIssue.java

@@ -372,11 +372,11 @@ public void addLabel(TurboLabel label) {
     public Optional<Integer> getMilestone() {
         return milestone;
     }
-    public void setMilestone(Integer milestone) {
-        this.milestone = Optional.of(milestone);
+    public void setMilestoneById(Integer milestone) {
+        this.milestone = (milestone == null) ? Optional.empty() : Optional.of(milestone);
     }
     public void setMilestone(TurboMilestone milestone) {
-        setMilestone(milestone.getId());
+        setMilestoneById(milestone.getId());
     }
     public IssueMetadata getMetadata() {
         return metadata;

src/main/java/backend/stub/DummyRepo.java

@@ -11,6 +11,7 @@
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.eclipse.egit.github.core.Comment;
+import org.eclipse.egit.github.core.Issue;
 import org.eclipse.egit.github.core.Label;
 import org.eclipse.egit.github.core.PullRequest;
 import ui.UI;
@@ -182,6 +183,11 @@ public List<Label> setLabels(String repoId, int issueId, List<String> labels) {
         return getRepoState(repoId).setLabels(issueId, labels);
     }
 
+    @Override
+    public Issue setMilestone(String repoId, int issueId, String issueTitle, Integer issueMilestone) {
+        return getRepoState(repoId).setMilestone(issueId, issueMilestone);
+    }
+
     @Override
     public boolean isRepositoryValid(String repoId) {
         return true;

src/main/java/backend/stub/DummyRepoState.java

@@ -9,9 +9,7 @@
 import github.TurboIssueEvent;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
-import org.eclipse.egit.github.core.Comment;
-import org.eclipse.egit.github.core.Label;
-import org.eclipse.egit.github.core.User;
+import org.eclipse.egit.github.core.*;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -387,6 +385,32 @@ protected final List<Label> setLabels(int issueId, List<String> newLabels) {
         return newLabels.stream().map(new Label()::setName).collect(Collectors.toList());
     }
 
+    protected final Issue setMilestone(int issueId, Integer milestone) {
+        ImmutablePair<TurboIssue, IssueMetadata> mutables = produceMutables(issueId);
+        TurboIssue toSet = mutables.getLeft();
+        IssueMetadata metadataOfIssue = mutables.getRight();
+        List<TurboIssueEvent> eventsOfIssue = metadataOfIssue.getEvents();
+
+        if (toSet.getMilestone().isPresent()) {
+            int milestoneOfIssue = toSet.getMilestone().get();
+            eventsOfIssue.add(new TurboIssueEvent(new User().setLogin("test"),
+                    IssueEventType.Demilestoned,
+                    new Date()).setMilestoneTitle(milestones.get(milestoneOfIssue).getTitle()));
+        }
+
+        eventsOfIssue.add(new TurboIssueEvent(new User().setLogin("test"),
+                IssueEventType.Milestoned,
+                new Date()).setMilestoneTitle(milestones.get(milestone).getTitle()));
+        toSet.setMilestoneById(milestone);
+        toSet.setUpdatedAt(LocalDateTime.now());
+
+        markUpdatedEvents(toSet, IssueMetadata.intermediate(eventsOfIssue, metadataOfIssue.getComments(), "", ""));
+
+        Issue newIssue = new Issue();
+        newIssue.setMilestone(new Milestone().setNumber(milestone));
+        return newIssue;
+    }
+
     protected TurboIssue commentOnIssue(String author, String commentText, int issueId) {
         // Get copies of issue itself and its metadata
         ImmutablePair<TurboIssue, IssueMetadata> mutables = produceMutables(issueId);

src/main/java/backend/stub/DummySource.java

@@ -9,7 +9,9 @@
 import backend.interfaces.RepoSource;
 import backend.resource.Model;
 import backend.resource.TurboIssue;
+import backend.resource.TurboMilestone;
 import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.eclipse.egit.github.core.Issue;
 import util.Futures;
 
 import java.util.List;
@@ -53,6 +55,11 @@ public CompletableFuture<List<String>> replaceIssueLabels(TurboIssue issue, List
         return addTask(new ReplaceIssueLabelsTask(this, dummy, issue.getRepoId(), issue.getId(), labels)).response;
     }
 
+    @Override
+    public CompletableFuture<Issue> replaceIssueMilestone(TurboIssue issue, Integer milestone) {
+        return null;
+    }
+
     @Override
     public CompletableFuture<Boolean> isRepositoryValid(String repoId) {
         return Futures.unit(true);

src/main/java/github/TurboIssueEvent.java

@@ -90,9 +90,10 @@ public String getMilestoneTitle() {
         assert type == IssueEventType.Milestoned || type == IssueEventType.Demilestoned;
         return milestoneTitle;
     }
-    public void setMilestoneTitle(String milestoneTitle) {
+    public TurboIssueEvent setMilestoneTitle(String milestoneTitle) {
         assert type == IssueEventType.Milestoned || type == IssueEventType.Demilestoned;
         this.milestoneTitle = milestoneTitle;
+        return this;
     }
     public String getRenamedFrom() {
         assert type == IssueEventType.Renamed;

src/main/java/ui/UI.java

@@ -32,6 +32,7 @@
 import ui.components.KeyboardShortcuts;
 import ui.components.StatusUI;
 import ui.components.pickers.LabelPicker;
+import ui.components.pickers.MilestonePicker;
 import ui.issuepanel.PanelControl;
 import undo.UndoController;
 import util.*;
@@ -178,6 +179,7 @@ private void showMainWindow(String repoId) {
 
     private void initialisePickers() {
         new LabelPicker(this, mainStage);
+        new MilestonePicker(this, mainStage);
     }
 
     protected void registerTestEvents() {

src/main/java/ui/components/pickers/MilestonePicker.java

@@ -0,0 +1,45 @@
+package ui.components.pickers;
+
+import backend.resource.TurboIssue;
+import backend.resource.TurboMilestone;
+import backend.resource.TurboUser;
+import javafx.application.Platform;
+import javafx.scene.control.ButtonType;
+import javafx.stage.Stage;
+import javafx.util.Pair;
+import ui.UI;
+import undo.actions.ChangeLabelsAction;
+import undo.actions.ChangeMilestoneAction;
+import util.events.ShowMilestonePickerEvent;
+import util.events.ShowMilestonePickerEventHandler;
+
+import java.util.List;
+import java.util.Optional;
+
+public class MilestonePicker {
+    UI ui;
+    Stage stage;
+
+    public MilestonePicker(UI ui, Stage mainStage) {
+        this.ui = ui;
+        this.stage = mainStage;
+        ui.registerEvent((ShowMilestonePickerEventHandler) e -> Platform.runLater(() -> showMilestonePicker(e.issue)));
+    }
+
+    private void showMilestonePicker(TurboIssue issue) {
+        List<TurboMilestone> milestoneList = ui.logic.getRepo(issue.getRepoId()).getMilestones();
+        MilestonePickerDialog dialog = new MilestonePickerDialog(stage, issue, milestoneList);
+        Optional<Pair<ButtonType, Integer>> milestoneDialogResponse = dialog.showAndWait();
+
+        if (!milestoneDialogResponse.isPresent() ||
+                milestoneDialogResponse.get().getKey().equals(ButtonType.CANCEL)) return;
+
+        Optional<Integer> newlyAssignedMilestone = Optional.ofNullable(milestoneDialogResponse.get().getValue());
+
+        if (!issue.getMilestone().equals(newlyAssignedMilestone)) {
+            ui.undoController.addAction(issue, new ChangeMilestoneAction(ui.logic, issue.getMilestone(),
+                    newlyAssignedMilestone));
+        }
+    }
+
+}