teams: refactor.

pkg/services/sqlstore/team.go

@@ -255,18 +255,27 @@ func AddTeamMember(cmd *m.AddTeamMemberCommand) error {
 	})
 	})
 }
 }
 
 
-// UpdateTeamMember updates a team member
-func UpdateTeamMember(cmd *m.UpdateTeamMemberCommand) error {
-	return inTransaction(func(sess *DBSession) error {
+func getTeamMember(sess *DBSession, orgId int64, teamId int64, userId int64) (m.TeamMember, error) {
 	rawSql := `SELECT * FROM team_member WHERE org_id=? and team_id=? and user_id=?`
 	rawSql := `SELECT * FROM team_member WHERE org_id=? and team_id=? and user_id=?`
 	var member m.TeamMember
 	var member m.TeamMember
-		exists, err := sess.SQL(rawSql, cmd.OrgId, cmd.TeamId, cmd.UserId).Get(&member)
+	exists, err := sess.SQL(rawSql, orgId, teamId, userId).Get(&member)
 
 
 	if err != nil {
 	if err != nil {
-			return err
+		return member, err
 	}
 	}
 	if !exists {
 	if !exists {
-			return m.ErrTeamMemberNotFound
+		return member, m.ErrTeamMemberNotFound
+	}
+
+	return member, nil
+}
+
+// UpdateTeamMember updates a team member
+func UpdateTeamMember(cmd *m.UpdateTeamMemberCommand) error {
+	return inTransaction(func(sess *DBSession) error {
+		member, err := getTeamMember(sess, cmd.OrgId, cmd.TeamId, cmd.UserId)
+		if err != nil {
+			return err
 		}
 		}
 
 
 		if cmd.ProtectLastAdmin {
 		if cmd.ProtectLastAdmin {