Merge pull request #259 from systemli/Adjust-Database-Table-Name

🗃️ Adjust Database Table Name
systemli · Oct 22, 2023 · 2f11138 · 2f11138
2 parents 66793e4 + c37d3a9
commit 2f11138
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/internal/legacy/migration.go b/internal/legacy/migration.go
@@ -62,10 +62,8 @@ func (m *Migration) Do() error {
 				},
 			},
 			Location: storage.TickerLocation{
-				CreatedAt: oldTicker.CreationDate,
-				UpdatedAt: time.Now(),
-				Lat:       oldTicker.Location.Lat,
-				Lon:       oldTicker.Location.Lon,
+				Lat: oldTicker.Location.Lat,
+				Lon: oldTicker.Location.Lon,
 			},
 		}
 

diff --git a/internal/storage/migrations.go b/internal/storage/migrations.go
@@ -6,7 +6,6 @@ import "gorm.io/gorm"
 func MigrateDB(db *gorm.DB) error {
 	return db.AutoMigrate(
 		&Ticker{},
-		&TickerInformation{},
 		&TickerMastodon{},
 		&TickerTelegram{},
 		&User{},

diff --git a/internal/storage/ticker.go b/internal/storage/ticker.go
@@ -13,10 +13,10 @@ type Ticker struct {
 	Description string
 	Active      bool
 	Information TickerInformation `gorm:"embedded"`
+	Location    TickerLocation    `gorm:"embedded"`
 	Telegram    TickerTelegram
 	Mastodon    TickerMastodon
-	Location    TickerLocation `gorm:"embedded"`
-	Users       []User         `gorm:"many2many:user_tickers;"`
+	Users       []User `gorm:"many2many:ticker_users;"`
 }
 
 func NewTicker() Ticker {
@@ -93,10 +93,6 @@ func (m *TickerMastodon) Reset() {
 }
 
 type TickerLocation struct {
-	ID        int `gorm:"primaryKey"`
-	CreatedAt time.Time
-	UpdatedAt time.Time
-	TickerID  int
-	Lat       float64
-	Lon       float64
+	Lat float64
+	Lon float64
 }
diff --git a/internal/storage/user.go b/internal/storage/user.go
@@ -13,7 +13,7 @@ type User struct {
 	Email             string `storm:"unique"`
 	EncryptedPassword string
 	IsSuperAdmin      bool
-	Tickers           []Ticker `gorm:"many2many:user_tickers;"`
+	Tickers           []Ticker `gorm:"many2many:ticker_users;"`
 }
 
 func NewUser(email, password string) (User, error) {