From b922d986d6783ce28d00ca948024dee44a11f29e Mon Sep 17 00:00:00 2001
From: Zahar Izmailov <izmailov9@gmail.com>
Date: Mon, 3 Feb 2025 15:36:03 +0300
Subject: Improved database model migration and added indexing (#2655)

---
 database/db.go | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'database/db.go')

diff --git a/database/db.go b/database/db.go
index 1998ba23..d252cfe0 100644
--- a/database/db.go
+++ b/database/db.go
@@ -26,20 +26,35 @@ const (
 )
 
 func initModels() error {
-	models := []interface{}{
+	// Order matters: first create tables without dependencies
+	baseModels := []interface{}{
 		&model.User{},
+		&model.Setting{},
+	}
+
+	// Migrate base models
+	for _, model := range baseModels {
+		if err := db.AutoMigrate(model); err != nil {
+			log.Printf("Error auto migrating base model: %v", err)
+			return err
+		}
+	}
+
+	// Then migrate models with dependencies
+	dependentModels := []interface{}{
 		&model.Inbound{},
 		&model.OutboundTraffics{},
-		&model.Setting{},
 		&model.InboundClientIps{},
 		&xray.ClientTraffic{},
 	}
-	for _, model := range models {
+
+	for _, model := range dependentModels {
 		if err := db.AutoMigrate(model); err != nil {
-			log.Printf("Error auto migrating model: %v", err)
+			log.Printf("Error auto migrating dependent model: %v", err)
 			return err
 		}
 	}
+
 	return nil
 }
 
-- 
cgit v1.2.3