From fea23604c3e6a13fed8f4f24a7b008b753048314 Mon Sep 17 00:00:00 2001 From: kolaente Date: Fri, 1 Dec 2023 15:55:56 +0100 Subject: [PATCH] chore: refactor --- pkg/models/team_members.go | 5 ++--- pkg/modules/auth/openid/openid.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/models/team_members.go b/pkg/models/team_members.go index 9bcd064268..a06cf83db5 100644 --- a/pkg/models/team_members.go +++ b/pkg/models/team_members.go @@ -108,11 +108,10 @@ func (tm *TeamMember) Delete(s *xorm.Session, _ web.Auth) (err error) { return } -func (tm *TeamMember) CheckMembership(s *xorm.Session) (exists bool, err error) { - exists, err = s. +func (tm *TeamMember) MembershipExists(s *xorm.Session) (exists bool, err error) { + return s. Where("team_id = ? AND user_id = ?", tm.TeamID, tm.UserID). Exist(&TeamMember{}) - return exists, err } // Update toggles a team member's admin status diff --git a/pkg/modules/auth/openid/openid.go b/pkg/modules/auth/openid/openid.go index fbcfa5f73c..5f37f5c528 100644 --- a/pkg/modules/auth/openid/openid.go +++ b/pkg/modules/auth/openid/openid.go @@ -254,7 +254,7 @@ func AssignOrCreateUserToTeams(s *xorm.Session, u *user.User, teamData []models. } for _, team := range teams { tm := models.TeamMember{TeamID: team.ID, UserID: u.ID, Username: u.Username} - exists, _ := tm.CheckMembership(s) + exists, _ := tm.MembershipExists(s) if !exists { err = tm.Create(s, u) if err != nil {