Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions githubtasksutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"fmt"
"sort"
"time"

"golang.org/x/net/context"
Expand Down Expand Up @@ -56,6 +57,12 @@ func (s *Server) processProjects(ctx context.Context) (time.Time, error) {
for _, project := range s.config.GetProjects() {
for _, milestone := range project.GetMilestones() {
if milestone.GetState() == pb.Milestone_ACTIVE {

// Sort tasks by the UID
sort.SliceStable(milestone.GetTasks(), func(i, j int) bool {
return milestone.GetTasks()[i].GetUid() < milestone.GetTasks()[j].GetUid()
})

for _, task := range milestone.GetTasks() {
if task.GetState() == pb.Task_ACTIVE {
break
Expand Down
35 changes: 35 additions & 0 deletions githubtasksutils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,38 @@ func TestActiveTasks(t *testing.T) {
}

}

func TestAddTasks(t *testing.T) {
s := InitTestServer()
s.AddProject(context.Background(), &pb.AddProjectRequest{Add: &pb.Project{Name: "Hello", Milestones: []*pb.Milestone{&pb.Milestone{Name: "Testing", State: pb.Milestone_ACTIVE, Number: 1, Tasks: []*pb.Task{}}}}})
_, err := s.processProjects(context.Background())

_, err = s.AddTask(context.Background(),
&pb.AddTaskRequest{MilestoneName: "Testing", MilestoneNumber: 1, Title: "Add stuff", Body: "Do Stuff"})
_, err = s.AddTask(context.Background(),
&pb.AddTaskRequest{MilestoneName: "Testing", MilestoneNumber: 1, Title: "Add more stuff", Body: "Do Stuff"})

_, err = s.processProjects(context.Background())
if err != nil {
t.Fatalf("Bad project proc")
}

resp, err := s.GetMilestones(context.Background(), &pb.GetMilestonesRequest{})
if err != nil {
t.Fatalf("Cannot get milestones")
}

chosenTask := ""
for _, m := range resp.GetMilestones() {
for _, tsk := range m.GetTasks() {
if tsk.GetNumber() > 0 {
chosenTask = tsk.GetTitle()
}
}
}

if chosenTask != "Add stuff" {
t.Errorf("Ordering is out of line: %v", resp.GetMilestones())
}

}