commit 11cefc0d35a829c350e1d3e199c467cf97e96965 Author: Jasper Levin Spahl Date: Fri Jan 21 16:47:06 2022 +0100 initial commit diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..d3f269d --- /dev/null +++ b/go.mod @@ -0,0 +1,5 @@ +module dymatrix.de/jspahl/todo + +go 1.15 + +require github.com/gin-gonic/gin v1.7.7 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..5ee9be1 --- /dev/null +++ b/go.sum @@ -0,0 +1,54 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.7.7 h1:3DoBmSbJbZAWqXJC3SLjAPfutPJJRN1U5pALB7EeTTs= +github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U= +github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/internal/Server/routes.go b/internal/Server/routes.go new file mode 100644 index 0000000..e5d05a1 --- /dev/null +++ b/internal/Server/routes.go @@ -0,0 +1,19 @@ +package server + +import ( + "dymatrix.de/jspahl/todo/internal/api" + "github.com/gin-gonic/gin" +) + +func registerRoutes(router *gin.Engine) { + router.RedirectTrailingSlash = true + + memory := router.Group("/memory") + { + api.RegisterRoutes(memory) + } + sql := router.Group("/sql") + { + api.RegisterRoutes(sql) + } +} diff --git a/internal/Server/server.go b/internal/Server/server.go new file mode 100644 index 0000000..44d2bd0 --- /dev/null +++ b/internal/Server/server.go @@ -0,0 +1,32 @@ +package server + +import ( + "fmt" + "net/http" + + "dymatrix.de/jspahl/todo/internal/config" + + "github.com/gin-gonic/gin" +) + +var httpServer *http.Server +var httpRouter *gin.Engine + +func Setup() { + httpRouter = gin.New() + + httpRouter.Use(gin.Logger()) + registerRoutes(httpRouter) +} + +func ListenAndServe() error { + var err error = nil + for err == nil || err == http.ErrServerClosed { + c := config.GetConfig() + httpServer = &http.Server{ + Handler: httpRouter, + Addr: fmt.Sprintf("%s:%d", c.Listen.Host, c.Listen.Port), + } + } + return err +} diff --git a/internal/api/api.go b/internal/api/api.go new file mode 100644 index 0000000..9a092ed --- /dev/null +++ b/internal/api/api.go @@ -0,0 +1,7 @@ +package api + +import "github.com/gin-gonic/gin" + +func RegisterRoutes(router *gin.RouterGroup) { + +} diff --git a/internal/config/config.go b/internal/config/config.go new file mode 100644 index 0000000..fd0137a --- /dev/null +++ b/internal/config/config.go @@ -0,0 +1,24 @@ +package config + +type ListenConfig struct { + Host string + Port int +} +type Config struct { + Listen ListenConfig +} + +var conf *Config = DefaultConfig() + +func GetConfig() *Config { + return conf +} + +func DefaultConfig() *Config { + return &Config{ + Listen: ListenConfig{ + Host: "0.0.0.0", + Port: 8080, + }, + } +} diff --git a/internal/implementations/MemoryProvider.go b/internal/implementations/MemoryProvider.go new file mode 100644 index 0000000..1db25ac --- /dev/null +++ b/internal/implementations/MemoryProvider.go @@ -0,0 +1,47 @@ +package implementations + +import ( + "errors" + + "dymatrix.de/jspahl/todo/internal/interfaces" +) + +type Item struct { + id int + message string + deleted bool +} + +type User struct { + id int +} + +type MemoryProvider struct { + index int + items []Item + itemsByUsers [][]*Item +} + +func (prov MemoryProvider) CreateItem(item interfaces.IItem) error { + storedItem := Item{id: item.GetId(), message: item.GetMessage(), deleted: false} + prov.items = append(prov.items, storedItem) + return nil +} + +func (prov MemoryProvider) UpdateItem(item interfaces.IItem) error { + storedItem, err := prov.GetItemPtr(item.GetId()) + if err != nil { + return err + } + storedItem.message = item.GetMessage() + return nil +} + +func (prov MemoryProvider) GetItemPtr(id int) (*Item, error) { + for i, item := range prov.items { + if item.id == id && !item.deleted { + return &prov.items[i], nil + } + } + return nil, errors.New("Item not found") +} diff --git a/internal/interfaces/IItem.go b/internal/interfaces/IItem.go new file mode 100644 index 0000000..ff14ec2 --- /dev/null +++ b/internal/interfaces/IItem.go @@ -0,0 +1,6 @@ +package interfaces + +type IItem interface { + GetId() int + GetMessage() string +} diff --git a/internal/interfaces/IPersistentProvider.go b/internal/interfaces/IPersistentProvider.go new file mode 100644 index 0000000..32c7160 --- /dev/null +++ b/internal/interfaces/IPersistentProvider.go @@ -0,0 +1,9 @@ +package interfaces + +type IPersitenceProvider interface { + CreateItem(item IItem) error + UpdateItem(item IItem) error + GetItem(id int) (IItem, error) + GetItemByUser(user IUser) ([]IItem, error) + Link(user IUser, item IItem) error +} diff --git a/internal/interfaces/IUser.go b/internal/interfaces/IUser.go new file mode 100644 index 0000000..2ee8a87 --- /dev/null +++ b/internal/interfaces/IUser.go @@ -0,0 +1,5 @@ +package interfaces + +type IUser interface { + GetId() int +} diff --git a/main.go b/main.go new file mode 100644 index 0000000..630baa2 --- /dev/null +++ b/main.go @@ -0,0 +1,97 @@ +package main + +import ( + "errors" + "log" + + "dymatrix.de/jspahl/todo/internal/server" + + "github.com/gin-gonic/gin" +) + +type ItemDTO struct { + id int + message string +} + +func (prov MemoryProvider) UpdateItem(item Item) error { + storedItem, err := prov.GetItemPtr(item.id) + if err != nil { + return err + } + storedItem.message = item.message + return nil +} +func (prov MemoryProvider) GetItemPtr(id int) (*Item, error) { + for i, item := range prov.items { + if item.id == id && !item.deleted { + return &prov.items[i], nil + } + } + return nil, errors.New("Item not found") + +} +func (prov MemoryProvider) GetItem(id int) (Item, error) { + item, err := prov.GetItemPtr(id) + return *item, err + +} +func (prov MemoryProvider) GetItemByUser(user User) ([]Item, error) { + var items []Item + for i := range prov.itemsByUsers[user.id] { + items = append(items, *prov.itemsByUsers[user.id][i]) + } + if len(items) == 0 { + return items, errors.New("no items for user " + user.toString()) + } + return items, nil +} +func (prov MemoryProvider) GetAllItems() []Item { + var items []Item + for _, item := range prov.items { + if !item.deleted { + items = append(items, item) + } + } + return items +} + +func (prov MemoryProvider) Link(user User, item Item) error { + storedItem, err := prov.GetItemPtr(item.id) + if err != nil { + return err + } + prov.itemsByUsers[user.id] = append(prov.itemsByUsers[user.id], storedItem) + return nil +} + +//func main() { +// var prov = MemoryProvider{} +// rItems := router.Group("/item") +// { +// rItems.GET("/:id", func(c *gin.Context) { +// id, err := strconv.Atoi(c.Param("id")) +// if err != nil { +// c.String(http.StatusNotFound, err.Error()) +// } +// item, err := prov.GetItem(id) +// if err != nil { +// c.String(http.StatusNotFound, err.Error()) +// } +// c.JSON(http.StatusOK, item.toDto()) +// }) +// rItems.POST("/", func(c *gin.Context) { +// +// }) +// } +// router.Run() +// +//} + +func main() { + gin.SetMode(gin.ReleaseMode) + + server.Setup() + err := server.ListenAndServe() + log.Fatalf("http: webserver closed unexpected: %s", err) +}