feat(server): add env var to specify account database (#640)

reearth · Aug 24, 2023 · 3b88ad8 · 3b88ad8
1 parent 0ef6a88
commit 3b88ad8
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 36 deletions.
diff --git a/server/e2e/common.go b/server/e2e/common.go
@@ -14,7 +14,6 @@ import (
 	"github.com/reearth/reearth/server/internal/infrastructure/mongo"
 	"github.com/reearth/reearth/server/internal/usecase/gateway"
 	"github.com/reearth/reearth/server/internal/usecase/repo"
-	"github.com/reearth/reearthx/account/accountinfrastructure/accountmemory"
 	"github.com/reearth/reearthx/account/accountinfrastructure/accountmongo"
 	"github.com/reearth/reearthx/account/accountusecase/accountgateway"
 	"github.com/reearth/reearthx/account/accountusecase/accountrepo"
@@ -35,13 +34,13 @@ func StartServer(t *testing.T, cfg *config.Config, useMongo bool, seeder Seeder)
 	return e
 }
 
-func StartServerAndRepos(t *testing.T, cfg *config.Config, useMongo bool, seeder Seeder) (*httpexpect.Expect, *repo.Container) {
+func initRepos(t *testing.T, useMongo bool, seeder Seeder) (repos *repo.Container) {
 	ctx := context.Background()
 
-	var repos *repo.Container
 	if useMongo {
 		db := mongotest.Connect(t)(t)
-		repos = lo.Must(mongo.New(ctx, db, false))
+		accountRepos := lo.Must(accountmongo.New(ctx, db.Client(), db.Name(), false, false))
+		repos = lo.Must(mongo.New(ctx, db, accountRepos, false))
 	} else {
 		repos = memory.New()
 	}
@@ -52,8 +51,14 @@ func StartServerAndRepos(t *testing.T, cfg *config.Config, useMongo bool, seeder
 		}
 	}
 
+	return repos
+}
+
+func StartServerAndRepos(t *testing.T, cfg *config.Config, useMongo bool, seeder Seeder) (*httpexpect.Expect, *repo.Container) {
+	repos := initRepos(t, useMongo, seeder)
 	return StartServerWithRepos(t, cfg, repos), repos
 }
+
 func StartServerWithRepos(t *testing.T, cfg *config.Config, repos *repo.Container) *httpexpect.Expect {
 	t.Helper()
 
@@ -110,27 +115,9 @@ func StartGQLServer(t *testing.T, cfg *config.Config, useMongo bool, seeder Seed
 }
 
 func StartGQLServerAndRepos(t *testing.T, cfg *config.Config, useMongo bool, seeder Seeder) (*httpexpect.Expect, *accountrepo.Container) {
-	ctx := context.Background()
-
-	var repos *repo.Container
-	var accountRepos *accountrepo.Container
-
-	if useMongo {
-		db := mongotest.Connect(t)(t)
-		repos = lo.Must(mongo.New(ctx, db, false))
-		accountRepos = lo.Must(accountmongo.New(ctx, db.Client(), db.Name(), false, true))
-	} else {
-		repos = memory.New()
-		accountRepos = accountmemory.New()
-	}
-
-	if seeder != nil {
-		if err := seeder(ctx, repos); err != nil {
-			t.Fatalf("failed to seed the db: %s", err)
-		}
-	}
-
-	return StartGQLServerWithRepos(t, cfg, repos, accountRepos), accountRepos
+	repos := initRepos(t, useMongo, seeder)
+	acRepos := repos.AccountRepos()
+	return StartGQLServerWithRepos(t, cfg, repos, acRepos), acRepos
 }
 
 func StartGQLServerWithRepos(t *testing.T, cfg *config.Config, repos *repo.Container, accountrepos *accountrepo.Container) *httpexpect.Expect {

diff --git a/server/internal/app/config/config.go b/server/internal/app/config/config.go
@@ -25,6 +25,7 @@ type Config struct {
 	Host_Web         string
 	Dev              bool
 	DB               string `default:"mongodb://localhost"`
+	DB_Account       string
 	GraphQL          GraphQLConfig
 	Published        PublishedConfig
 	GCPProject       string `envconfig:"GOOGLE_CLOUD_PROJECT"`

diff --git a/server/internal/app/repo.go b/server/internal/app/repo.go
@@ -25,6 +25,8 @@ import (
 	"go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo"
 )
 
+const databaseName = "reearth"
+
 func initReposAndGateways(ctx context.Context, conf *config.Config, debug bool) (*repo.Container, *gateway.Container, *accountrepo.Container, *accountgateway.Container) {
 	gateways := &gateway.Container{}
 	acGateways := &accountgateway.Container{}
@@ -40,14 +42,20 @@ func initReposAndGateways(ctx context.Context, conf *config.Config, debug bool)
 		log.Fatalf("mongo error: %+v\n", err)
 	}
 
+	// repos
+	accountDatabase := conf.DB_Account
+	if accountDatabase == "" {
+		accountDatabase = databaseName
+	}
+
 	txAvailable := mongox.IsTransactionAvailable(conf.DB)
 
-	repos, err := mongorepo.NewWithExtensions(ctx, client.Database("reearth"), txAvailable, conf.Ext_Plugin)
+	accountRepos, err := accountmongo.New(ctx, client, databaseName, txAvailable, true)
 	if err != nil {
 		log.Fatalf("Failed to init mongo: %+v\n", err)
 	}
 
-	acRepos, err := accountmongo.New(ctx, client, "reearth", txAvailable, true)
+	repos, err := mongorepo.NewWithExtensions(ctx, client.Database(accountDatabase), accountRepos, txAvailable, conf.Ext_Plugin)
 	if err != nil {
 		log.Fatalf("Failed to init mongo: %+v\n", err)
 	}
@@ -77,7 +85,7 @@ func initReposAndGateways(ctx context.Context, conf *config.Config, debug bool)
 		log.Fatalf("repo initialization error: %v", err)
 	}
 
-	return repos, gateways, acRepos, acGateways
+	return repos, gateways, accountRepos, acGateways
 }
 
 func initFile(ctx context.Context, conf *config.Config) (fileRepo gateway.File) {

diff --git a/server/internal/infrastructure/mongo/container.go b/server/internal/infrastructure/mongo/container.go
@@ -14,6 +14,7 @@ import (
 	"github.com/reearth/reearth/server/pkg/scene"
 	"github.com/reearth/reearthx/account/accountdomain/user"
 	"github.com/reearth/reearthx/account/accountinfrastructure/accountmongo"
+	"github.com/reearth/reearthx/account/accountusecase/accountrepo"
 	"github.com/reearth/reearthx/authserver"
 	"github.com/reearth/reearthx/log"
 	"github.com/reearth/reearthx/mongox"
@@ -23,7 +24,7 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 )
 
-func New(ctx context.Context, db *mongo.Database, useTransaction bool) (*repo.Container, error) {
+func New(ctx context.Context, db *mongo.Database, account *accountrepo.Container, useTransaction bool) (*repo.Container, error) {
 	lock, err := NewLock(db.Collection("locks"))
 	if err != nil {
 		return nil, err
@@ -47,13 +48,13 @@ func New(ctx context.Context, db *mongo.Database, useTransaction bool) (*repo.Co
 		Property:       NewProperty(client),
 		Scene:          NewScene(client),
 		Tag:            NewTag(client),
-		Workspace:      accountmongo.NewWorkspaceCompat(client),
-		User:           accountmongo.NewUser(client),
 		SceneLock:      NewSceneLock(client),
 		Policy:         NewPolicy(client),
 		Storytelling:   NewStorytelling(client),
 		Lock:           lock,
 		Transaction:    client.Transaction(),
+		Workspace:      account.Workspace,
+		User:           account.User,
 	}
 
 	// init
@@ -69,8 +70,8 @@ func New(ctx context.Context, db *mongo.Database, useTransaction bool) (*repo.Co
 	return c, nil
 }
 
-func NewWithExtensions(ctx context.Context, db *mongo.Database, useTransaction bool, src []string) (*repo.Container, error) {
-	c, err := New(ctx, db, useTransaction)
+func NewWithExtensions(ctx context.Context, db *mongo.Database, account *accountrepo.Container, useTransaction bool, src []string) (*repo.Container, error) {
+	c, err := New(ctx, db, account, useTransaction)
 	if err != nil {
 		return nil, err
 	}

diff --git a/server/internal/usecase/interactor/dataset.go b/server/internal/usecase/interactor/dataset.go
@@ -32,13 +32,13 @@ type Dataset struct {
 	common
 	commonSceneLock
 	sceneRepo         repo.Scene
-	workspaceRepo     accountrepo.Workspace
 	datasetRepo       repo.Dataset
 	datasetSchemaRepo repo.DatasetSchema
 	propertyRepo      repo.Property
 	layerRepo         repo.Layer
 	pluginRepo        repo.Plugin
-	policyRepo        repo.Policy
+	workspaceRepo     accountrepo.Workspace
+	policyRepo        accountrepo.Policy
 	datasource        gateway.DataSource
 	file              gateway.File
 	google            gateway.Google

diff --git a/server/internal/usecase/interactor/layer.go b/server/internal/usecase/interactor/layer.go
@@ -42,7 +42,7 @@ type Layer struct {
 	datasetSchemaRepo  repo.DatasetSchema
 	sceneRepo          repo.Scene
 	sceneLockRepo      repo.SceneLock
-	policyRepo         repo.Policy
+	policyRepo         accountrepo.Policy
 	workspaceRepo      accountrepo.Workspace
 	transaction        usecasex.Transaction
 }

diff --git a/server/internal/usecase/repo/container.go b/server/internal/usecase/repo/container.go
@@ -39,6 +39,15 @@ type Container struct {
 	Extensions     []plugin.ID
 }
 
+func (c *Container) AccountRepos() *accountrepo.Container {
+	return &accountrepo.Container{
+		Workspace: c.Workspace,
+		User:      c.User,
+		// TODO: Policy: c.Policy,
+		Transaction: c.Transaction,
+	}
+}
+
 func (c *Container) Filtered(workspace WorkspaceFilter, scene SceneFilter) *Container {
 	if c == nil {
 		return c