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
9 changes: 5 additions & 4 deletions githubtasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@ type Server struct {
func Init() *Server {
s := &Server{
GoServer: &goserver.GoServer{},
config: &pb.Config{},
}
return s
}

// DoRegister does RPC registration
func (s *Server) DoRegister(server *grpc.Server) {
//Pass
pb.RegisterTasksServiceServer(server, s)
}

// ReportHealth alerts if we're not healthy
Expand All @@ -61,8 +62,8 @@ func (s *Server) GetState() []*pbg.State {
}
}

func (s *Server) save(ctx context.Context) {
s.KSclient.Save(ctx, KEY, s.config)
func (s *Server) save(ctx context.Context) error {
return s.KSclient.Save(ctx, KEY, s.config)
}

func (s *Server) load(ctx context.Context) error {
Expand All @@ -87,7 +88,7 @@ func main() {
server := Init()
server.PrepServer()
server.Register = server
err := server.RegisterServerV2("githubtasks", false, false)
err := server.RegisterServerV2("githubtasks", false, true)
if err != nil {
return
}
Expand Down
15 changes: 15 additions & 0 deletions githubtasksapi.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package main

import "golang.org/x/net/context"

import pb "github.com/brotherlogic/githubtasks/proto"

// AddProject to the system
func (s *Server) AddProject(ctx context.Context, req *pb.AddProjectRequest) (*pb.AddProjectResponse, error) {
err := s.load(ctx)
if err == nil {
s.config.Projects = append(s.config.Projects, req.GetAdd())
err = s.save(ctx)
}
return &pb.AddProjectResponse{}, err
}
19 changes: 19 additions & 0 deletions githubtasksapi_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package main

import (
"context"
"testing"

pb "github.com/brotherlogic/githubtasks/proto"
)

func TestAddProject(t *testing.T) {
s := InitTestServer()

s.AddProject(context.Background(),
&pb.AddProjectRequest{Add: &pb.Project{Name: "test project"}})

if len(s.config.GetProjects()) != 1 {
t.Errorf("Project was not added")
}
}
10 changes: 7 additions & 3 deletions githubtasksutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@ import (
)

func (s *Server) validateIntegrity(ctx context.Context) error {
if len(s.config.GetProjects()) == 0 {
s.RaiseIssue(ctx, "Task Issue", fmt.Sprintf("There are no projects listed"), false)
err := s.load(ctx)

if err == nil {
if len(s.config.GetProjects()) == 0 {
s.RaiseIssue(ctx, "Task Issue", fmt.Sprintf("There are no projects listed"), false)
}
}

return nil
return err
}
6 changes: 5 additions & 1 deletion githubtasksutils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@ package main
import (
"context"
"testing"
"time"

"github.com/brotherlogic/keystore/client"

pb "github.com/brotherlogic/githubtasks/proto"
)

func InitTestServer() *Server {
s := Init()
s.SkipLog = true
s.SkipIssue = true
s.GoServer.KSclient = *keystoreclient.GetTestClient(".test")
s.GoServer.KSclient.Save(context.Background(), KEY, &pb.Config{LastUpdate: time.Now().Unix()})
return s
}

Expand All @@ -20,6 +24,6 @@ func TestEmptyConfig(t *testing.T) {
err := s.validateIntegrity(context.Background())

if err != nil {
t.Errorf("Error in validation")
t.Errorf("Error in validation: %v", err)
}
}
145 changes: 43 additions & 102 deletions proto/githubtasks.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions proto/githubtasks.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package githubtasks;

message config {
repeated Project projects = 1;
int64 last_update = 2;
}

message Project {
Expand Down Expand Up @@ -68,6 +69,6 @@ message AddTaskResponse {

service TasksService {
rpc AddProject(AddProjectRequest) returns (AddProjectResponse) {};
rpc UpdateProject(UpdateProjectRequest) returns (UpdateProjectResponse) {};
rpc AddTask(AddTaskRequest) returns (AddTaskResponse) {};
//rpc UpdateProject(UpdateProjectRequest) returns (UpdateProjectResponse) {};
//rpc AddTask(AddTaskRequest) returns (AddTaskResponse) {};
}