Upstream sync

This commit is contained in:
Senad Uka
2023-09-18 12:27:40 +02:00
parent 9750aa2c37
commit 1f30f85787
30 changed files with 309 additions and 150 deletions

View File

@@ -11,36 +11,32 @@ import (
_ "github.com/jinzhu/gorm/dialects/postgres"
)
var db *gorm.DB
var err error
func Init() error{
host := config.AppConfig.Database.HostName
user := config.AppConfig.Database.UserName
func Init() error {
host := config.AppConfig.Database.HostName
user := config.AppConfig.Database.UserName
// port := config.AppConfig.Database.Port
dbName := config.AppConfig.Database.DatabaseName
password := config.AppConfig.Database.Password
dbName := config.AppConfig.Database.DatabaseName
password := config.AppConfig.Database.Password
dbString:= fmt.Sprintf("host=%s user=%s dbname=%s sslmode=disable password=%s",host,user,dbName,password)
dbString := fmt.Sprintf("host=%s user=%s dbname=%s sslmode=disable password=%s", host, user, dbName, password)
// db, err = gorm.Open("postgres", "host=localhost user=postgres dbname=postgres sslmode=disable password=root")
var err error
// //PostgreSQL
db, err = gorm.Open("postgres",dbString)
db, err = gorm.Open("postgres", dbString)
if err != nil {
log.Println("Error initializing the database: ", err)
return err
}
//TODO AUTOMIGRATE models once we have them
db.AutoMigrate(&models.User{}, &models.Company{}, &models.Device{}, &models.DeviceInfo{})
db.AutoMigrate(&models.User{}, &models.Company{}, &models.Device{}, &models.DeviceInfo{}, &models.Contract{}, &models.ContractInfo{})
return nil
}
func GetDb() *gorm.DB {
return db
}