Bugfixes. Optimizations/refactor. Add redis for player-cache. Add docker files. Replace sqlite dep. Single-Calc for existing players. Game-Metrics in JSON.
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"InfantrySkillCalculator/utils"
|
||||
"context"
|
||||
"github.com/glebarez/sqlite"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
"log"
|
||||
"os"
|
||||
)
|
||||
|
||||
var DB *gorm.DB
|
||||
@@ -33,10 +33,6 @@ func ConnectDatabase() {
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
err = database.AutoMigrate(&PlayerCache{})
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
err = database.AutoMigrate(&User{})
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
@@ -44,13 +40,6 @@ func ConnectDatabase() {
|
||||
err = database.AutoMigrate(&ActivationCode{})
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
} else {
|
||||
var code ActivationCode
|
||||
if err := database.First(&code).Error; err != nil {
|
||||
firstCode := utils.GenerateActivationCode()
|
||||
database.Create(&ActivationCode{Code: firstCode, UserRole: AdminRole})
|
||||
log.Println("Created first activation code with ADMIN role:\n" + firstCode)
|
||||
}
|
||||
}
|
||||
err = database.AutoMigrate(&Game{})
|
||||
if err != nil {
|
||||
@@ -64,10 +53,6 @@ func ConnectDatabase() {
|
||||
}
|
||||
}
|
||||
|
||||
err = database.AutoMigrate(&MetricSetting{})
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
err = database.AutoMigrate(&UserSettings{})
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
@@ -77,8 +62,17 @@ func ConnectDatabase() {
|
||||
}
|
||||
|
||||
func ConnectCache() {
|
||||
address := os.Getenv("REDIS_ADDRESS")
|
||||
if address == "" {
|
||||
address = "127.0.0.1"
|
||||
}
|
||||
port := os.Getenv("REDIS_PORT")
|
||||
if port == "" {
|
||||
port = "6379"
|
||||
}
|
||||
|
||||
Cache = redis.NewClient(&redis.Options{
|
||||
Addr: "127.0.0.1:6379",
|
||||
Addr: address + ":" + port,
|
||||
Password: "",
|
||||
DB: 0,
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user