diff --git a/.env.local b/.env.local index b04a3f8..41becb9 100644 --- a/.env.local +++ b/.env.local @@ -3,6 +3,5 @@ DB_USER=gitpm DB_NAME=gitpm DB_HOST=postgres -RABBIT_HOST=rabbit -RABBIT_USERNAME=gitpm -RABBIT_PASSWORD=gitpm +ASANA_CLIENT_ID=442215663457100 +ASANA_CLIENT_SECRET=c33100c2d067d6dd5621daca89699042 diff --git a/.gitignore b/.gitignore index 69bbfd7..0b39ac2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ .DS_Store .env .env.prod + +# Golang Files/Directories +vendor/ +data.db +gitpm-app/gitpm-app diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..9277eb6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,6 @@ +FROM golang:latest + +RUN go get github.com/astaxie/beego && go get github.com/beego/bee + +WORKDIR /go/src/github.com/gitpmio/gitpm/gitpm-app +CMD ["bee", "run"] diff --git a/docker-compose.yml b/docker-compose.yml index eaf21ce..7362607 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,18 +12,13 @@ services: - POSTGRESQL_USERNAME=${DB_USER} - POSTGRESQL_DATABASE=${DB_NAME} restart: always - rabbit: - image: 'bitnami/rabbitmq:latest' - container_name: gitpm-internal-rabbit + gitpm-app: + build: . + container_name: gitpm-internal-gitpm + env_file: .env volumes: - - gitpm-rabbit:/bitnami + - "./gitpm-app:/go/src/github.com/gitpmio/gitpm/gitpm-app" ports: - - "15672:15672" - - "5672:5672" - environment: - - RABBITMQ_USERNAME=${RABBIT_USERNAME} - - RABBITMQ_PASSWORD=${RABBIT_PASSWORD} - restart: always + - "8080:8080" volumes: gitpm-postgres: - gitpm-rabbit: diff --git a/gitpm-app/Gopkg.lock b/gitpm-app/Gopkg.lock new file mode 100644 index 0000000..1b13c19 --- /dev/null +++ b/gitpm-app/Gopkg.lock @@ -0,0 +1,63 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/astaxie/beego" + packages = [".","config","context","context/param","grace","logs","orm","session","toolbox","utils"] + revision = "d96289a81bf67728cff7a19b067aaecc65a62ec6" + version = "v1.9.0" + +[[projects]] + branch = "master" + name = "github.com/google/go-github" + packages = ["github"] + revision = "511f540f1887d30b88cee4a2fcd1f2922754acf4" + +[[projects]] + branch = "master" + name = "github.com/google/go-querystring" + packages = ["query"] + revision = "53e6ce116135b80d037921a7fdd5138cf32d7a8a" + +[[projects]] + branch = "master" + name = "github.com/gopherjs/gopherjs" + packages = ["js"] + revision = "415225646bb92c4449bb484646f2c95a98402f6f" + +[[projects]] + name = "github.com/jtolds/gls" + packages = ["."] + revision = "77f18212c9c7edc9bd6a33d383a7b545ce62f064" + version = "v4.2.1" + +[[projects]] + name = "github.com/mattn/go-sqlite3" + packages = ["."] + revision = "ca5e3819723d8eeaf170ad510e7da1d6d2e94a08" + version = "v1.2.0" + +[[projects]] + name = "github.com/smartystreets/assertions" + packages = [".","internal/go-render/render","internal/oglematchers"] + revision = "ff1918e1e5a13a74014644ae7c1e0ba2f791364d" + version = "1.8.0" + +[[projects]] + name = "github.com/smartystreets/goconvey" + packages = ["convey","convey/gotest","convey/reporting"] + revision = "9e8dc3f972df6c8fcc0375ef492c24d0bb204857" + version = "1.6.3" + +[[projects]] + branch = "master" + name = "golang.org/x/net" + packages = ["context"] + revision = "0a9397675ba34b2845f758fe3cd68828369c6517" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "e9279697282c8f7d8e05ace4c72d0db572acb5d12a70f37a6d2fe481038b4544" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/gitpm-app/Gopkg.toml b/gitpm-app/Gopkg.toml new file mode 100644 index 0000000..f0d2758 --- /dev/null +++ b/gitpm-app/Gopkg.toml @@ -0,0 +1,38 @@ + +# Gopkg.toml example +# +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" + + +[[constraint]] + name = "github.com/astaxie/beego" + version = "1.9.0" + +[[constraint]] + name = "github.com/mattn/go-sqlite3" + version = "1.2.0" + +[[constraint]] + name = "github.com/smartystreets/goconvey" + version = "1.6.3" + +[[constraint]] + branch = "master" + name = "github.com/google/go-github" diff --git a/gitpm-app/conf/app.conf b/gitpm-app/conf/app.conf new file mode 100644 index 0000000..6efc60d --- /dev/null +++ b/gitpm-app/conf/app.conf @@ -0,0 +1,8 @@ +appname = gitpm-app +httpport = 8080 +runmode = dev +copyrequestbody = true + +# asana connect env +ASANA_CLIENT_ID=442215663457100 +ASANA_CLIENT_SECRET=c33100c2d067d6dd5621daca89699042 diff --git a/gitpm-app/controllers/asana.go b/gitpm-app/controllers/asana.go new file mode 100644 index 0000000..edf68f2 --- /dev/null +++ b/gitpm-app/controllers/asana.go @@ -0,0 +1,27 @@ +package controllers + +import ( + "github.com/astaxie/beego" +) + +type AsanaController struct { + beego.Controller +} + +type Webook struct { + Type string `json:"type"` +} + +func (webhook *Webook) processWebhook() bool { + return true +} + +func (asana *AsanaController) RecieveWebook() { + webhook := Webook{ + Type: asana.GetString("type"), + } + processed := webhook.processWebhook() + + asana.Data["json"] = map[string]bool{"success": processed} + asana.ServeJSON() +} diff --git a/gitpm-app/controllers/default.go b/gitpm-app/controllers/default.go new file mode 100644 index 0000000..9a9e6f2 --- /dev/null +++ b/gitpm-app/controllers/default.go @@ -0,0 +1,15 @@ +package controllers + +import ( + "github.com/astaxie/beego" +) + +type MainController struct { + beego.Controller +} + +func (c *MainController) Get() { + c.Data["Website"] = "beego.me" + c.Data["Email"] = "astaxie@gmail.com" + c.TplName = "index.tpl" +} diff --git a/gitpm-app/controllers/github.go b/gitpm-app/controllers/github.go new file mode 100644 index 0000000..e1c13fe --- /dev/null +++ b/gitpm-app/controllers/github.go @@ -0,0 +1,29 @@ +package controllers + +import ( + "context" + + "github.com/astaxie/beego" + "github.com/google/go-github/github" +) + +type GithubController struct { + beego.Controller +} + +type User struct { + Organizations []*github.Organization `json:"username"` +} + +func (this *GithubController) Get() { + username := this.Ctx.Input.Param(":username") + ctx := context.Background() + client := github.NewClient(nil) + // list all organizations for user "willnorris" + orgs, _, _ := client.Organizations.List(ctx, username, nil) + u := User{ + Organizations: orgs, + } + this.Data["json"] = &u + this.ServeJSON() +} diff --git a/gitpm-app/controllers/user.go b/gitpm-app/controllers/user.go new file mode 100644 index 0000000..b595e46 --- /dev/null +++ b/gitpm-app/controllers/user.go @@ -0,0 +1,45 @@ +package controllers + +import ( + "encoding/json" + + "github.com/astaxie/beego" + "github.com/gitpmio/gitpm/gitpm-app/models" +) + +type UserController struct { + beego.Controller +} + +type Response struct { + InsertedId int64 `json:"inserted_id"` + Error string `json:"error"` +} + +func (c *UserController) Get() { + u := models.User{Id: 1} + user := u.Get() + c.Data["json"] = map[string]string{ + "username": user.Username, + } + c.ServeJSON() +} + +func (c *UserController) Post() { + u := models.User{} + err := json.Unmarshal(c.Ctx.Input.RequestBody, &u) + + id, err := u.Save() + + if err != nil { + c.Data["json"] = Response{ + Error: err.Error(), + } + } else { + c.Data["json"] = Response{ + InsertedId: id, + } + } + c.ServeJSON() + +} diff --git a/gitpm-app/main.go b/gitpm-app/main.go new file mode 100644 index 0000000..7d6d43c --- /dev/null +++ b/gitpm-app/main.go @@ -0,0 +1,23 @@ +package main + +import ( + "fmt" + + "github.com/astaxie/beego" + "github.com/astaxie/beego/orm" + _ "github.com/gitpmio/gitpm/gitpm-app/routers" + _ "github.com/mattn/go-sqlite3" // import your required driver +) + +func init() { + orm.RegisterDriver("sqlite3", orm.DRSqlite) + orm.RegisterDataBase("default", "sqlite3", "file:data.db") +} + +func main() { + err := orm.RunSyncdb("default", true, true) + if err != nil { + fmt.Println(err) + } + beego.Run() +} diff --git a/gitpm-app/models/user.go b/gitpm-app/models/user.go new file mode 100644 index 0000000..f82478d --- /dev/null +++ b/gitpm-app/models/user.go @@ -0,0 +1,32 @@ +package models + +import ( + "github.com/astaxie/beego/orm" +) + +type User struct { + Id int + Username string `json:"username,orm:"size(100)"` + Name string `json:"name",orm:"size(100)"` +} + +func init() { + orm.RegisterModel(new(User)) +} + +func (u *User) Save() (id int64, err error) { + o := orm.NewOrm() + insertedId, err := o.Insert(u) + + if err != nil { + return 0, err + } + + return insertedId, nil +} + +func (u *User) Get() *User { + o := orm.NewOrm() + o.Read(u) + return u +} diff --git a/gitpm-app/routers/router.go b/gitpm-app/routers/router.go new file mode 100644 index 0000000..0542975 --- /dev/null +++ b/gitpm-app/routers/router.go @@ -0,0 +1,17 @@ +package routers + +import ( + "github.com/astaxie/beego" + "github.com/gitpmio/gitpm/gitpm-app/controllers" +) + +func init() { + beego.Router("/", &controllers.MainController{}) + beego.Router("/users", &controllers.UserController{}) + + // Asana Routes + beego.Router("/asana/webhook", &controllers.AsanaController{}, "post:RecieveWebook") + + // example github Routes + beego.Router("/github/:username", &controllers.GithubController{}) +} diff --git a/gitpm-app/static/js/reload.min.js b/gitpm-app/static/js/reload.min.js new file mode 100644 index 0000000..e780033 --- /dev/null +++ b/gitpm-app/static/js/reload.min.js @@ -0,0 +1 @@ +function b(a){var c=new WebSocket(a);c.onclose=function(){setTimeout(function(){b(a)},2E3)};c.onmessage=function(){location.reload()}}try{if(window.WebSocket)try{b("ws://localhost:12450/reload")}catch(a){console.error(a)}else console.log("Your browser does not support WebSockets.")}catch(a){console.error("Exception during connecting to Reload:",a)}; diff --git a/gitpm-app/tests/default_test.go b/gitpm-app/tests/default_test.go new file mode 100644 index 0000000..f0860fb --- /dev/null +++ b/gitpm-app/tests/default_test.go @@ -0,0 +1,39 @@ +package test + +import ( + "net/http" + "net/http/httptest" + "testing" + "runtime" + "path/filepath" + _ "github.com/gitpmio/gitpm/gitpm-app/routers" + + "github.com/astaxie/beego" + . "github.com/smartystreets/goconvey/convey" +) + +func init() { + _, file, _, _ := runtime.Caller(1) + apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".." + string(filepath.Separator)))) + beego.TestBeegoInit(apppath) +} + + +// TestBeego is a sample to run an endpoint test +func TestBeego(t *testing.T) { + r, _ := http.NewRequest("GET", "/", nil) + w := httptest.NewRecorder() + beego.BeeApp.Handlers.ServeHTTP(w, r) + + beego.Trace("testing", "TestBeego", "Code[%d]\n%s", w.Code, w.Body.String()) + + Convey("Subject: Test Station Endpoint\n", t, func() { + Convey("Status Code Should Be 200", func() { + So(w.Code, ShouldEqual, 200) + }) + Convey("The Result Should Not Be Empty", func() { + So(w.Body.Len(), ShouldBeGreaterThan, 0) + }) + }) +} + diff --git a/gitpm-app/views/index.tpl b/gitpm-app/views/index.tpl new file mode 100644 index 0000000..8d6fbec --- /dev/null +++ b/gitpm-app/views/index.tpl @@ -0,0 +1,95 @@ + + + +
+