ami/tl-vikunja
1
0
Fork 0
Code Activity

Refactor GetUser & GetUserByID

Browse Source
This commit is contained in:
konrad
2018-08-30 19:14:02 +02:00
committed by kolaente
parent aeb1521cc4
commit 478c98fb8d
26 changed files with 69 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,9 +58,14 @@ func userAddOrUpdate(c echo.Context) error {
}
// Check if the user exists
_, exists, err := models.GetUserByID(datUser.ID)
var exists bool
_, err := models.GetUserByID(datUser.ID)
if err != nil {
return c.JSON(http.StatusInternalServerError, models.Message{"Could not check if the user exists."})
if models.IsErrUserDoesNotExist(err) {
exists = true
} else {
return c.JSON(http.StatusInternalServerError, models.Message{"Could not check if the user exists."})
}
}
// Insert or update the user

9
routes/api/v1/user_delete.go
View File

@ -22,16 +22,15 @@ func UserDelete(c echo.Context) error {
}
// Check if the user exists
_, exists, err := models.GetUserByID(userID)
_, err = models.GetUserByID(userID)
if err != nil {
if models.IsErrUserDoesNotExist(err) {
return c.JSON(http.StatusNotFound, models.Message{"The user does not exist."})
}
return c.JSON(http.StatusInternalServerError, models.Message{"Could not get user."})
}
if !exists {
return c.JSON(http.StatusNotFound, models.Message{"The user does not exist."})
}
// Get the doer options
doer, err := models.GetCurrentUser(c)
if err != nil {

10
routes/api/v1/user_show.go
View File

@ -25,17 +25,15 @@ func UserShow(c echo.Context) error {
}
// Get User Infos
userInfos, exists, err := models.GetUserByID(userID)
userInfos, err := models.GetUserByID(userID)
if err != nil {
if models.IsErrUserDoesNotExist(err) {
return c.JSON(http.StatusNotFound, models.Message{"The user does not exist."})
}
return c.JSON(http.StatusInternalServerError, models.Message{"Error getting user infos."})
}
// Check if it exists
if !exists {
return c.JSON(http.StatusNotFound, models.Message{"User not found."})
}
// Obfucate his password
userInfos.Password = ""

10
routes/api/v1/user_update_password.go
View File

@ -49,17 +49,15 @@ func UserChangePassword(c echo.Context) error {
}
// Get User Infos
_, exists, err := models.GetUserByID(userID)
_, err = models.GetUserByID(userID)
if err != nil {
if models.IsErrUserDoesNotExist(err) {
return c.JSON(http.StatusNotFound, models.Message{"The user does not exist."})
}
return c.JSON(http.StatusInternalServerError, models.Message{"Error getting user infos."})
}
// Check if it exists
if !exists {
return c.JSON(http.StatusNotFound, models.Message{"User not found."})
}
// Get the doer options
doer, err := models.GetCurrentUser(c)
if err != nil {