chore: Restructure code into domain package

networkteam · Oct 22, 2024 · 8537b95 · 8537b95
1 parent b26f59a
commit 8537b95
Show file tree

Hide file tree

Showing 75 changed files with 605 additions and 505 deletions.
diff --git a/backend/api/errors.go b/backend/api/errors.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"myvendor.mytld/myproject/backend/api/graph/model"
-	"myvendor.mytld/myproject/backend/domain"
+	"myvendor.mytld/myproject/backend/domain/types"
 )
 
 var ErrAuthTokenInvalid = TypedError{"authTokenInvalid", "auth token invalid"}
@@ -43,7 +43,7 @@ func ResultFromErr(err error) (*model.Result, error) {
 }
 
 func FieldsErrorFromErr(err error) *model.FieldsError {
-	var fieldErr domain.FieldResolvableError
+	var fieldErr types.FieldResolvableError
 	if errors.As(err, &fieldErr) {
 		return &model.FieldsError{
 			Errors: []*model.FieldError{

diff --git a/backend/api/graph/admin.resolvers.go b/backend/api/graph/admin.resolvers.go
diff --git a/backend/api/graph/authentication.resolvers.go b/backend/api/graph/authentication.resolvers.go
diff --git a/backend/api/graph/generated/generated.go b/backend/api/graph/generated/generated.go
diff --git a/backend/api/graph/helper/account.go b/backend/api/graph/helper/account.go
@@ -4,10 +4,11 @@ import (
 	"context"
 
 	"myvendor.mytld/myproject/backend/api/graph/model"
-	"myvendor.mytld/myproject/backend/domain"
+	model2 "myvendor.mytld/myproject/backend/domain/model"
+	"myvendor.mytld/myproject/backend/domain/query"
 )
 
-func MapToAccount(record domain.Account) *model.Account {
+func MapToAccount(record model2.Account) *model.Account {
 	return &model.Account{
 		ID:             record.ID,
 		EmailAddress:   record.EmailAddress,
@@ -19,28 +20,28 @@ func MapToAccount(record domain.Account) *model.Account {
 	}
 }
 
-func MapToAccounts(records []domain.Account) []*model.Account {
+func MapToAccounts(records []model2.Account) []*model.Account {
 	result := make([]*model.Account, len(records))
 	for i, record := range records {
 		result[i] = MapToAccount(record)
 	}
 	return result
 }
 
-func MapFromAccountFilter(filter *model.AccountFilter) domain.AccountsQuery {
+func MapFromAccountFilter(filter *model.AccountFilter) query.AccountsQuery {
 	if filter == nil {
-		return domain.AccountsQuery{}
+		return query.AccountsQuery{}
 	}
-	return domain.AccountsQuery{
+	return query.AccountsQuery{
 		IDs:            filter.Ids,
 		SearchTerm:     ToVal(filter.Q),
 		OrganisationID: filter.OrganisationID,
 	}
 }
 
-func AccountQueryOptsFromSelection(ctx context.Context, accountSelectPath ...string) domain.AccountQueryOpts {
+func AccountQueryOptsFromSelection(ctx context.Context, accountSelectPath ...string) *query.AccountQueryOpts {
 	selectedFields := SelectedFields(ctx)
-	return domain.AccountQueryOpts{
+	return &query.AccountQueryOpts{
 		IncludeOrganisation:   selectedFields.PathSelected(append(accountSelectPath, "organisation")...),
 		OrganisationQueryOpts: OrganisationQueryOptsFromSelection(ctx, append(accountSelectPath, "organisation")...),
 	}