diff --git a/management/server/file_store.go b/management/server/file_store.go index f6057b281..b9c09e46d 100644 --- a/management/server/file_store.go +++ b/management/server/file_store.go @@ -985,10 +985,6 @@ func (s *FileStore) GetAccountDNSSettings(_ context.Context, _ LockingStrength, return nil, status.Errorf(status.Internal, "GetAccountDNSSettings is not implemented") } -func (s *FileStore) UpdateAccount(_ context.Context, _ LockingStrength, _ *Account) error { - return nil -} - func (s *FileStore) GetGroupByID(_ context.Context, _ LockingStrength, _, _ string) (*nbgroup.Group, error) { return nil, status.Errorf(status.Internal, "GetGroupByID is not implemented") } diff --git a/management/server/group.go b/management/server/group.go index 9bc32dde1..aa387c058 100644 --- a/management/server/group.go +++ b/management/server/group.go @@ -50,7 +50,7 @@ func (am *DefaultAccountManager) GetGroup(ctx context.Context, accountID, groupI return nil, err } - return am.Store.GetGroupByID(ctx, groupID, accountID) + return am.Store.GetGroupByID(ctx, LockingStrengthShare, groupID, accountID) } // GetAllGroups returns all groups in an account diff --git a/management/server/sql_store.go b/management/server/sql_store.go index cc3d771d9..f1533e850 100644 --- a/management/server/sql_store.go +++ b/management/server/sql_store.go @@ -1049,39 +1049,6 @@ func (s *SqlStore) GetAccountDNSSettings(ctx context.Context, lockStrength Locki return &accountDNSSettings.DNSSettings, nil } -// UpdateAccount updates an existing account's domain, DNS settings, and settings fields. -func (s *SqlStore) UpdateAccount(ctx context.Context, lockStrength LockingStrength, account *Account) error { - updates := make(map[string]interface{}) - - if account.Domain != "" { - updates["domain"] = account.Domain - } - - if account.DNSSettings.DisabledManagementGroups != nil { - updates["dns_settings"] = account.DNSSettings - } - - if account.Settings != nil { - updates["settings"] = account.Settings - } - - if len(updates) == 0 { - return nil - } - - result := s.db.WithContext(ctx).Clauses(clause.Locking{Strength: string(lockStrength)}).Model(&Account{}). - Where("id = ?", account.Id).Updates(updates) - if result.Error != nil { - return status.Errorf(status.Internal, "failed to update account: %v", result.Error) - } - - if result.RowsAffected == 0 { - return status.Errorf(status.NotFound, "account not found") - } - - return nil -} - // AccountExists checks whether an account exists by the given ID. func (s *SqlStore) AccountExists(ctx context.Context, id string) (bool, error) { var count int64 @@ -1109,7 +1076,7 @@ func (s *SqlStore) GetAccountDomainAndCategory(ctx context.Context, lockStrength return account.Domain, account.DomainCategory, nil } -// GetGroupByID +// GetGroupByID retrieves a group by ID and account ID. func (s *SqlStore) GetGroupByID(ctx context.Context, lockStrength LockingStrength, groupID, accountID string) (*nbgroup.Group, error) { return getRecordByID[nbgroup.Group](s.db.WithContext(ctx).Preload(clause.Associations), lockStrength, groupID, accountID) } diff --git a/management/server/store.go b/management/server/store.go index c629a4c75..62a0d72a4 100644 --- a/management/server/store.go +++ b/management/server/store.go @@ -53,7 +53,6 @@ type Store interface { GetAccountIDByPrivateDomain(ctx context.Context, lockStrength LockingStrength, domain string) (string, error) GetAccountSettings(ctx context.Context, lockStrength LockingStrength, accountID string) (*Settings, error) GetAccountDNSSettings(ctx context.Context, lockStrength LockingStrength, accountID string) (*DNSSettings, error) - UpdateAccount(ctx context.Context, lockStrength LockingStrength, account *Account) error SaveAccount(ctx context.Context, account *Account) error DeleteAccount(ctx context.Context, account *Account) error