From c384874d7d2e28fb56fb768e87b5bff3ee79dc5f Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Wed, 25 Sep 2024 15:04:57 +0300 Subject: [PATCH] fix tests Signed-off-by: bcmmbaga --- management/server/file_store.go | 11 ++++++++++- management/server/user_test.go | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/management/server/file_store.go b/management/server/file_store.go index b9c09e46d..e4307b1bd 100644 --- a/management/server/file_store.go +++ b/management/server/file_store.go @@ -635,7 +635,16 @@ func (s *FileStore) GetUserByUserID(_ context.Context, _ LockingStrength, userID return nil, err } - return account.Users[userID].Copy(), nil + user := account.Users[userID].Copy() + pat := make([]PersonalAccessToken, 0, len(user.PATs)) + for _, token := range user.PATs { + if token != nil { + pat = append(pat, *token) + } + } + user.PATsG = pat + + return user, nil } func (s *FileStore) GetAccountGroups(ctx context.Context, accountID string) ([]*nbgroup.Group, error) { diff --git a/management/server/user_test.go b/management/server/user_test.go index 28284f517..e394ef840 100644 --- a/management/server/user_test.go +++ b/management/server/user_test.go @@ -199,7 +199,8 @@ func TestUser_GetPAT(t *testing.T) { defer store.Close(context.Background()) account := newAccountWithId(context.Background(), mockAccountID, mockUserID, "") account.Users[mockUserID] = &User{ - Id: mockUserID, + Id: mockUserID, + AccountID: mockAccountID, PATs: map[string]*PersonalAccessToken{ mockTokenID1: { ID: mockTokenID1, @@ -231,7 +232,8 @@ func TestUser_GetAllPATs(t *testing.T) { defer store.Close(context.Background()) account := newAccountWithId(context.Background(), mockAccountID, mockUserID, "") account.Users[mockUserID] = &User{ - Id: mockUserID, + Id: mockUserID, + AccountID: mockAccountID, PATs: map[string]*PersonalAccessToken{ mockTokenID1: { ID: mockTokenID1,