internal/kurious/adapters/memory_mapper_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"git.loyso.art/frx/kurious/internal/kurious/domain"
-	mockrepo "git.loyso.art/frx/kurious/internal/kurious/domain/mocks"
+	mockrepo "git.loyso.art/frx/kurious/internal/kurious/adapters/mocks"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/kurious/adapters/not_implemented.go

@@ -0,0 +1,42 @@
+package adapters
+
+import (
+	"context"
+
+	cerrors "git.loyso.art/frx/kurious/internal/common/errors"
+	"git.loyso.art/frx/kurious/internal/kurious/domain"
+)
+
+type NotImplementedOrganizationRepository struct{}
+
+func (NotImplementedOrganizationRepository) ListStats(
+	context.Context,
+	domain.ListOrganizationsParams,
+) ([]domain.OrganizationStat, error) {
+	return nil, cerrors.ErrNotImplemented
+}
+
+func (NotImplementedOrganizationRepository) List(context.Context, domain.ListOrganizationsParams) ([]domain.Organization, error) {
+	return nil, cerrors.ErrNotImplemented
+}
+func (NotImplementedOrganizationRepository) Get(context.Context, domain.GetOrganizationParams) (domain.Organization, error) {
+	return domain.Organization{}, cerrors.ErrNotImplemented
+}
+func (NotImplementedOrganizationRepository) Create(context.Context, domain.CreateOrganizationParams) (domain.Organization, error) {
+	return domain.Organization{}, cerrors.ErrNotImplemented
+}
+func (NotImplementedOrganizationRepository) Delete(ctx context.Context, id string) error {
+	return cerrors.ErrNotImplemented
+}
+
+type NotImplementedLearningCategory struct{}
+
+func (NotImplementedLearningCategory) Upsert(context.Context, domain.LearningCategory) error {
+	return cerrors.ErrNotImplemented
+}
+func (NotImplementedLearningCategory) List(context.Context) ([]domain.LearningCategory, error) {
+	return nil, cerrors.ErrNotImplemented
+}
+func (NotImplementedLearningCategory) Get(context.Context, string) (domain.LearningCategory, error) {
+	return domain.LearningCategory{}, cerrors.ErrNotImplemented
+}

internal/kurious/adapters/ydb_course_repository.go

@@ -110,11 +110,11 @@ func (conn *YDBConnection) Close() error {
 }
 
 func (conn *YDBConnection) Organization() domain.OrganizationRepository {
-	return domain.NotImplementedOrganizationRepository{}
+	return NotImplementedOrganizationRepository{}
 }
 
 func (conn *YDBConnection) LearningCategory() domain.LearningCategoryRepository {
-	return domain.NotImplementedLearningCategory{}
+	return NotImplementedLearningCategory{}
 }
 
 func (conn *YDBConnection) CourseRepository() *ydbCourseRepository {

internal/kurious/app/command/command_test.go

@@ -9,7 +9,7 @@ import (
 
 	"git.loyso.art/frx/kurious/internal/common/nullable"
 	"git.loyso.art/frx/kurious/internal/kurious/domain"
-	mockrepo "git.loyso.art/frx/kurious/internal/kurious/domain/mocks"
+	mockrepo "git.loyso.art/frx/kurious/internal/kurious/adapters/mocks"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/kurious/app/query/query_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"git.loyso.art/frx/kurious/internal/kurious/domain"
-	mockrepo "git.loyso.art/frx/kurious/internal/kurious/domain/mocks"
+	mockrepo "git.loyso.art/frx/kurious/internal/kurious/adapters/mocks"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/kurious/domain/repository.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"time"
 
-	cerrors "git.loyso.art/frx/kurious/internal/common/errors"
 	"git.loyso.art/frx/kurious/internal/common/nullable"
 )
 
@@ -81,7 +80,7 @@ type ListStatisticsResult struct {
 	LearningTypeStatistics []StatisticUnit
 }
 
-//go:generate mockery --name CourseRepository
+//go:generate mockery --name CourseRepository --output ../adapters/mocks
 type CourseRepository interface {
 	// List courses by specifid parameters.
 	List(context.Context, ListCoursesParams) (ListCoursesResult, error)
@@ -127,7 +126,7 @@ type ListOrganizationsParams struct {
 	IDs              []string
 }
 
-//go:generate mockery --name OrganizationRepository
+//go:generate mockery --name OrganizationRepository --output ../adapters/mocks
 type OrganizationRepository interface {
 	ListStats(context.Context, ListOrganizationsParams) ([]OrganizationStat, error)
 	List(context.Context, ListOrganizationsParams) ([]Organization, error)
@@ -136,44 +135,10 @@ type OrganizationRepository interface {
 	Delete(ctx context.Context, id string) error
 }
 
-type NotImplementedOrganizationRepository struct{}
+//go:generate mockery --name LearningCategoryRepository --output ../adapters/mocks
-
-func (NotImplementedOrganizationRepository) ListStats(
-	context.Context,
-	ListOrganizationsParams,
-) ([]OrganizationStat, error) {
-	return nil, cerrors.ErrNotImplemented
-}
-
-func (NotImplementedOrganizationRepository) List(context.Context, ListOrganizationsParams) ([]Organization, error) {
-	return nil, cerrors.ErrNotImplemented
-}
-func (NotImplementedOrganizationRepository) Get(context.Context, GetOrganizationParams) (Organization, error) {
-	return Organization{}, cerrors.ErrNotImplemented
-}
-func (NotImplementedOrganizationRepository) Create(context.Context, CreateOrganizationParams) (Organization, error) {
-	return Organization{}, cerrors.ErrNotImplemented
-}
-func (NotImplementedOrganizationRepository) Delete(ctx context.Context, id string) error {
-	return cerrors.ErrNotImplemented
-}
-
-//go:generate mockery --name LearningCategoryRepository
 type LearningCategoryRepository interface {
 	Upsert(context.Context, LearningCategory) error
 
 	List(context.Context) ([]LearningCategory, error)
 	Get(context.Context, string) (LearningCategory, error)
 }
-
-type NotImplementedLearningCategory struct{}
-
-func (NotImplementedLearningCategory) Upsert(context.Context, LearningCategory) error {
-	return cerrors.ErrNotImplemented
-}
-func (NotImplementedLearningCategory) List(context.Context) ([]LearningCategory, error) {
-	return nil, cerrors.ErrNotImplemented
-}
-func (NotImplementedLearningCategory) Get(context.Context, string) (LearningCategory, error) {
-	return LearningCategory{}, cerrors.ErrNotImplemented
-}