#3290 better code structure and batch minor improvements

1 files changed, 12 insertions, 33 deletions

diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go
index 92e199af84..dfd0b1ddda 100644
--- a/routers/api/v1/repo/label.go
+++ b/routers/api/v1/repo/label.go
@@ -9,14 +9,13 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
 func ListLabels(ctx *context.APIContext) {
 	labels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID)
 	if err != nil {
-		ctx.Error(500, "Labels", err)
+		ctx.Error(500, "GetLabelsByRepoID", err)
 		return
 	}
 
@@ -24,17 +23,16 @@ func ListLabels(ctx *context.APIContext) {
 	for i := range labels {
 		apiLabels[i] = convert.ToLabel(labels[i])
 	}
-
 	ctx.JSON(200, &apiLabels)
 }
 
 func GetLabel(ctx *context.APIContext) {
-	label, err := models.GetLabelByID(ctx.ParamsInt64(":id"))
+	label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if models.IsErrLabelNotExist(err) {
 			ctx.Status(404)
 		} else {
-			ctx.Error(500, "GetLabelByID", err)
+			ctx.Error(500, "GetLabelByRepoID", err)
 		}
 		return
 	}
@@ -42,7 +40,7 @@ func GetLabel(ctx *context.APIContext) {
 	ctx.JSON(200, convert.ToLabel(label))
 }
 
-func CreateLabel(ctx *context.APIContext, form api.LabelOption) {
+func CreateLabel(ctx *context.APIContext, form api.CreateLabelOption) {
 	if !ctx.Repo.IsWriter() {
 		ctx.Status(403)
 		return
@@ -53,43 +51,35 @@ func CreateLabel(ctx *context.APIContext, form api.LabelOption) {
 		Color:  form.Color,
 		RepoID: ctx.Repo.Repository.ID,
 	}
-	err := models.NewLabel(label)
-	if err != nil {
+	if err := models.NewLabel(label); err != nil {
 		ctx.Error(500, "NewLabel", err)
 		return
 	}
-
-	label, err = models.GetLabelByID(label.ID)
-	if err != nil {
-		ctx.Error(500, "GetLabelByID", err)
-		return
-	}
 	ctx.JSON(201, convert.ToLabel(label))
 }
 
-func EditLabel(ctx *context.APIContext, form api.LabelOption) {
+func EditLabel(ctx *context.APIContext, form api.EditLabelOption) {
 	if !ctx.Repo.IsWriter() {
 		ctx.Status(403)
 		return
 	}
 
-	label, err := models.GetLabelByID(ctx.ParamsInt64(":id"))
+	label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if models.IsErrLabelNotExist(err) {
 			ctx.Status(404)
 		} else {
-			ctx.Error(500, "GetLabelByID", err)
+			ctx.Error(500, "GetLabelByRepoID", err)
 		}
 		return
 	}
 
-	if len(form.Name) > 0 {
-		label.Name = form.Name
+	if form.Name != nil {
+		label.Name = *form.Name
 	}
-	if len(form.Color) > 0 {
-		label.Color = form.Color
+	if form.Color != nil {
+		label.Color = *form.Color
 	}
-
 	if err := models.UpdateLabel(label); err != nil {
 		ctx.Handle(500, "UpdateLabel", err)
 		return
@@ -103,21 +93,10 @@ func DeleteLabel(ctx *context.APIContext) {
 		return
 	}
 
-	label, err := models.GetLabelByID(ctx.ParamsInt64(":id"))
-	if err != nil {
-		if models.IsErrLabelNotExist(err) {
-			ctx.Status(404)
-		} else {
-			ctx.Error(500, "GetLabelByID", err)
-		}
-		return
-	}
-
 	if err := models.DeleteLabel(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {
 		ctx.Error(500, "DeleteLabel", err)
 		return
 	}
 
-	log.Trace("Label deleted: %s %s", label.ID, label.Name)
 	ctx.Status(204)
 }