Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions internal/ent/hooks/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,17 @@
}
}

var oldDisplayName string
if m.Op().Is(ent.OpUpdateOne) && canUpdateManagedGroup(m) {
var err error

oldDisplayName, err = m.OldDisplayName(ctx)
if err != nil {
logx.FromContext(ctx).Error().Err(err).Msg("error getting old display name")
return nil, err
}
}

v, err := next.Mutate(ctx, m)
if err != nil {
return nil, err
Expand All @@ -121,7 +132,7 @@

// handle display name updates for managed groups
if m.Op().Is(ent.OpUpdateOne) {
if err := updateSystemManagedGroupForUser(ctx, m, userCreated); err != nil {
if err := updateSystemManagedGroupForUser(ctx, m, userCreated, oldDisplayName); err != nil {
logx.FromContext(ctx).Error().Err(err).Msg("error updating system managed group name for the user")
return nil, err
}
Expand Down Expand Up @@ -372,7 +383,15 @@
return userSetting.ID, nil
}

func updateSystemManagedGroupForUser(ctx context.Context, m *generated.UserMutation, user *generated.User) error {
func canUpdateManagedGroup(m *generated.UserMutation) bool {
_, didDisplayNameChange := m.DisplayName()
_, didAvatarRemoteURLChange := m.AvatarRemoteURL()
_, didLocalFileChange := m.AvatarLocalFileID()

return didDisplayNameChange || didAvatarRemoteURLChange || didLocalFileChange
}

func updateSystemManagedGroupForUser(ctx context.Context, m *generated.UserMutation, user *generated.User, oldDisplayName string) error {

Check failure on line 394 in internal/ent/hooks/user.go

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.

See more on https://sonarcloud.io/project/issues?id=theopenlane_core&issues=AZ26yFOMbQC8gvkSgUMz&open=AZ26yFOMbQC8gvkSgUMz&pullRequest=2324
displayName, ok := m.DisplayName()

avatarRemoteURL, isAvatarRemoteURLChanged := m.AvatarRemoteURL()
Expand All @@ -382,20 +401,7 @@
return nil
}

oldDisplayName, err := m.OldDisplayName(ctx)
if err != nil {
return err
}

if ok {
var err error

oldDisplayName, err = m.OldDisplayName(ctx)
if err != nil {
logx.FromContext(ctx).Error().Err(err).Msg("error getting old display name")
return err
}

if oldDisplayName == displayName {
ok = false
}
Expand Down
Loading