From f62ce1db0ae100454aebf589f8a93d1b2de263b2 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sun, 30 Jan 2022 01:46:43 +0500 Subject: [PATCH] :recycle: Simplify error usage in user package --- internal/user/repository.go | 3 +-- internal/user/repository/http/http_user.go | 16 +++++++--------- internal/user/usecase/user_ucase_test.go | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/internal/user/repository.go b/internal/user/repository.go index 24c286b..e60d610 100644 --- a/internal/user/repository.go +++ b/internal/user/repository.go @@ -2,7 +2,6 @@ package user import ( "context" - "errors" "source.toby3d.me/website/indieauth/internal/domain" ) @@ -11,4 +10,4 @@ type Repository interface { Get(ctx context.Context, me *domain.Me) (*domain.User, error) } -var ErrNotExist = errors.New("user not exists") +var ErrNotExist error = domain.NewError(domain.ErrorCodeServerError, "user not exist", "") diff --git a/internal/user/repository/http/http_user.go b/internal/user/repository/http/http_user.go index 4517127..dfbc1ff 100644 --- a/internal/user/repository/http/http_user.go +++ b/internal/user/repository/http/http_user.go @@ -15,22 +15,20 @@ type httpUserRepository struct { client *http.Client } -const DefaultMaxRedirectsCount int = 10 - const ( + DefaultMaxRedirectsCount int = 10 + + hCard string = "h-card" + propertyEmail string = "email" + propertyName string = "name" + propertyPhoto string = "photo" + propertyURL string = "url" relAuthorizationEndpoint string = "authorization_endpoint" relIndieAuthMetadata string = "indieauth-metadata" relMicropub string = "micropub" relMicrosub string = "microsub" relTicketEndpoint string = "ticket_endpoint" relTokenEndpoint string = "token_endpoint" - - hCard string = "h-card" - - propertyEmail string = "email" - propertyName string = "name" - propertyPhoto string = "photo" - propertyURL string = "url" ) func NewHTTPUserRepository(client *http.Client) user.Repository { diff --git a/internal/user/usecase/user_ucase_test.go b/internal/user/usecase/user_ucase_test.go index c19cc95..3c6c560 100644 --- a/internal/user/usecase/user_ucase_test.go +++ b/internal/user/usecase/user_ucase_test.go @@ -16,7 +16,7 @@ import ( func TestFetch(t *testing.T) { t.Parallel() - me := domain.TestMe(t) + me := domain.TestMe(t, "https://user.example.net") user := domain.TestUser(t) store := new(sync.Map)