Merge pull request #1024 from threefoldtech/development_proxy_extraFe…

…eNodeAsDedicated consider nodes with extra-fees as dedicated
threefoldtech · May 21, 2024 · 412f1c2 · 412f1c2
2 parents c694a79 + 88009cd
commit 412f1c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/grid-proxy/internal/explorer/converters.go b/grid-proxy/internal/explorer/converters.go
@@ -75,7 +75,7 @@ func nodeFromDBNode(info db.Node) types.Node {
 		PriceUsd: math.Round(info.PriceUsd*1000) / 1000,
 	}
 	node.Status = nodestatus.DecideNodeStatus(node.Power, node.UpdatedAt)
-	node.Dedicated = info.FarmDedicated || info.NodeContractsCount == 0 || info.Renter != 0
+	node.Dedicated = info.FarmDedicated || info.NodeContractsCount == 0 || info.Renter != 0 || info.ExtraFee > 0
 	return node
 }
 
@@ -161,7 +161,7 @@ func nodeWithNestedCapacityFromDBNode(info db.Node) types.NodeWithNestedCapacity
 		PriceUsd: math.Round(info.PriceUsd*1000) / 1000,
 	}
 	node.Status = nodestatus.DecideNodeStatus(node.Power, node.UpdatedAt)
-	node.Dedicated = info.FarmDedicated || info.NodeContractsCount == 0 || info.Renter != 0
+	node.Dedicated = info.FarmDedicated || info.NodeContractsCount == 0 || info.Renter != 0 || info.ExtraFee > 0
 	return node
 }
 

diff --git a/grid-proxy/tests/queries/mock_client/nodes.go b/grid-proxy/tests/queries/mock_client/nodes.go
@@ -16,7 +16,8 @@ import (
 func isDedicatedNode(db DBData, node Node) bool {
 	return db.Farms[node.FarmID].DedicatedFarm ||
 		len(db.NonDeletedContracts[node.NodeID]) == 0 ||
-		db.NodeRentedBy[node.NodeID] != 0
+		db.NodeRentedBy[node.NodeID] != 0 ||
+		db.Nodes[node.NodeID].ExtraFee > 0
 }
 
 func isRentable(db DBData, node Node) bool {