From 33981e04bebe39c16d3bbb3af84c8772b00102fd Mon Sep 17 00:00:00 2001 From: mo khan Date: Fri, 25 Apr 2025 10:56:48 -0600 Subject: refactor: move Repository interface to domain --- pkg/db/in_memory_repository.go | 2 +- pkg/db/repository.go | 9 --------- pkg/domain/repository.go | 7 +++++++ pkg/web/middleware/user.go | 3 +-- 4 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 pkg/db/repository.go create mode 100644 pkg/domain/repository.go (limited to 'pkg') diff --git a/pkg/db/in_memory_repository.go b/pkg/db/in_memory_repository.go index 56ca766..3e183fd 100644 --- a/pkg/db/in_memory_repository.go +++ b/pkg/db/in_memory_repository.go @@ -10,7 +10,7 @@ type inMemoryRepository[T domain.Entity] struct { items []T } -func NewRepository[T domain.Entity]() Repository[T] { +func NewRepository[T domain.Entity]() domain.Repository[T] { return &inMemoryRepository[T]{ items: []T{}, } diff --git a/pkg/db/repository.go b/pkg/db/repository.go deleted file mode 100644 index 0ebe216..0000000 --- a/pkg/db/repository.go +++ /dev/null @@ -1,9 +0,0 @@ -package db - -import "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/domain" - -type Repository[T domain.Entity] interface { - All() []T - Find(domain.ID) T - Save(T) error -} diff --git a/pkg/domain/repository.go b/pkg/domain/repository.go new file mode 100644 index 0000000..fb7b6da --- /dev/null +++ b/pkg/domain/repository.go @@ -0,0 +1,7 @@ +package domain + +type Repository[T Entity] interface { + All() []T + Find(ID) T + Save(T) error +} diff --git a/pkg/web/middleware/user.go b/pkg/web/middleware/user.go index 68d2daa..1e46187 100644 --- a/pkg/web/middleware/user.go +++ b/pkg/web/middleware/user.go @@ -6,13 +6,12 @@ import ( "github.com/xlgmokha/x/pkg/log" "github.com/xlgmokha/x/pkg/mapper" "github.com/xlgmokha/x/pkg/x" - "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/db" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/domain" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/key" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc" ) -func User(db db.Repository[*domain.User]) func(http.Handler) http.Handler { +func User(db domain.Repository[*domain.User]) func(http.Handler) http.Handler { return func(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { idToken := key.IDToken.From(r.Context()) -- cgit v1.2.3