storagenode/{console, reputation}: Add audit history to storagenode API

Change-Id: Id680b07feea380824e56496d545f46a94fdcc5d5
storj · Jan 4, 2021 · 710b868 · 710b868
1 parent a90d6fc
commit 710b868
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/storagenode/console/service.go b/storagenode/console/service.go
@@ -244,6 +244,7 @@ type Satellite struct {
 	Audit              reputation.Metric       `json:"audit"`
 	Uptime             reputation.Metric       `json:"uptime"`
 	OnlineScore        float64                 `json:"onlineScore"`
+	AuditHistory       reputation.AuditHistory `json:"auditHistory"`
 	PriceModel         PriceModel              `json:"priceModel"`
 	NodeJoinedAt       time.Time               `json:"nodeJoinedAt"`
 }
@@ -317,6 +318,7 @@ func (s *Service) GetSatelliteData(ctx context.Context, satelliteID storj.NodeID
 		Audit:              rep.Audit,
 		Uptime:             rep.Uptime,
 		OnlineScore:        rep.OnlineScore,
+		AuditHistory:       reputation.GetAuditHistoryFromPB(rep.AuditHistory),
 		PriceModel:         satellitePricing,
 		NodeJoinedAt:       rep.JoinedAt,
 	}, nil

diff --git a/storagenode/reputation/reputation.go b/storagenode/reputation/reputation.go
@@ -53,3 +53,33 @@ type Metric struct {
 	Score        float64 `json:"score"`
 	UnknownScore float64 `json:"unknownScore"`
 }
+
+// AuditHistory encapsulates storagenode audit history.
+type AuditHistory struct {
+	Score   float64              `json:"score"`
+	Windows []AuditHistoryWindow `json:"windows"`
+}
+
+// AuditHistoryWindow encapsulates storagenode audit history window.
+type AuditHistoryWindow struct {
+	WindowStart time.Time `json:"windowStart"`
+	TotalCount  int32     `json:"totalCount"`
+	OnlineCount int32     `json:"onlineCount"`
+}
+
+// GetAuditHistoryFromPB creates the AuditHistory json struct from a protobuf.
+func GetAuditHistoryFromPB(auditHistoryPB *pb.AuditHistory) AuditHistory {
+	ah := AuditHistory{}
+	if auditHistoryPB == nil {
+		return ah
+	}
+	ah.Score = auditHistoryPB.Score
+	for _, window := range auditHistoryPB.Windows {
+		ah.Windows = append(ah.Windows, AuditHistoryWindow{
+			WindowStart: window.WindowStart,
+			TotalCount:  window.TotalCount,
+			OnlineCount: window.OnlineCount,
+		})
+	}
+	return ah
+}