From 9e9ca66467116e9079a2639c00e9e623aca23015 Mon Sep 17 00:00:00 2001
From: ᴜɴᴋɴᴡᴏɴ <u@gogs.io>
Date: Mon, 16 Mar 2020 01:22:27 +0800
Subject: refactor: unify error handling in routing layer

---
 internal/context/org.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'internal/context/org.go')

diff --git a/internal/context/org.go b/internal/context/org.go
index 02e154ca..6ed35835 100644
--- a/internal/context/org.go
+++ b/internal/context/org.go
@@ -11,7 +11,6 @@ import (
 
 	"gogs.io/gogs/internal/conf"
 	"gogs.io/gogs/internal/db"
-	"gogs.io/gogs/internal/db/errors"
 )
 
 type Organization struct {
@@ -50,7 +49,7 @@ func HandleOrgAssignment(c *Context, args ...bool) {
 	var err error
 	c.Org.Organization, err = db.GetUserByName(orgName)
 	if err != nil {
-		c.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
+		c.NotFoundOrError(err, "get organization by name")
 		return
 	}
 	org := c.Org.Organization
@@ -85,7 +84,7 @@ func HandleOrgAssignment(c *Context, args ...bool) {
 	}
 	if (requireMember && !c.Org.IsMember) ||
 		(requireOwner && !c.Org.IsOwner) {
-		c.Handle(404, "OrgAssignment", err)
+		c.NotFound()
 		return
 	}
 	c.Data["IsOrganizationOwner"] = c.Org.IsOwner
@@ -98,13 +97,13 @@ func HandleOrgAssignment(c *Context, args ...bool) {
 	if c.Org.IsMember {
 		if c.Org.IsOwner {
 			if err := org.GetTeams(); err != nil {
-				c.Handle(500, "GetTeams", err)
+				c.Error(err, "get teams")
 				return
 			}
 		} else {
 			org.Teams, err = org.GetUserTeams(c.User.ID)
 			if err != nil {
-				c.Handle(500, "GetUserTeams", err)
+				c.Error(err, "get user teams")
 				return
 			}
 		}
@@ -124,20 +123,20 @@ func HandleOrgAssignment(c *Context, args ...bool) {
 		}
 
 		if !teamExists {
-			c.Handle(404, "OrgAssignment", err)
+			c.NotFound()
 			return
 		}
 
 		c.Data["IsTeamMember"] = c.Org.IsTeamMember
 		if requireTeamMember && !c.Org.IsTeamMember {
-			c.Handle(404, "OrgAssignment", err)
+			c.NotFound()
 			return
 		}
 
 		c.Org.IsTeamAdmin = c.Org.Team.IsOwnerTeam() || c.Org.Team.Authorize >= db.ACCESS_MODE_ADMIN
 		c.Data["IsTeamAdmin"] = c.Org.IsTeamAdmin
 		if requireTeamAdmin && !c.Org.IsTeamAdmin {
-			c.Handle(404, "OrgAssignment", err)
+			c.NotFound()
 			return
 		}
 	}
-- 
cgit v1.2.3