Merge branch 'main' into feat-ISS-1732

Author: adelowo

go.mod

@@ -55,7 +55,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/invopop/jsonschema v0.13.0
 	github.com/invopop/yaml v0.3.1
-	github.com/jackc/pgx/v5 v5.9.1
+	github.com/jackc/pgx/v5 v5.9.2
 	github.com/knadh/koanf/parsers/yaml v1.1.0
 	github.com/knadh/koanf/providers/env/v2 v2.0.0
 	github.com/knadh/koanf/providers/file v1.2.1

go.sum

@@ -386,8 +386,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.9.1 h1:uwrxJXBnx76nyISkhr33kQLlUqjv7et7b9FjCen/tdc=
-github.com/jackc/pgx/v5 v5.9.1/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
+github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw=
+github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A=

internal/ent/hooks/user.go

@@ -109,6 +109,17 @@ func HookUser() ent.Hook {
 				}
 			}
 
+			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
@@ -121,7 +132,7 @@ func HookUser() ent.Hook {
 
 			// 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
 				}
@@ -372,7 +383,15 @@ func defaultUserSettings(ctx context.Context, user *generated.UserMutation) (str
 	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 {
 	displayName, ok := m.DisplayName()
 
 	avatarRemoteURL, isAvatarRemoteURLChanged := m.AvatarRemoteURL()
@@ -382,20 +401,7 @@ func updateSystemManagedGroupForUser(ctx context.Context, m *generated.UserMutat
 		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
 		}