🐛 fix(linter): fix errors >>> ⏰ 10m

TimeleapLabs · Jun 24, 2024 · b2d0cfc · b2d0cfc
1 parent ca4d924
commit b2d0cfc
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 12 deletions.
diff --git a/internal/model/dataframe.go b/internal/model/dataframe.go
@@ -1,8 +1,13 @@
 package model
 
-import "time"
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
 
 type DataFrame struct {
+	gorm.Model
 	Hash      []byte      `bson:"hash"      json:"hash"`
 	Timestamp time.Time   `bson:"timestamp" json:"timestamp"`
 	Data      interface{} `bson:"data"      gorm:"embedded"  json:"data"`

diff --git a/internal/model/proof.go b/internal/model/proof.go
@@ -1,8 +1,14 @@
 package model
 
-import "time"
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
 
 type Proof struct {
+	gorm.Model
+
 	Hash      []byte    `bson:"hash"      json:"hash"`
 	Timestamp time.Time `bson:"timestamp" json:"timestamp"`
 	Signature [48]byte  `bson:"signature" json:"signature"`

diff --git a/internal/model/signer.go b/internal/model/signer.go
@@ -2,9 +2,11 @@ package model
 
 import (
 	sia "github.com/pouya-eghbali/go-sia/v2/pkg"
+	"gorm.io/gorm"
 )
 
 type Signer struct {
+	gorm.Model
 	Name           string
 	EvmAddress     string
 	PublicKey      [96]byte

diff --git a/internal/repository/mongo/assetprice.go b/internal/repository/mongo/assetprice.go
@@ -58,8 +58,8 @@ func (a AssetPriceRepo) Upsert(ctx context.Context, data model.AssetPrice) error
 	return nil
 }
 
-func (a AssetPriceRepo) Find(ctx context.Context, block uint64, chain string, name string, pair string) ([]*ent.AssetPrice, error) {
-	currentRecords := []*ent.AssetPrice{}
+func (a AssetPriceRepo) Find(ctx context.Context, block uint64, chain string, name string, pair string) ([]model.AssetPrice, error) {
+	currentRecords := []model.AssetPrice{}
 	cursor, err := a.client.
 		GetConnection().
 		Database(config.App.Mongo.Database).
@@ -83,14 +83,14 @@ func (a AssetPriceRepo) Find(ctx context.Context, block uint64, chain string, na
 		}
 	}(cursor, ctx)
 	for cursor.Next(ctx) {
-		var result ent.AssetPrice
+		var result model.AssetPrice
 		err := cursor.Decode(&result)
 		if err != nil {
 			utils.Logger.With("err", err).Error("Cant decode signer record")
 			return nil, err
 		}
 
-		currentRecords = append(currentRecords, &result)
+		currentRecords = append(currentRecords, result)
 	}
 	if err := cursor.Err(); err != nil {
 		utils.Logger.With("err", err).Error("Cant fetch asset price records from database")

diff --git a/internal/repository/mongo/correctness.go b/internal/repository/mongo/correctness.go
@@ -18,7 +18,7 @@ type CorrectnessRepo struct {
 	client database.MongoDatabase
 }
 
-func (c CorrectnessRepo) Find(ctx context.Context, hash []byte, topic []byte, timestamp uint64) ([]*ent.CorrectnessReport, error) {
+func (c CorrectnessRepo) Find(ctx context.Context, hash []byte, topic []byte, timestamp uint64) ([]model.Correctness, error) {
 	cursor, err := c.client.
 		GetConnection().
 		Database(config.App.Mongo.Database).
@@ -34,7 +34,7 @@ func (c CorrectnessRepo) Find(ctx context.Context, hash []byte, topic []byte, ti
 		return nil, consts.ErrInternalError
 	}
 
-	currentRecords, err := CursorToList[*ent.CorrectnessReport](ctx, cursor)
+	currentRecords, err := CursorToList[model.Correctness](ctx, cursor)
 	if err != nil {
 		utils.Logger.With("err", err).Error("Cant fetch correctness reports from database")
 		return nil, consts.ErrInternalError

diff --git a/internal/repository/mongo/eventlog.go b/internal/repository/mongo/eventlog.go
@@ -18,7 +18,7 @@ type EventLogRepo struct {
 	client database.MongoDatabase
 }
 
-func (r EventLogRepo) Find(ctx context.Context, block uint64, hash []byte, index uint64) ([]*ent.EventLog, error) {
+func (r EventLogRepo) Find(ctx context.Context, block uint64, hash []byte, index uint64) ([]model.EventLog, error) {
 	cursor, err := r.client.
 		GetConnection().
 		Database(config.App.Mongo.Database).
@@ -34,7 +34,7 @@ func (r EventLogRepo) Find(ctx context.Context, block uint64, hash []byte, index
 		return nil, consts.ErrInternalError
 	}
 
-	currentRecords, err := CursorToList[*ent.EventLog](ctx, cursor)
+	currentRecords, err := CursorToList[model.EventLog](ctx, cursor)
 	if err != nil {
 		utils.Logger.With("err", err).Error("Cant fetch event log records from database")
 		return nil, consts.ErrInternalError

diff --git a/internal/repository/mongo/signer.go b/internal/repository/mongo/signer.go
@@ -74,14 +74,14 @@ func (s signerRepo) GetSingerIDsByKeys(ctx context.Context, keys [][]byte) ([]in
 		}
 	}(cursor, ctx)
 	for cursor.Next(ctx) {
-		var result ent.Signer
+		var result model.Signer
 		err := cursor.Decode(&result)
 		if err != nil {
 			utils.Logger.With("err", err).Error("Cant decode signer record")
 			return nil, err
 		}
 
-		ids = append(ids, result.ID)
+		ids = append(ids, int(result.ID))
 	}
 	if err := cursor.Err(); err != nil {
 		utils.Logger.With("err", err).Error("Cant fetch asset price records from database")