ami/tl-vikunja
1
0
Fork 0
Code Activity

Fixed lint + fmt

Browse Source
This commit is contained in:
konrad
2018-07-10 14:02:23 +02:00
committed by kolaente
parent c8622b0029
commit 237874eda6
25 changed files with 94 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
routes/api/v1/item_delete.go
View File

@ -7,6 +7,7 @@ import (
"strconv"
)
// DeleteListItemByIDtemByID is the web handler to delete a list item
func DeleteListItemByIDtemByID(c echo.Context) error {
// swagger:operation DELETE /item/{itemID} lists deleteListItem
// ---

1
routes/api/v1/list_by_namespace.go
View File

@ -6,6 +6,7 @@ import (
"net/http"
)
// GetListsByNamespaceID is the web handler to delete a namespace
func GetListsByNamespaceID(c echo.Context) error {
// swagger:operation GET /namespaces/{namespaceID}/lists namespaces getListsByNamespace
// ---

53
routes/api/v1/list_delete.go
View File

@ -1,13 +1,14 @@
package v1
import (
// "git.kolaente.de/konrad/list/models"
// "git.kolaente.de/konrad/list/models"
"github.com/labstack/echo"
// "net/http"
// "strconv"
// "net/http"
// "strconv"
"net/http"
)
// DeleteListByID ...
func DeleteListByID(c echo.Context) error {
// swagger:operation DELETE /lists/{listID} lists deleteList
// ---
@ -35,34 +36,34 @@ func DeleteListByID(c echo.Context) error {
// "$ref": "#/responses/Message"
/*
// Check if we have our ID
id := c.Param("id")
// Make int
itemID, err := strconv.ParseInt(id, 10, 64)
if err != nil {
return c.JSON(http.StatusBadRequest, models.Message{"Invalid ID."})
}
// Check if the user has the right to delete that list
user, err := models.GetCurrentUser(c)
if err != nil {
return c.JSON(http.StatusInternalServerError, models.Message{"An error occured."})
}
// err = models.DeleteListByID(itemID, &user)
if err != nil {
if models.IsErrNeedToBeListAdmin(err) {
return c.JSON(http.StatusForbidden, models.Message{"You need to be the list owner to delete a list."})
// Check if we have our ID
id := c.Param("id")
// Make int
itemID, err := strconv.ParseInt(id, 10, 64)
if err != nil {
return c.JSON(http.StatusBadRequest, models.Message{"Invalid ID."})
}
if models.IsErrListDoesNotExist(err) {
return c.JSON(http.StatusNotFound, models.Message{"This list does not exist."})
// Check if the user has the right to delete that list
user, err := models.GetCurrentUser(c)
if err != nil {
return c.JSON(http.StatusInternalServerError, models.Message{"An error occured."})
}
return c.JSON(http.StatusInternalServerError, models.Message{"An error occured."})
}
// err = models.DeleteListByID(itemID, &user)
if err != nil {
if models.IsErrNeedToBeListAdmin(err) {
return c.JSON(http.StatusForbidden, models.Message{"You need to be the list owner to delete a list."})
}
return c.JSON(http.StatusOK, models.Message{"The list was deleted with success."})
if models.IsErrListDoesNotExist(err) {
return c.JSON(http.StatusNotFound, models.Message{"This list does not exist."})
}
return c.JSON(http.StatusInternalServerError, models.Message{"An error occured."})
}
return c.JSON(http.StatusOK, models.Message{"The list was deleted with success."})
*/
return echo.NewHTTPError(http.StatusNotImplemented)

2
routes/api/v1/list_item_add_update.go
View File

@ -7,6 +7,7 @@ import (
"strconv"
)
// AddListItem ...
func AddListItem(c echo.Context) error {
// swagger:operation PUT /lists/{listID} lists addListItem
// ---
@ -46,6 +47,7 @@ func AddListItem(c echo.Context) error {
return updateOrCreateListItemHelper(listID, 0, c)
}
// UpdateListItem ...
func UpdateListItem(c echo.Context) error {
// swagger:operation PUT /item/{itemID} lists updateListItem
// ---

2
routes/api/v1/lists_add_update.go
View File

@ -6,6 +6,7 @@ import (
"net/http"
)
// AddList ...
func AddList(c echo.Context) error {
// swagger:operation PUT /namespaces/{namespaceID}/lists lists addList
// ---
@ -86,6 +87,7 @@ func AddList(c echo.Context) error {
return c.JSON(http.StatusOK, list)
}
// UpdateList ...
func UpdateList(c echo.Context) error {
// swagger:operation POST /lists/{listID} lists upadteList
// ---

2
routes/api/v1/namespace_add_update.go
View File

@ -7,6 +7,7 @@ import (
"strconv"
)
// AddNamespace ...
func AddNamespace(c echo.Context) error {
// swagger:operation PUT /namespaces namespaces addNamespace
// ---
@ -33,6 +34,7 @@ func AddNamespace(c echo.Context) error {
return addOrUpdateNamespace(c)
}
// UpdateNamespace ...
func UpdateNamespace(c echo.Context) error {
// swagger:operation POST /namespaces/{namespaceID} namespaces upadteNamespace
// ---

1
routes/api/v1/namespace_delete.go
View File

@ -7,6 +7,7 @@ import (
"strconv"
)
// DeleteNamespaceByID ...
func DeleteNamespaceByID(c echo.Context) error {
// swagger:operation DELETE /namespaces/{namespaceID} namespaces deleteNamespace
// ---

1
routes/api/v1/namespace_show.go
View File

@ -7,6 +7,7 @@ import (
"strconv"
)
// ShowNamespace ...
func ShowNamespace(c echo.Context) error {
// swagger:operation GET /namespaces/{namespaceID} namespaces getNamespace
// ---

1
routes/api/v1/namespaces_list.go
View File

@ -6,6 +6,7 @@ import (
"net/http"
)
// GetAllNamespacesByCurrentUser ...
func GetAllNamespacesByCurrentUser(c echo.Context) error {
// swagger:operation GET /namespaces namespaces getNamespaces
// ---

2
routes/api/v1/swagger/options.go
View File

@ -12,7 +12,7 @@ type swaggerParameterBodies struct {
UserLogin models.UserLogin
// in:body
ApiUserPassword models.ApiUserPassword
APIUserPassword models.APIUserPassword
// in:body
List models.List

5
routes/api/v1/user_add_update.go
View File

@ -7,6 +7,7 @@ import (
"strconv"
)
// RegisterUser ...
func RegisterUser(c echo.Context) error {
// swagger:operation POST /register user register
@ -20,7 +21,7 @@ func RegisterUser(c echo.Context) error {
// - name: body
// in: body
// schema:
// "$ref": "#/definitions/ApiUserPassword"
// "$ref": "#/definitions/APIUserPassword"
// responses:
// "200":
// "$ref": "#/responses/User"
@ -38,7 +39,7 @@ func userAddOrUpdate(c echo.Context) error {
// TODO: prevent everyone from updating users
// Check for Request Content
var datUser *models.ApiUserPassword
var datUser *models.APIUserPassword
if err := c.Bind(&datUser); err != nil {
return c.JSON(http.StatusBadRequest, models.Message{"No user model provided."})

23
routes/CRUD/CRUD_helper.go → routes/crud/helper.go
View File

@ -1,4 +1,4 @@
package CRUD
package crud
import (
"fmt"
@ -7,16 +7,17 @@ import (
"net/http"
)
// WebHandler defines the webhandler object
// This does web stuff, aka returns json etc. Uses CRUDable Methods to get the data
type CRUDWebHandler struct {
CObject interface{
type WebHandler struct {
CObject interface {
models.CRUDable
models.Rights
}
}
// This does json, handles the request
func (c *CRUDWebHandler) ReadOneWeb(ctx echo.Context) error {
// ReadOneWeb is the webhandler to get one object
func (c *WebHandler) ReadOneWeb(ctx echo.Context) error {
// Get the ID
id, err := models.GetIntURLParam("id", ctx)
@ -39,8 +40,8 @@ func (c *CRUDWebHandler) ReadOneWeb(ctx echo.Context) error {
return ctx.JSON(http.StatusOK, c.CObject)
}
// ReadAllWeb returns all elements of a type
func (c *CRUDWebHandler) ReadAllWeb(ctx echo.Context) error {
// ReadAllWeb is the webhandler to get all objects of a type
func (c *WebHandler) ReadAllWeb(ctx echo.Context) error {
currentUser, err := models.GetCurrentUser(ctx)
if err != nil {
return ctx.JSON(http.StatusInternalServerError, models.Message{"Could not determine the current user."})
@ -56,7 +57,7 @@ func (c *CRUDWebHandler) ReadAllWeb(ctx echo.Context) error {
}
// UpdateWeb is the webhandler to update an object
func (c *CRUDWebHandler) UpdateWeb(ctx echo.Context) error {
func (c *WebHandler) UpdateWeb(ctx echo.Context) error {
// Get the object
if err := ctx.Bind(&c.CObject); err != nil {
return ctx.JSON(http.StatusBadRequest, models.Message{"No model provided."})
@ -88,7 +89,7 @@ func (c *CRUDWebHandler) UpdateWeb(ctx echo.Context) error {
}
// CreateWeb is the handler to create an object
func (c *CRUDWebHandler) CreateWeb(ctx echo.Context) error {
func (c *WebHandler) CreateWeb(ctx echo.Context) error {
// Get the object
if err := ctx.Bind(&c.CObject); err != nil {
return ctx.JSON(http.StatusBadRequest, models.Message{"No model provided."})
@ -111,7 +112,7 @@ func (c *CRUDWebHandler) CreateWeb(ctx echo.Context) error {
}
// DeleteWeb is the web handler to delete something
func (c *CRUDWebHandler) DeleteWeb(ctx echo.Context) error {
func (c *WebHandler) DeleteWeb(ctx echo.Context) error {
// Get the ID
id, err := models.GetIntURLParam("id", ctx)
if err != nil {
@ -138,4 +139,4 @@ func (c *CRUDWebHandler) DeleteWeb(ctx echo.Context) error {
}
return ctx.JSON(http.StatusOK, models.Message{"Successfully deleted."})
}
}

8
routes/routes.go
View File

@ -1,3 +1,5 @@
package routes
// Package v1 List API.
//
// This documentation describes the List API.
@ -23,14 +25,13 @@
// in: header
//
// swagger:meta
package routes
import (
"github.com/labstack/echo"
"github.com/labstack/echo/middleware"
"git.kolaente.de/konrad/list/models"
CRUD "git.kolaente.de/konrad/list/routes/CRUD"
crud "git.kolaente.de/konrad/list/routes/crud"
apiv1 "git.kolaente.de/konrad/list/routes/api/v1"
_ "git.kolaente.de/konrad/list/routes/api/v1/swagger" // for docs generation
)
@ -50,7 +51,6 @@ func NewEcho() *echo.Echo {
// RegisterRoutes registers all routes for the application
func RegisterRoutes(e *echo.Echo) {
// TODO: Use proper cors middleware by echo
// Middleware for cors
@ -87,7 +87,7 @@ func RegisterRoutes(e *echo.Echo) {
a.Use(middleware.JWT(models.Config.JWTLoginSecret))
a.POST("/tokenTest", apiv1.CheckToken)
listHandler := &CRUD.CRUDWebHandler{
listHandler := &crud.WebHandler{
CObject: &models.List{},
}
a.GET("/lists", listHandler.ReadAllWeb)