Improved database model migration and added indexing (#2655)

1 files changed, 19 insertions, 4 deletions

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
 }