Merge pull request #31 from lidofinance/feat/unique-key

Feat/unique key
lidofinance · Oct 8, 2024 · 1ecd683 · 1ecd683
2 parents e7e312c + 63d7f31
commit 1ecd683
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/brief/databus/finding.dto.json b/brief/databus/finding.dto.json
@@ -24,6 +24,9 @@
     "blockNumber": {
       "type": "integer"
     },
+    "findingBotTimestamp": {
+      "type": "integer"
+    },
     "txHash": {
       "type": "string"
     },

diff --git a/generated/databus/finding.dto.go b/generated/databus/finding.dto.go
diff --git a/internal/app/worker/worker.go b/internal/app/worker/worker.go
@@ -1,6 +1,7 @@
 package worker
 
 import (
+	"bytes"
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
@@ -161,8 +162,7 @@ func (w *findingWorker) Run(ctx context.Context, g *errgroup.Group) error {
 					return
 				}
 
-				// TODO to think on better hashing fields
-				key := computeSHA256Hash(msg.Data())
+				key := findingToUniqueHash(finding)
 
 				countKey := fmt.Sprintf(countTemplate, consumer.Name, key)
 				statusKey := fmt.Sprintf(statusTemplate, consumer.Name, key)
@@ -408,6 +408,24 @@ func computeSHA256Hash(data []byte) string {
 	return hex.EncodeToString(hash[:])
 }
 
+func findingToUniqueHash(f *databus.FindingDtoJson) string {
+	var buffer bytes.Buffer
+
+	if f.UniqueKey != nil {
+		return *f.UniqueKey
+	}
+
+	buffer.WriteString(f.Team)
+	buffer.WriteString(f.BotName)
+	buffer.WriteString(f.AlertId)
+	buffer.WriteString(f.Name)
+	buffer.WriteString(string(f.Severity))
+
+	uniqueKey := computeSHA256Hash(buffer.Bytes())
+
+	return uniqueKey
+}
+
 func (w *findingWorker) SetSendingStatus(ctx context.Context, countKey, statusKey string) (bool, error) {
 	luaScript := `
         local count = tonumber(redis.call("GET", KEYS[1]))