many new

database/psql/users.go

@@ -13,17 +13,16 @@ import (
 )
 
 type User struct {
-	ID         int
-	TelegramID int `gorm:"column:tg_id"`
-	Balance    decimal.Decimal
-	Name       string
-	GroupID    int `gorm:"default:1"`
-	Group      *Group
-	Level      int `gorm:"default:1"`
-	Exp        int `gorm:"default:0"`
-	WorkID     int `gorm:"default:1"`
-	Work       *Work
-	WorkTime   time.Time
+	ID       int
+	Balance  decimal.Decimal
+	Name     string
+	GroupID  int `gorm:"default:1"`
+	Group    *Group
+	Level    int `gorm:"default:1"`
+	Exp      int `gorm:"default:0"`
+	WorkID   int `gorm:"default:1"`
+	Work     *Work
+	WorkTime time.Time
 
 	AutoID     sql.NullInt64
 	Auto       *ShopAuto
@@ -64,10 +63,10 @@ func GetOrCreateUser(tgId int, name string) (*User, error) {
 	return user, err
 }
 
-func CreateUser(tgId int, name string) (*User, error) {
+func CreateUser(id int, name string) (*User, error) {
 	user := &User{
-		TelegramID: tgId,
-		Name:       name,
+		ID:   id,
+		Name: name,
 	}
 	tx := database.PostgresDatabase.Create(user)
 	return user, tx.Error
@@ -75,7 +74,7 @@ func CreateUser(tgId int, name string) (*User, error) {
 
 func GetUser(telegramId int) (*User, error) {
 	user := new(User)
-	tx := database.PostgresDatabase.Joins("Group").Joins("Work").Joins("Auto").Joins("Business").Joins("Maid").Joins("Miner").Joins("Fraction").Preload("Pair").Take(user, "tg_id=?", telegramId)
+	tx := database.PostgresDatabase.Joins("Group").Joins("Work").Joins("Auto").Joins("Business").Joins("Maid").Joins("Miner").Joins("Fraction").Preload("Pair").Take(user, "users.id=?", telegramId)
 	return user, tx.Error
 }