Merge pull request #430 from traPtitech/fix/location

🐛 add loc
traPtitech · Jun 27, 2023 · 7c5e651 · 7c5e651
2 parents 4259ae3 + 87b3b05
commit 7c5e651
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/infra/db/db.go b/infra/db/db.go
@@ -1,6 +1,8 @@
 package db
 
 import (
+	"time"
+
 	gomysql "github.com/go-sql-driver/mysql"
 	"github.com/traPtitech/knoQ/migration"
 	"gorm.io/driver/mysql"
@@ -15,7 +17,7 @@ type GormRepository struct {
 
 var tokenKey []byte
 
-func (repo *GormRepository) Setup(host, user, password, database, port, key, logLevel string) error {
+func (repo *GormRepository) Setup(host, user, password, database, port, key, logLevel string, loc *time.Location) error {
 	loglevel := func() logger.LogLevel {
 		switch logLevel {
 		case "slient":
@@ -43,6 +45,7 @@ func (repo *GormRepository) Setup(host, user, password, database, port, key, log
 			Net:                  "tcp",
 			Addr:                 host + ":" + port,
 			DBName:               database,
+			Loc:                  loc,
 			AllowNativePasswords: true,
 			ParseTime:            true,
 		},

diff --git a/main.go b/main.go
@@ -42,6 +42,8 @@ var (
 	webhookSecret     = getenv("WEBHOOK_SECRET", "")
 	activityChannelID = getenv("ACTIVITY_CHANNEL_ID", "")
 	dailyChannelID    = getenv("DAILY_CHANNEL_ID", "")
+
+	jst, _ = time.LoadLocation("Asia/Tokyo")
 )
 
 func main() {
@@ -51,7 +53,7 @@ func main() {
 	domain.DEVELOPMENT, _ = strconv.ParseBool(development)
 
 	gormRepo := db.GormRepository{}
-	err := gormRepo.Setup(mariadbHost, mariadbUser, mariadbPassword, mariadbDatabase, mariadbPort, tokenKey, gormLogLevel)
+	err := gormRepo.Setup(mariadbHost, mariadbUser, mariadbPassword, mariadbDatabase, mariadbPort, tokenKey, gormLogLevel, jst)
 	if err != nil {
 		panic(err)
 	}