From ccfd6789ca1f9ae0ea6b9927cc45813d795c5ad9 Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Wed, 13 Mar 2019 16:32:59 +0100
Subject: [PATCH] teams: cleanup.

---
 pkg/models/team_member.go               | 18 +++++++++---------
 pkg/services/teamguardian/team.go       |  2 +-
 pkg/services/teamguardian/teams_test.go |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkg/models/team_member.go b/pkg/models/team_member.go
index 6d0ae7793b3..c9afd4cd75f 100644
--- a/pkg/models/team_member.go
+++ b/pkg/models/team_member.go
@@ -64,13 +64,13 @@ type GetTeamMembersQuery struct {
 // Projections and DTOs
 
 type TeamMemberDTO struct {
-	OrgId      int64    `json:"orgId"`
-	TeamId     int64    `json:"teamId"`
-	UserId     int64    `json:"userId"`
-	External   bool     `json:"-"`
-	Email      string   `json:"email"`
-	Login      string   `json:"login"`
-	AvatarUrl  string   `json:"avatarUrl"`
-	Labels     []string `json:"labels"`
-	Permission int64    `json:"permission"`
+	OrgId      int64          `json:"orgId"`
+	TeamId     int64          `json:"teamId"`
+	UserId     int64          `json:"userId"`
+	External   bool           `json:"-"`
+	Email      string         `json:"email"`
+	Login      string         `json:"login"`
+	AvatarUrl  string         `json:"avatarUrl"`
+	Labels     []string       `json:"labels"`
+	Permission PermissionType `json:"permission"`
 }
diff --git a/pkg/services/teamguardian/team.go b/pkg/services/teamguardian/team.go
index 9946ae7c734..6fddc318f5e 100644
--- a/pkg/services/teamguardian/team.go
+++ b/pkg/services/teamguardian/team.go
@@ -25,7 +25,7 @@ func CanAdmin(orgId int64, teamId int64, user *m.SignedInUser) error {
 	}
 
 	for _, member := range cmd.Result {
-		if member.UserId == user.UserId && member.Permission == int64(m.PERMISSION_ADMIN) {
+		if member.UserId == user.UserId && member.Permission == m.PERMISSION_ADMIN {
 			return nil
 		}
 	}
diff --git a/pkg/services/teamguardian/teams_test.go b/pkg/services/teamguardian/teams_test.go
index 9b1ba7ee4cb..2ec86769a29 100644
--- a/pkg/services/teamguardian/teams_test.go
+++ b/pkg/services/teamguardian/teams_test.go
@@ -45,7 +45,7 @@ func TestUpdateTeam(t *testing.T) {
 						OrgId:      testTeam.OrgId,
 						TeamId:     testTeam.Id,
 						UserId:     editor.UserId,
-						Permission: int64(m.PERMISSION_ADMIN),
+						Permission: m.PERMISSION_ADMIN,
 					}}
 					return nil
 				})
@@ -67,7 +67,7 @@ func TestUpdateTeam(t *testing.T) {
 						OrgId:      testTeamOtherOrg.OrgId,
 						TeamId:     testTeamOtherOrg.Id,
 						UserId:     editor.UserId,
-						Permission: int64(m.PERMISSION_ADMIN),
+						Permission: m.PERMISSION_ADMIN,
 					}}
 					return nil
 				})