From b1094ff28c3412b27d572dff6f19997c8f155f87 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 24 Apr 2023 22:50:32 -0400 Subject: [PATCH] Remove org users who belong to no teams (#24247) (#24313) Backport #24247 by @yp05327 Fix #24128 Co-authored-by: yp05327 <576951401@qq.com> Co-authored-by: silverwind --- models/org_team.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/models/org_team.go b/models/org_team.go index be3b63b52ec4..eea704daad9f 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -418,6 +418,12 @@ func DeleteTeam(t *organization.Team) error { return err } + for _, tm := range t.Members { + if err := removeInvalidOrgUser(ctx, tm.ID, t.OrgID); err != nil { + return err + } + } + // Update organization number of teams. if _, err := db.Exec(ctx, "UPDATE `user` SET num_teams=num_teams-1 WHERE id=?", t.OrgID); err != nil { return err @@ -567,16 +573,19 @@ func removeTeamMember(ctx context.Context, team *organization.Team, userID int64 } } + return removeInvalidOrgUser(ctx, userID, team.OrgID) +} + +func removeInvalidOrgUser(ctx context.Context, userID, orgID int64) error { // Check if the user is a member of any team in the organization. - if count, err := e.Count(&organization.TeamUser{ + if count, err := db.GetEngine(ctx).Count(&organization.TeamUser{ UID: userID, - OrgID: team.OrgID, + OrgID: orgID, }); err != nil { return err } else if count == 0 { - return removeOrgUser(ctx, team.OrgID, userID) + return removeOrgUser(ctx, orgID, userID) } - return nil }