From bf9a93c41bb3875ea0e3f2b40aa0bf7a52703bee Mon Sep 17 00:00:00 2001
From: Abhishek Kondur <abhi281342@gmail.com>
Date: Thu, 12 Jan 2023 14:49:10 +0530
Subject: [PATCH] remove IsServer field from metric model

---
 logic/metrics/metrics.go | 2 --
 models/metrics.go        | 2 --
 mq/handlers.go           | 1 -
 3 files changed, 5 deletions(-)

diff --git a/logic/metrics/metrics.go b/logic/metrics/metrics.go
index f097996c..05261b82 100644
--- a/logic/metrics/metrics.go
+++ b/logic/metrics/metrics.go
@@ -40,7 +40,6 @@ func Collect(iface, server, network string, peerMap models.PeerMap) (*models.Met
 		proxyMetrics := proxy_metrics.GetMetric(server, currPeer.PublicKey.String())
 		var newMetric = models.Metric{
 			NodeName: peerMap[currPeer.PublicKey.String()].Name,
-			IsServer: peerMap[currPeer.PublicKey.String()].IsServer,
 		}
 		logger.Log(2, "collecting metrics for peer", address)
 		newMetric.TotalReceived = int64(proxyMetrics.TrafficRecieved)
@@ -116,7 +115,6 @@ func fillUnconnectedData(metrics *models.Metrics, peerMap models.PeerMap) {
 		if !metrics.Connectivity[id].Connected {
 			newMetric := models.Metric{
 				NodeName:  peerMap[r].Name,
-				IsServer:  peerMap[r].IsServer,
 				Uptime:    0,
 				TotalTime: 1,
 				Connected: false,
diff --git a/models/metrics.go b/models/metrics.go
index 67fee9b3..b633a69b 100644
--- a/models/metrics.go
+++ b/models/metrics.go
@@ -9,7 +9,6 @@ type Metrics struct {
 	Network       string            `json:"network" bson:"network" yaml:"network"`
 	NodeID        string            `json:"node_id" bson:"node_id" yaml:"node_id"`
 	NodeName      string            `json:"node_name" bson:"node_name" yaml:"node_name"`
-	IsServer      string            `json:"isserver" bson:"isserver" yaml:"isserver" validate:"checkyesorno"`
 	Connectivity  map[string]Metric `json:"connectivity" bson:"connectivity" yaml:"connectivity"`
 	FailoverPeers map[string]string `json:"needsfailover" bson:"needsfailover" yaml:"needsfailover"`
 }
@@ -17,7 +16,6 @@ type Metrics struct {
 // Metric - holds a metric for data between nodes
 type Metric struct {
 	NodeName      string        `json:"node_name" bson:"node_name" yaml:"node_name"`
-	IsServer      string        `json:"isserver" bson:"isserver" yaml:"isserver" validate:"checkyesorno"`
 	Uptime        int64         `json:"uptime" bson:"uptime" yaml:"uptime"`
 	TotalTime     int64         `json:"totaltime" bson:"totaltime" yaml:"totaltime"`
 	Latency       int64         `json:"latency" bson:"latency" yaml:"latency"`
diff --git a/mq/handlers.go b/mq/handlers.go
index 3263d705..49300618 100644
--- a/mq/handlers.go
+++ b/mq/handlers.go
@@ -248,7 +248,6 @@ func updateNodeMetrics(currentNode *models.Node, newMetrics *models.Metrics) boo
 				}
 			}
 			extMetric.NodeName = attachedClients[i].ClientID
-			extMetric.IsServer = "no"
 			delete(newMetrics.Connectivity, attachedClients[i].PublicKey)
 			newMetrics.Connectivity[attachedClients[i].ClientID] = extMetric
 		}