update migartion and default cutoff time for online filter

Author: sameh-farouk

node-registrar/pkg/db/db.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
@@ -55,13 +54,6 @@ func NewDB(c Config) (Database, error) {
 		return Database{}, err
 	}
 
-	// Run the data migration for LastSeen field
-	count, err := db.MigrateNodeLastSeen()
-	if err != nil {
-		return Database{}, errors.Wrap(err, "failed to migrate node last seen data")
-	}
-	log.Info().Msgf("Migration: Updated LastSeen for %d nodes", count)
-
 	return db, sql.Ping()
 }
 
@@ -134,24 +126,3 @@ func (db Database) Close() error {
 func (db *Database) Transaction(fn func(tx *gorm.DB) error) error {
 	return db.gormDB.Transaction(fn)
 }
-
-// MigrateNodeLastSeen updates the LastSeen field for existing nodes that don't have it set
-func (db Database) MigrateNodeLastSeen() (int64, error) {
-	query := `
-        UPDATE nodes n
-        SET last_seen = (
-            SELECT MAX(timestamp)
-            FROM uptime_reports ur
-            WHERE ur.node_id = n.node_id
-        )
-        WHERE (last_seen IS NULL OR last_seen = '0001-01-01 00:00:00+00')
-        AND EXISTS (
-            SELECT 1
-            FROM uptime_reports ur
-            WHERE ur.node_id = n.node_id
-        )
-    `
-
-	result := db.gormDB.Exec(query)
-	return result.RowsAffected, result.Error
-}

node-registrar/pkg/db/migrate.go

@@ -4,6 +4,8 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
+	"gorm.io/gorm"
 )
 
 func (db Database) autoMigrate() error {
@@ -21,12 +23,18 @@ func (db Database) autoMigrate() error {
 		return err
 	}
 
+	err := db.MigrateNodeLastSeen()
+	if err != nil {
+		return errors.Wrap(err, "failed to migrate node last seen data")
+	}
+
 	return nil
 }
 
 func (db Database) migrateNodes() error {
 	// if nodes are already migrated skip migration
 	if result := db.gormDB.First(&Node{}); result.Error == nil {
+		log.Info().Msg("nodes Interfaces are already migrated")
 		return nil
 	}
 
@@ -36,56 +44,63 @@ func (db Database) migrateNodes() error {
 		IPs  string `json:"ips"`
 	}
 
+	//  we'd only load the data we actually need from the database
 	type nodeType struct {
-		NodeID uint64 `json:"node_id" gorm:"primaryKey;autoIncrement"`
-		FarmID uint64 `json:"farm_id" gorm:"not null;check:farm_id> 0;foreignKey:FarmID;references:FarmID;constraint:OnDelete:RESTRICT"`
-		TwinID uint64 `json:"twin_id" gorm:"not null;unique;check:twin_id > 0;foreignKey:TwinID;references:TwinID;constraint:OnDelete:RESTRICT"`
-
-		Location Location `json:"location" gorm:"not null;type:json;serializer:json"`
-
-		Resources    Resources      `json:"resources" gorm:"not null;type:json;serializer:json"`
-		Interfaces   []oldInterface `gorm:"not null;type:json;serializer:json"`
-		SecureBoot   bool           `json:"secure_boot"`
-		Virtualized  bool           `json:"virtualized"`
-		SerialNumber string         `json:"serial_number"`
-
-		Approved bool `json:"approved"`
+		NodeID     uint64         `json:"node_id" gorm:"primaryKey"`
+		Interfaces []oldInterface `gorm:"not null;type:json;serializer:json"`
 	}
 
-	var nodes []nodeType
-	result := db.gormDB.Model(&Node{}).Find(&nodes)
-	if result.Error != nil {
-		return result.Error
-	}
+	// Use a single transaction for all updates to ensure atomicity
+	return db.Transaction(func(tx *gorm.DB) error {
+		var nodes []nodeType
+		if err := tx.Model(&Node{}).Find(&nodes).Error; err != nil {
+			return err
+		}
 
-	for _, node := range nodes {
-		var interfaces []Interface
-		for _, i := range node.Interfaces {
-			ips := strings.Split(i.IPs, "/")
-			newInterface := Interface{
-				Name: i.Name,
-				Mac:  i.Mac,
-				IPs:  ips,
+		for _, node := range nodes {
+			var interfaces []Interface
+			for _, i := range node.Interfaces {
+				ips := strings.Split(i.IPs, "/")
+				newInterface := Interface{
+					Name: i.Name,
+					Mac:  i.Mac,
+					IPs:  ips,
+				}
+				interfaces = append(interfaces, newInterface)
 			}
-			interfaces = append(interfaces, newInterface)
-		}
 
-		updatedNode := Node{
-			NodeID:      node.NodeID,
-			FarmID:      node.FarmID,
-			TwinID:      node.TwinID,
-			Location:    node.Location,
-			Resources:   node.Resources,
-			Interfaces:  interfaces,
-			SecureBoot:  node.SecureBoot,
-			Virtualized: node.Virtualized,
-			Approved:    node.Approved,
+			// Update only the interfaces field
+			if err := tx.Model(&Node{}).
+				Where("node_id = ?", node.NodeID).
+				Update("interfaces", interfaces).Error; err != nil {
+				return err // This will roll back the entire transaction
+			}
 		}
 
-		err := db.gormDB.Model(&Node{}).Where("node_id = ?", node.NodeID).Updates(updatedNode).Error
-		if err != nil {
-			return err
-		}
+		return nil
+	})
+}
+
+// MigrateNodeLastSeen updates the LastSeen field for existing nodes that don't have it set
+func (db Database) MigrateNodeLastSeen() error {
+	query := `
+        UPDATE nodes n
+        SET last_seen = (
+            SELECT MAX(timestamp)
+            FROM uptime_reports ur
+            WHERE ur.node_id = n.node_id
+        )
+        WHERE (last_seen IS NULL OR last_seen = '0001-01-01 00:00:00+00')
+        AND EXISTS (
+            SELECT 1
+            FROM uptime_reports ur
+            WHERE ur.node_id = n.node_id
+        )
+    `
+
+	result := db.gormDB.Exec(query)
+	if result.Error == nil {
+		log.Info().Msgf("Migration: Updated LastSeen for %d nodes", result.RowsAffected)
 	}
-	return nil
+	return result.Error
 }

node-registrar/pkg/db/nodes.go

@@ -25,8 +25,8 @@ func (db *Database) ListNodes(filter NodeFilter, limit Limit) (nodes []Node, err
 
 	// Filter by online status (node sent an uptime report in the last 30 minutes)
 	if filter.Online != nil {
-		// Calculate the cutoff time (30 minutes ago by default)
-		cutoffMinutes := int64(30) // Default to 30 minutes
+		// Calculate the cutoff time (40 minutes ago by default)
+		cutoffMinutes := int64(40) // Default to 40 minutes
 		if filter.LastSeen != nil {
 			cutoffMinutes = *filter.LastSeen
 		}