Change ticket updates API (#973)

baking-bad · Apr 16, 2023 · a4330ba · a4330ba
1 parent 7f10779
commit a4330ba
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 11 deletions.
diff --git a/cmd/api/handlers/contract.go b/cmd/api/handlers/contract.go
@@ -144,7 +144,7 @@ func contractWithStatsPostprocessing(ctxs config.Contexts, ctx *config.Context,
 	if err != nil {
 		return ContractWithStats{}, err
 	}
-	res := ContractWithStats{c, 0, 0}
+	res := ContractWithStats{c, 0, 0, false}
 
 	eventsCount, err := ctx.Operations.EventsCount(contractModel.AccountID)
 	if err != nil {
@@ -157,5 +157,12 @@ func contractWithStatsPostprocessing(ctxs config.Contexts, ctx *config.Context,
 		return res, err
 	}
 	res.SameCount += int64(stats)
+
+	hasTicketUpdates, err := ctx.TicketUpdates.Has(contractModel.AccountID)
+	if err != nil {
+		return res, err
+	}
+	res.HasTicketUpdates = hasTicketUpdates
+
 	return res, nil
 }
diff --git a/cmd/api/handlers/responses.go b/cmd/api/handlers/responses.go
@@ -195,8 +195,9 @@ func (c *Contract) FromModel(contract contract.Contract) {
 type ContractWithStats struct {
 	Contract
 
-	SameCount   int64 `json:"same_count"`
-	EventsCount int   `json:"events_count"`
+	SameCount        int64 `json:"same_count"`
+	EventsCount      int   `json:"events_count"`
+	HasTicketUpdates bool  `json:"has_ticket_updates"`
 }
 
 // RecentlyCalledContract -
@@ -660,14 +661,15 @@ func NewEvent(o operation.Operation) (*Event, error) {
 
 // TicketUpdate -
 type TicketUpdate struct {
-	ID          int64           `json:"id"`
-	Level       int64           `json:"level"`
-	Timestamp   time.Time       `json:"timestamp"`
-	Ticketer    string          `json:"ticketer"`
-	Address     string          `json:"address"`
-	Amount      string          `json:"amount"`
-	ContentType []ast.Typedef   `json:"content_type"`
-	Content     *ast.MiguelNode `json:"content,omitempty"`
+	ID            int64           `json:"id"`
+	Level         int64           `json:"level"`
+	Timestamp     time.Time       `json:"timestamp"`
+	Ticketer      string          `json:"ticketer"`
+	Address       string          `json:"address"`
+	Amount        string          `json:"amount"`
+	OperationHash string          `json:"operation_hash"`
+	ContentType   []ast.Typedef   `json:"content_type"`
+	Content       *ast.MiguelNode `json:"content,omitempty"`
 }
 
 // NewTicketUpdateFromModel -

diff --git a/cmd/api/handlers/tickets.go b/cmd/api/handlers/tickets.go
@@ -68,6 +68,12 @@ func GetContractTicketUpdates() gin.HandlerFunc {
 				update.Content = contentMiguel[0]
 			}
 
+			operation, err := ctx.Operations.GetByID(updates[i].OperationID)
+			if handleError(c, ctx.Storage, err, 0) {
+				return
+			}
+			update.OperationHash = operation.Hash
+
 			response = append(response, update)
 		}
 

diff --git a/internal/models/ticket/repository.go b/internal/models/ticket/repository.go
@@ -3,4 +3,5 @@ package ticket
 // Repository -
 type Repository interface {
 	Get(ticketer string, limit, offset int64) ([]TicketUpdate, error)
+	Has(contractID int64) (bool, error)
 }
diff --git a/internal/postgres/ticket/storage.go b/internal/postgres/ticket/storage.go
@@ -34,3 +34,23 @@ func (storage *Storage) Get(ticketer string, limit, offset int64) ([]ticket.Tick
 	err := query.Order("id desc").Select(&response)
 	return response, err
 }
+
+// Has -
+func (storage *Storage) Has(contractID int64) (bool, error) {
+	var id int64
+	err := storage.DB.
+		Model((*ticket.TicketUpdate)(nil)).
+		Column("id").
+		Where("ticketer_id = ?", contractID).
+		OrderExpr("id ASC").
+		Limit(1).
+		Select(&id)
+
+	if err != nil {
+		if storage.IsRecordNotFound(err) {
+			return false, nil
+		}
+		return false, err
+	}
+	return true, nil
+}