fix 401 screner (#2792)

* fix models
synapsecns · Jun 26, 2024 · f60de8c · f60de8c
1 parent 8d92615
commit f60de8c
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 51 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
+  "editor.fontLigatures": "'calt', 'liga', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08', 'ss09'",
   "editor.formatOnSave": true,
   "[typescript]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint"

diff --git a/contrib/screener-api/client/client.go b/contrib/screener-api/client/client.go
@@ -114,9 +114,13 @@ func (c clientImpl) BlacklistAddress(ctx context.Context, appsecret string, appi
 
 // BlackListBody is the json payload that represents a blacklisted address.
 type BlackListBody struct {
-	Type    string `json:"type"`
-	ID      string `json:"id"`
-	Data    string `json:"data"`
+	Type string `json:"type"`
+	ID   string `json:"id"`
+	Data Data   `json:"data"`
+}
+
+// Data is the data field in the BlackListBody.
+type Data struct {
 	Address string `json:"address"`
 	Network string `json:"network"`
 	Tag     string `json:"tag"`

diff --git a/contrib/screener-api/db/models.go b/contrib/screener-api/db/models.go
@@ -10,11 +10,10 @@ type BlacklistedAddress struct {
 	CreatedAt time.Time `json:"createdAt"`
 	UpdatedAt time.Time `json:"updatedAt"`
 
-	Type    string `gorm:"column:type"           json:"type"`
-	ID      string `gorm:"column:id;primary_key" json:"id"`
-	Data    string `gorm:"column:data"           json:"data"`
-	Address string `gorm:"column:address"        json:"address"`
-	Network string `gorm:"column:network"        json:"network"`
-	Tag     string `gorm:"column:tag"            json:"tag"`
-	Remark  string `gorm:"column:remark"         json:"remark"`
+	ID      string `gorm:"column:id;primaryKey" json:"id"`
+	Type    string `gorm:"column:type"          json:"type"`
+	Address string `gorm:"column:address"       json:"address"`
+	Network string `gorm:"column:network"       json:"network"`
+	Tag     string `gorm:"column:tag"           json:"tag"`
+	Remark  string `gorm:"column:remark"        json:"remark"`
 }
diff --git a/contrib/screener-api/db/sql/base/base.go b/contrib/screener-api/db/sql/base/base.go
@@ -56,7 +56,7 @@ func (s *Store) PutBlacklistedAddress(ctx context.Context, body db.BlacklistedAd
 				{Name: idName},
 			},
 			DoUpdates: clause.AssignmentColumns([]string{
-				idName, typeName, dataName, addressName, networkName, tagName, remarkName},
+				idName, typeName, dataAddressName, dataRemarkName, dataNetworkName, dataTagName},
 			),
 		}).Create(&body)
 	if dbTx.Error != nil {

diff --git a/contrib/screener-api/db/sql/base/namer.go b/contrib/screener-api/db/sql/base/namer.go
@@ -7,21 +7,19 @@ import (
 func init() {
 	namer := dbcommon.NewNamer(GetAllModels())
 
-	addressName = namer.GetConsistentName("Address")
 	typeName = namer.GetConsistentName("Type")
 	idName = namer.GetConsistentName("ID")
-	dataName = namer.GetConsistentName("Data")
-	networkName = namer.GetConsistentName("Network")
-	tagName = namer.GetConsistentName("Tag")
-	remarkName = namer.GetConsistentName("Remark")
+	dataAddressName = namer.GetConsistentName("Address")
+	dataNetworkName = namer.GetConsistentName("Network")
+	dataTagName = namer.GetConsistentName("Tag")
+	dataRemarkName = namer.GetConsistentName("Remark")
 }
 
 var (
-	addressName string
-	typeName    string
-	idName      string
-	dataName    string
-	networkName string
-	tagName     string
-	remarkName  string
+	typeName        string
+	idName          string
+	dataAddressName string
+	dataNetworkName string
+	dataTagName     string
+	dataRemarkName  string
 )
diff --git a/contrib/screener-api/screener/screener.go b/contrib/screener-api/screener/screener.go
@@ -277,26 +277,24 @@ func (s *screenerImpl) blacklistAddress(c *gin.Context) {
 	span.SetAttributes(
 		attribute.String("type", blacklistBody.Type),
 		(attribute.String("id", blacklistBody.ID)),
-		(attribute.String("data", blacklistBody.Data)),
-		(attribute.String("network", blacklistBody.Network)),
-		(attribute.String("tag", blacklistBody.Tag)),
-		(attribute.String("remark", blacklistBody.Remark)),
-		(attribute.String("address", blacklistBody.Address)),
+		(attribute.String("network", blacklistBody.Data.Network)),
+		(attribute.String("tag", blacklistBody.Data.Tag)),
+		(attribute.String("remark", blacklistBody.Data.Remark)),
+		(attribute.String("address", blacklistBody.Data.Address)),
 	)
 
 	blacklistedAddress := db.BlacklistedAddress{
 		Type:    blacklistBody.Type,
 		ID:      blacklistBody.ID,
-		Data:    blacklistBody.Data,
-		Network: blacklistBody.Network,
-		Tag:     blacklistBody.Tag,
-		Remark:  blacklistBody.Remark,
-		Address: strings.ToLower(blacklistBody.Address),
+		Network: blacklistBody.Data.Network,
+		Tag:     blacklistBody.Data.Tag,
+		Remark:  blacklistBody.Data.Remark,
+		Address: strings.ToLower(blacklistBody.Data.Address),
 	}
 
 	s.blacklistCacheMux.Lock()
 	defer s.blacklistCacheMux.Unlock()
-	s.blacklistCache[blacklistBody.Address] = true
+	s.blacklistCache[blacklistBody.Data.Address] = true
 
 	switch blacklistBody.Type {
 	case "create":
@@ -306,7 +304,7 @@ func (s *screenerImpl) blacklistAddress(c *gin.Context) {
 			return
 		}
 
-		span.AddEvent("blacklistedAddress", trace.WithAttributes(attribute.String("address", blacklistBody.Address)))
+		span.AddEvent("blacklistedAddress", trace.WithAttributes(attribute.String("address", blacklistBody.Data.Address)))
 		c.JSON(http.StatusOK, gin.H{"status": "success"})
 		return
 
@@ -317,7 +315,7 @@ func (s *screenerImpl) blacklistAddress(c *gin.Context) {
 			return
 		}
 
-		span.AddEvent("blacklistedAddress", trace.WithAttributes(attribute.String("address", blacklistBody.Address)))
+		span.AddEvent("blacklistedAddress", trace.WithAttributes(attribute.String("address", blacklistBody.Data.Address)))
 		c.JSON(http.StatusOK, gin.H{"status": "success"})
 		return
 
@@ -328,7 +326,7 @@ func (s *screenerImpl) blacklistAddress(c *gin.Context) {
 			return
 		}
 
-		span.AddEvent("blacklistedAddress", trace.WithAttributes(attribute.String("address", blacklistBody.Address)))
+		span.AddEvent("blacklistedAddress", trace.WithAttributes(attribute.String("address", blacklistBody.Data.Address)))
 		c.JSON(http.StatusOK, gin.H{"status": "success"})
 		return
 

diff --git a/contrib/screener-api/screener/suite_test.go b/contrib/screener-api/screener/suite_test.go
@@ -3,7 +3,6 @@ package screener_test
 import (
 	"context"
 	"crypto/rand"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"math/big"
@@ -198,23 +197,18 @@ func blacklistTestWithOperation(t *testing.T, operation string, apiClient client
 			return statuses, fmt.Errorf("error generating random number: %w", err)
 		}
 
-		dataMap := map[string]string{"key": fmt.Sprintf("value-%d", randomNumber)}
-		dataStr, err := json.Marshal(dataMap)
-		if err != nil {
-			return statuses, fmt.Errorf("error marshaling data: %w", err)
-		}
-
 		var body client.BlackListBody
 
 		if operation == "create" || operation == "update" {
 			body = client.BlackListBody{
-				Type:    operation,
-				ID:      fmt.Sprintf("unique-id-%d", randomNumber),
-				Data:    string(dataStr),
-				Address: fmt.Sprintf("address-%d", randomNumber),
-				Network: fmt.Sprintf("network-%d", randomNumber),
-				Tag:     fmt.Sprintf("tag-%d", randomNumber),
-				Remark:  "remark",
+				Type: operation,
+				ID:   fmt.Sprintf("unique-id-%d", randomNumber),
+				Data: client.Data{
+					Address: fmt.Sprintf("address-%d", randomNumber),
+					Network: fmt.Sprintf("network-%d", randomNumber),
+					Tag:     fmt.Sprintf("tag-%d", randomNumber),
+					Remark:  "remark",
+				},
 			}
 		} else {
 			body = client.BlackListBody{