From 1c88d31dc2c2687de1a3d4117bd04b37b0f66257 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Wed, 15 May 2024 16:59:57 +0500 Subject: [PATCH] :fire: Removed memory client repository --- internal/client/repository.go | 15 ++----- .../client/repository/http/http_client.go | 7 +--- .../repository/http/http_client_test.go | 2 +- .../client/repository/memory/memory_client.go | 41 ------------------- internal/client/usecase/client_ucase.go | 2 +- 5 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 internal/client/repository/memory/memory_client.go diff --git a/internal/client/repository.go b/internal/client/repository.go index 53d294b..ddaf6c8 100644 --- a/internal/client/repository.go +++ b/internal/client/repository.go @@ -8,8 +8,7 @@ import ( type ( Repository interface { - Create(ctx context.Context, client domain.Client) error - Get(ctx context.Context, cid domain.ClientID) (*domain.Client, error) + Fetch(ctx context.Context, cid domain.ClientID) (*domain.Client, error) } dummyClientRepository struct{} @@ -32,11 +31,7 @@ func NewDummyClientRepository() Repository { return dummyClientRepository{} } -func (dummyClientRepository) Create(_ context.Context, _ domain.Client) error { - return nil -} - -func (dummyClientRepository) Get(_ context.Context, _ domain.ClientID) (*domain.Client, error) { +func (dummyClientRepository) Fetch(_ context.Context, _ domain.ClientID) (*domain.Client, error) { return nil, nil } @@ -49,10 +44,6 @@ func NewStubClientRepository(client *domain.Client, err error) Repository { } } -func (repo *stubClientRepository) Create(_ context.Context, _ domain.Client) error { - return repo.error -} - -func (repo *stubClientRepository) Get(_ context.Context, _ domain.ClientID) (*domain.Client, error) { +func (repo *stubClientRepository) Fetch(_ context.Context, _ domain.ClientID) (*domain.Client, error) { return repo.client, repo.error } diff --git a/internal/client/repository/http/http_client.go b/internal/client/repository/http/http_client.go index 5f60028..0e4b328 100644 --- a/internal/client/repository/http/http_client.go +++ b/internal/client/repository/http/http_client.go @@ -55,12 +55,7 @@ func NewHTTPClientRepository(c *http.Client) client.Repository { } } -// WARN(toby3d): not implemented. -func (httpClientRepository) Create(_ context.Context, _ domain.Client) error { - return nil -} - -func (repo httpClientRepository) Get(ctx context.Context, cid domain.ClientID) (*domain.Client, error) { +func (repo *httpClientRepository) Fetch(ctx context.Context, cid domain.ClientID) (*domain.Client, error) { out := &domain.Client{ ID: cid, RedirectURI: make([]*url.URL, 0), diff --git a/internal/client/repository/http/http_client_test.go b/internal/client/repository/http/http_client_test.go index 6c36df4..047155e 100644 --- a/internal/client/repository/http/http_client_test.go +++ b/internal/client/repository/http/http_client_test.go @@ -44,7 +44,7 @@ func TestGet(t *testing.T) { client.ID = *domain.TestClientID(t, srv.URL+"/") clients := repository.NewHTTPClientRepository(srv.Client()) - result, err := clients.Get(context.Background(), client.ID) + result, err := clients.Fetch(context.Background(), client.ID) if err != nil { t.Fatal(err) } diff --git a/internal/client/repository/memory/memory_client.go b/internal/client/repository/memory/memory_client.go deleted file mode 100644 index cfdd04e..0000000 --- a/internal/client/repository/memory/memory_client.go +++ /dev/null @@ -1,41 +0,0 @@ -package memory - -import ( - "context" - "sync" - - "source.toby3d.me/toby3d/auth/internal/client" - "source.toby3d.me/toby3d/auth/internal/domain" -) - -type memoryClientRepository struct { - mutex *sync.RWMutex - clients map[string]domain.Client -} - -func NewMemoryClientRepository() client.Repository { - return &memoryClientRepository{ - mutex: new(sync.RWMutex), - clients: make(map[string]domain.Client), - } -} - -func (repo memoryClientRepository) Create(ctx context.Context, client domain.Client) error { - repo.mutex.RLock() - defer repo.mutex.RUnlock() - - repo.clients[client.ID.String()] = client - - return nil -} - -func (repo memoryClientRepository) Get(ctx context.Context, cid domain.ClientID) (*domain.Client, error) { - repo.mutex.RLock() - defer repo.mutex.RUnlock() - - if c, ok := repo.clients[cid.String()]; ok { - return &c, nil - } - - return nil, client.ErrNotExist -} diff --git a/internal/client/usecase/client_ucase.go b/internal/client/usecase/client_ucase.go index 0a4b47e..dcad992 100644 --- a/internal/client/usecase/client_ucase.go +++ b/internal/client/usecase/client_ucase.go @@ -19,7 +19,7 @@ func NewClientUseCase(repo client.Repository) client.UseCase { } func (useCase *clientUseCase) Discovery(ctx context.Context, id domain.ClientID) (*domain.Client, error) { - c, err := useCase.repo.Get(ctx, id) + c, err := useCase.repo.Fetch(ctx, id) if err != nil { return nil, fmt.Errorf("cannot discovery client by id: %w", err) }