fix: review from piyush

reearth · Jan 10, 2025 · 8fa074a · 8fa074a
1 parent 6924834
commit 8fa074a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/server/.env.example b/server/.env.example
@@ -1,8 +1,8 @@
 # General
 PORT=8080
-REEARTH_DB=mongodb://localhost
-REEARTH_DB_ACCOUNT=reearth # for account database
-REEARTH_DB_VIS=reearth # for visualizer database
+REEARTH_DB=mongodb://localhost # for reearth database url
+REEARTH_DB_ACCOUNT=reearth_account # for reearth account database name
+REEARTH_DB_VIS=reearth # for reearth visualizer database name
 REEARTH_HOST=https://localhost:8080
 REEARTH_HOST_WEB=https://localhost:3000
 REEARTH_ASSETBASEURL=https://localhost:8080/assets

diff --git a/server/internal/app/config/config.go b/server/internal/app/config/config.go
@@ -30,8 +30,8 @@ type Config struct {
 	Dev              bool              `pp:",omitempty"`
 	DB               string            `default:"mongodb://localhost"`
 	DB_Account       string            `pp:",omitempty"`
-	DB_Vis           string            `pp:",omitempty"`
 	DB_Users         []appx.NamedURI   `pp:",omitempty"`
+	DB_Vis           string            `pp:",omitempty"`
 	GraphQL          GraphQLConfig     `pp:",omitempty"`
 	Published        PublishedConfig   `pp:",omitempty"`
 	GCPProject       string            `envconfig:"GOOGLE_CLOUD_PROJECT" pp:",omitempty"`

diff --git a/server/internal/app/repo.go b/server/internal/app/repo.go
@@ -25,7 +25,8 @@ import (
 	"go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo"
 )
 
-const defaultDatabase = "reearth"
+const defaultVisDatabase = "reearth"
+const defaultAccountDatabase = "reearth_account"
 
 func initReposAndGateways(ctx context.Context, conf *config.Config, debug bool) (*repo.Container, *gateway.Container, *accountrepo.Container, *accountgateway.Container) {
 	gateways := &gateway.Container{}
@@ -46,7 +47,7 @@ func initReposAndGateways(ctx context.Context, conf *config.Config, debug bool)
 	accountDatabase := conf.DB_Account
 	accountRepoCompat := false
 	if accountDatabase == "" {
-		accountDatabase = defaultDatabase
+		accountDatabase = defaultAccountDatabase
 		accountRepoCompat = true
 	}
 
@@ -66,13 +67,13 @@ func initReposAndGateways(ctx context.Context, conf *config.Config, debug bool)
 		log.Fatalf("Failed to init mongo: %+v\n", err)
 	}
 
-	// for reearth database
-	visualizerDatabase := conf.DB_Vis
-	if visualizerDatabase == "" {
-		visualizerDatabase = defaultDatabase
+	// for reearth visualizer database
+	visDatabase := conf.DB_Vis
+	if visDatabase == "" {
+		visDatabase = defaultVisDatabase
 	}
 
-	repos, err := mongorepo.NewWithExtensions(ctx, client.Database(visualizerDatabase), accountRepos, txAvailable, conf.Ext_Plugin)
+	repos, err := mongorepo.NewWithExtensions(ctx, client.Database(visDatabase), accountRepos, txAvailable, conf.Ext_Plugin)
 	if err != nil {
 		log.Fatalf("Failed to init mongo: %+v\n", err)
 	}