diff --git a/app.go b/app.go new file mode 100644 index 0000000..b7051ec --- /dev/null +++ b/app.go @@ -0,0 +1,70 @@ +package main + +import ( + "encoding/json" + "log" + "net/http" + + "github.com/google/uuid" + "github.com/gorilla/mux" + "github.com/jinzhu/gorm" + _ "github.com/jinzhu/gorm/dialects/postgres" +) + +type Besucher struct { + ID string `json:"id"` + Name string `json:"name"` + Message string `json:"message"` + Come bool `json:"come"` +} + +type App struct { + db *gorm.DB + r *mux.Router +} + +func (a *App) start() { + a.db.AutoMigrate() + + a.r.HandleFunc("/besucher", a.getAllBesucher).Methods("GET") + a.r.HandleFunc("/besucher", a.addBesucher).Methods("POST") + log.Fatal(http.ListenAndServe(":3001", a.r)) +} + +func (a *App) getAllBesucher(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json") + var all []Besucher + err := a.db.Find(&all).Error + if err != nil { + sendErr(w, http.StatusInternalServerError, err.Error()) + return + } + err = json.NewEncoder(w).Encode(all) + if err != nil { + sendErr(w, http.StatusInternalServerError, err.Error()) + } + +} + +func (a *App) addBesucher(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json") + var s Besucher + err := json.NewDecoder(r.Body).Decode(&s) + if err != nil { + sendErr(w, http.StatusBadRequest, err.Error()) + return + } + s.ID = uuid.New().String() + err = a.db.Save(&s).Error + if err != nil { + sendErr(w, http.StatusInternalServerError, err.Error()) + + } else { + w.WriteHeader(http.StatusCreated) + } +} + +func sendErr(w http.ResponseWriter, code int, message string) { + resp, _ := json.Marshal(map[string]string{"error": message}) + http.Error(w, string(resp), code) +} diff --git a/go.mod b/go.mod index e11deba..41cc740 100644 --- a/go.mod +++ b/go.mod @@ -3,25 +3,13 @@ module git.cosysda.de/HuskyTeufel/Hochzeit go 1.17 require ( - github.com/auth0-community/go-auth0 v1.0.0 - github.com/gin-gonic/gin v1.7.7 - github.com/rs/xid v1.3.0 - gopkg.in/square/go-jose.v2 v2.1.7 + github.com/google/uuid v1.3.0 + github.com/gorilla/mux v1.8.0 + github.com/jinzhu/gorm v1.9.16 ) require ( - github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-playground/locales v0.13.0 // indirect - github.com/go-playground/universal-translator v0.17.0 // indirect - github.com/go-playground/validator/v10 v10.4.1 // indirect - github.com/golang/protobuf v1.3.3 // indirect - github.com/json-iterator/go v1.1.9 // indirect - github.com/leodido/go-urn v1.2.0 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect - github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect - github.com/ugorji/go/codec v1.1.7 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/lib/pq v1.1.1 // indirect golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect - golang.org/x/sys v0.0.0-20200116001909-b77594299b42 // indirect - gopkg.in/yaml.v2 v2.2.8 // indirect ) diff --git a/go.sum b/go.sum index 34401fa..9194cd2 100644 --- a/go.sum +++ b/go.sum @@ -1,61 +1,37 @@ -github.com/auth0-community/go-auth0 v1.0.0 h1:TqtR/xVM4E6QYXNNaZw8BdExJT1xgRF7Dgsppje+of4= -github.com/auth0-community/go-auth0 v1.0.0/go.mod h1:cZi/9yvenqQHYLu2FOqOp/8OmP0PYyWJmD3ojOmQGYQ= -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/rs/xid v1.3.0 h1:6NjYksEUlhurdVehpc7S7dk6DAmcKv8V9gG0FsVN2U4= -github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -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-20180802221240-56440b844dfe/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= +github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= +github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA= +github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 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-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= 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/sys v0.0.0-20200323222414-85ca7c5b95cd/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/square/go-jose.v2 v2.1.7 h1:4m8fIwX7Xdw2WlFiPJtcVCDX6ELrIdpHnRmE6Uqmktk= -gopkg.in/square/go-jose.v2 v2.1.7/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -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/handlers/handlers.go b/handlers/handlers.go deleted file mode 100644 index 14bdae2..0000000 --- a/handlers/handlers.go +++ /dev/null @@ -1,51 +0,0 @@ -package handlers - -import ( - "encoding/json" - "io" - "io/ioutil" - "net/http" - - "git.cosysda.de/HuskyTeufel/Hochzeit/planner" - "github.com/gin-gonic/gin" -) - -func GetBesucherListHandler(c *gin.Context) { - c.JSON(http.StatusOK, planner.Get()) -} - -func AddBesucherHandler(c *gin.Context) { - besucherItem, statusCode, err := convertHTTPBodyToBesucher(c.Request.Body) - if err != nil { - c.JSON(statusCode, err) - return - } - - c.JSON(statusCode, gin.H{"id": planner.Add(besucherItem)}) -} - -func DeleteBesucherHandler(c *gin.Context) { - -} - -func ComeBesucherHandler(c *gin.Context) { - -} - -func convertHTTPBodyToBesucher(httpBody io.ReadCloser) (planner.Besucher, int, error) { - body, err := ioutil.ReadAll(httpBody) - if err != nil { - return planner.Besucher{}, http.StatusInternalServerError, err - } - defer httpBody.Close() - return convertJSONBodyToBesucher(body) -} - -func convertJSONBodyToBesucher(jsonBody []byte) (planner.Besucher, int, error) { - var besucherItem planner.Besucher - err := json.Unmarshal(jsonBody, &besucherItem) - if err != nil { - return planner.Besucher{}, http.StatusBadRequest, err - } - return besucherItem, http.StatusOK, nil -} diff --git a/main.go b/main.go index a1fb47a..621f177 100644 --- a/main.go +++ b/main.go @@ -1,88 +1,24 @@ package main import ( - "fmt" - "path" - "path/filepath" + "os" - "git.cosysda.de/HuskyTeufel/Hochzeit/handlers" - "github.com/gin-gonic/gin" -) - -var ( -//audience string -//domain string + "github.com/gorilla/mux" + "github.com/jinzhu/gorm" ) func main() { - //setAuth0Variables() - fmt.Println("Hallo") - r := gin.Default() - r.Use(CORSMiddleware()) - r.NoRoute((func(c *gin.Context) { - dir, file := path.Split(c.Request.RequestURI) - ext := filepath.Ext(file) - if file == "" || ext == "" { - c.File("./ui/dist/ui/index.html") - } else { - c.File("./ui/dist/ui/" + path.Join(dir, file)) - } - })) - - - //authorized := r.Group("/") - //authorized.Use(authRequired()) - r.GET("/besucher", handlers.GetBesucherListHandler) - r.POST("/besucher", handlers.AddBesucherHandler) - r.DELETE("/besucher/:id", handlers.DeleteBesucherHandler) - r.PUT("/besucher", handlers.ComeBesucherHandler) - - err := r.Run(":3001") + pass := os.Getenv("DB_PASS") + db, err := gorm.Open( + "postgres", + "host=besucher-db user=go password="+pass+" dbname=go sslmode=disable") if err != nil { - panic(err) + panic(err.Error()) } -} - -func CORSMiddleware() gin.HandlerFunc { - return func(c *gin.Context) { - c.Writer.Header().Set("Access-Control-Allow-Origin", "*") - c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") - c.Writer.Header().Set("Access-Control-Allow-Methods", "DELETE, GET, OPTIONS, POST, PUT") - - if c.Request.Method == "OPTIONS" { - c.AbortWithStatus(204) - return - } - c.Next() + app := App{ + db: db, + r: mux.NewRouter(), } + app.start() } - -/*func setAuth0Variables() { - audience = "https://hochzeit-api" //os.Getenv("AUTH0_API_IDENTIFIER") - domain = "dev-uzlaiuax.eu.auth0.com/" //os.Getenv("AUTH0_DOMAIN") -} - -func authRequired() gin.HandlerFunc { - return func(c *gin.Context) { - var auth0Domain = "https://" + domain + "/" - client := auth0.NewJWKClient(auth0.JWKClientOptions{URI: auth0Domain + ".well-known/jwks.json"}, nil) - configuration := auth0.NewConfiguration(client, []string{audience}, auth0Domain, jose.RS256) - validator := auth0.NewValidator(configuration, nil) - - _, err := validator.ValidateRequest(c.Request) - if err != nil { - log.Println(err) - terminateWithError(http.StatusUnauthorized, "token is not valid", c) - return - } - c.Next() - } -} - -*/ -func terminateWithError(statusCode int, message string, c *gin.Context) { - c.JSON(statusCode, gin.H{"error": message}) - c.Abort() -} - diff --git a/planner/besucher.go b/planner/besucher.go deleted file mode 100644 index 70b7e1f..0000000 --- a/planner/besucher.go +++ /dev/null @@ -1,8 +0,0 @@ -package planner - -type Besucher struct { - ID string `json:"id"` - Name string `json:"name"` - Message string `json:"message"` - Come bool `json:"come"` -} diff --git a/planner/planner.go b/planner/planner.go deleted file mode 100644 index b0c9f97..0000000 --- a/planner/planner.go +++ /dev/null @@ -1,76 +0,0 @@ -package planner - -import ( - "errors" - "sync" - - "github.com/rs/xid" -) - -var ( - list []Besucher - mtx sync.RWMutex - once sync.Once -) - -func init() { - once.Do(initialiseList) -} - -func initialiseList() { - list = []Besucher{} -} - -// Get retrieves all elements from the Besucher list -func Get() []Besucher { - return list -} - -// Add will add a new Besucher -func Add(newClient Besucher) string { - t := newBesucher(newClient) - mtx.Lock() - list = append(list, t) - mtx.Unlock() - return t.ID -} - -// Delete will remove a Besucher from the Besucher list -func Delete(id string) error { - location, err := findBesucherLocation(id) - if err != nil { - return err - } - removeElementByLocation(location) - return nil -} - -func removeElementByLocation(i int) { - mtx.Lock() - list = append(list[:i], list[i+1:]...) - mtx.Unlock() -} - -func findBesucherLocation(id string) (int, error) { - mtx.RLock() - defer mtx.RUnlock() - for i, t := range list { - if isMatchingID(t.ID, id) { - return i, nil - } - } - return 0, errors.New("Could not find Besucher based on id") -} - -func isMatchingID(a, b string) bool { - return a == b -} - -func newBesucher(newBesucher Besucher) Besucher { - return Besucher{ - ID: xid.New().String(), - Name: newBesucher.Name, - Message: newBesucher.Message, - Come: newBesucher.Come, - } -}