Merge pull request #311 from shari-sushi/db-debug-only-local

Db debug only local

Author: shari-sushi

cspell.json

@@ -0,0 +1,64 @@
+{
+  "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
+  "version": "0.2",
+  "userWords": [
+    "envrc",
+    "signup",
+    "interactor",
+    "youtu",
+    "unpad",
+    "loggedin",
+    "vercel",
+    "libc",
+    "addgroup",
+    "adduser",
+    "docker",
+    "dockercompose",
+    "pkcs",
+    "favs",
+    "unfav",
+    "myapp",
+    "mysqld",
+    "nextjs",
+    "godotenv",
+    "fav",
+    "cnt",
+    "cnts",
+    "gorm",
+    "vtuber",
+    "vtubers",
+    "vkara",
+    "-ppassword",
+    "gitflow",
+    "abema",
+    "iriam",
+    "fargate",
+    "ozzo",
+    "sqlmock",
+    "iflame",
+    "gormdb",
+    "vcontents",
+    "healthcheck",
+    "uroot",
+    "ozzo"
+  ],
+  "ignoreRegExpList": [
+    "[０-９Ａ-Ｚａ-ｚぁ-んァ-ヶ亜-熙纊-黑]+",
+    "/arn:aws:*.+/g",
+    "`.*`",
+    "'.*'",
+    "\".*\"",
+    "// .*",
+    "-- .*",
+    "{/\\* .* \\*/}",
+    "<!-- .* -->"
+  ],
+  "ignorePaths": [
+    "node_modules",
+    ".next",
+    "architecture_figure",
+    "LICENSE",
+    "go.sum",
+    "go.mod"
+  ]
+}

t0016Go/infra/db.go

@@ -23,10 +23,10 @@ func GetEnvVar() {
 	if common.IsOnCloud {
 		//クラウド環境
 		fmt.Println("クラウド環境で起動")
-	} else if common.IsOnLoclaWithDockerCompose {
+	} else if common.IsOnLocalWithDockerCompose {
 		// ローカルのdocker上(compose使用)
 		fmt.Println("ローカルのdockerコンテナ内で起動")
-	} else if common.IsOnLoclaWithOutDockerCompose {
+	} else if common.IsOnLocalWithOutDockerCompose {
 		//VSCodeで起動
 		fmt.Println("VSCodeで起動。godotenv.Load使用")
 		err := godotenv.Load("../.env")
@@ -64,7 +64,7 @@ func dbInit() database.SqlHandler {
 			user = "shari"
 			pw = "shari_sushi"
 		}
-	} else if common.IsOnLoclaWithDockerCompose {
+	} else if common.IsOnLocalWithDockerCompose {
 		fmt.Println("common.IsOnLoclaWithDockerCompose : true")
 		// Golangはローカルのdocker-compose or ターミナルの go run で起動
 		// MySQLはローカルのdocker上(compose使用) で起動
@@ -73,7 +73,7 @@ func dbInit() database.SqlHandler {
 		}
 		dbUrl = "v_kara_db"
 		dbName = os.Getenv("MYSQL_DATABASE")
-	} else if common.IsOnLoclaWithOutDockerCompose {
+	} else if common.IsOnLocalWithOutDockerCompose {
 		fmt.Println("develop env. is unknown")
 		// Golangはローカルのdocker-compose or  VSCodeで起動
 		// MySQLはローカルでdockerを使用せずに起動
@@ -99,7 +99,9 @@ func dbInit() database.SqlHandler {
 	var err error
 	var sqlHandler *SqlHandler
 	gormDB, err := gorm.Open(mysql.Open(path), &gorm.Config{})
-	gormDB = gormDB.Debug()
+	if !common.IsOnCloud {
+		gormDB = gormDB.Debug()
+	}
 	if err == nil {
 		sqlHandler = new(SqlHandler)
 		sqlHandler.Conn = gormDB

t0016Go/interfaces/v1/controllers/common/env.go

@@ -12,9 +12,9 @@ var goEnv = os.Getenv("GO_ENV")                      //ローカルpc上での
 var isDockerCompose = os.Getenv("IS_DOCKER_COMPOSE") //docckercompos.ymlにのみ =true と記載
 
 var IsOnCloud = (goEnv == "" && isDockerCompose == "")
-var IsOnLoclaWithDockerCompose = (goEnv == "" && isDockerCompose == "true")
-var IsOnLoclaWithOutDockerCompose = (goEnv == "development" && isDockerCompose == "")
-var IsOnLocal = (IsOnLoclaWithDockerCompose || IsOnLoclaWithOutDockerCompose)
+var IsOnLocalWithDockerCompose = (goEnv == "" && isDockerCompose == "true")
+var IsOnLocalWithOutDockerCompose = (goEnv == "development" && isDockerCompose == "")
+var IsOnLocal = (IsOnLocalWithDockerCompose || IsOnLocalWithOutDockerCompose)
 
 func GetEnvHostDomain() string {
 	if IsOnCloud {

t0016Go/interfaces/v1/controllers/common/vtuber_content.go

@@ -24,7 +24,7 @@ func ValidateVtuber(v domain.Vtuber) error {
 		))
 }
 
-func NomalizeMovie(m domain.Movie) domain.Movie {
+func NormalizeMovie(m domain.Movie) domain.Movie {
 	// m.VtuberId = strings.TrimSpace(m.SingStart)
 	m.MovieTitle = strings.TrimSpace(m.MovieTitle)
 	m.MovieUrl = strings.TrimSpace(m.MovieUrl)

t0016Go/useCase/vtuber_content_interactor.go

@@ -52,7 +52,7 @@ func (interactor *VtuberContentInteractor) CreateVtuber(v domain.Vtuber) error {
 	return nil
 }
 func (interactor *VtuberContentInteractor) CreateMovie(m domain.Movie) error {
-	m = common.NomalizeMovie(m)
+	m = common.NormalizeMovie(m)
 
 	if err := common.ValidateMovie(m); err != nil {
 		return err
@@ -90,7 +90,7 @@ func (interactor *VtuberContentInteractor) UpdateVtuber(v domain.Vtuber) error {
 }
 
 func (interactor *VtuberContentInteractor) UpdateMovie(m domain.Movie) error {
-	m = common.NomalizeMovie(m)
+	m = common.NormalizeMovie(m)
 
 	if err := common.ValidateMovie(m); err != nil {
 		return err