Chore/cancel partial filled adds to user filled orders (#138)

* Cancelling a partially filled order adds that order to user's filled orders set * Update tests
orbs-network · Feb 22, 2024 · 3980fa9 · 3980fa9
1 parent 68b5da8
commit 3980fa9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/data/redisrepo/cancel_orders_for_user_test.go b/data/redisrepo/cancel_orders_for_user_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/go-redis/redismock/v9"
 	"github.com/orbs-network/order-book/mocks"
 	"github.com/orbs-network/order-book/models"
+	"github.com/redis/go-redis/v9"
 	"github.com/shopspring/decimal"
 	"github.com/stretchr/testify/assert"
 )
@@ -85,6 +86,10 @@ func TestRedisRepository_CancelAllOrdersForUser(t *testing.T) {
 		mock.ExpectHSet(CreateOrderIDKey(partialFilledOrder.Id), "cancelled", "true").SetVal(1)
 		mock.ExpectZRem(CreateBuySidePricesKey(mocks.Symbol), partialFilledOrder.Id.String()).SetVal(1)
 		mock.ExpectZRem(CreateUserOpenOrdersKey(mocks.UserId), partialFilledOrder.Id.String()).SetVal(1)
+		mock.ExpectZAdd(CreateUserFilledOrdersKey(partialFilledOrder.UserId), redis.Z{
+			Score:  float64(partialFilledOrder.Timestamp.UTC().UnixNano()),
+			Member: partialFilledOrder.Id.String(),
+		}).SetVal(1)
 		mock.ExpectTxPipelineExec()
 
 		orderIds, err := repo.CancelOrdersForUser(ctx, mocks.UserId)

diff --git a/data/redisrepo/cancel_partial_filled_order.go b/data/redisrepo/cancel_partial_filled_order.go
@@ -7,6 +7,7 @@ import (
 	"github.com/orbs-network/order-book/models"
 	"github.com/orbs-network/order-book/utils/logger"
 	"github.com/orbs-network/order-book/utils/logger/logctx"
+	"github.com/redis/go-redis/v9"
 )
 
 // Cancels a partial filled order.
@@ -44,13 +45,13 @@ func (r *redisRepository) CancelPartialFilledOrder(ctx context.Context, order mo
 	userOrdersKey := CreateUserOpenOrdersKey(order.UserId)
 	transaction.ZRem(ctx, userOrdersKey, order.Id.String())
 
-	// TODO: add to filled orders set
-	// userFilledOrdersKey := CreateUserFilledOrdersKey(order.UserId)
-	// userFilledOrdersScore := float64(order.Timestamp.UTC().UnixNano())
-	// transaction.ZAdd(ctx, userFilledOrdersKey, redis.Z{
-	// 	Score:  userFilledOrdersScore,
-	// 	Member: order.Id.String(),
-	// })
+	// add to filled orders set
+	userFilledOrdersKey := CreateUserFilledOrdersKey(order.UserId)
+	userFilledOrdersScore := float64(order.Timestamp.UTC().UnixNano())
+	transaction.ZAdd(ctx, userFilledOrdersKey, redis.Z{
+		Score:  userFilledOrdersScore,
+		Member: order.Id.String(),
+	})
 
 	_, err := transaction.Exec(ctx)
 

diff --git a/data/redisrepo/cancel_partial_filled_order_test.go b/data/redisrepo/cancel_partial_filled_order_test.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/go-redis/redismock/v9"
 	"github.com/orbs-network/order-book/models"
+	"github.com/redis/go-redis/v9"
 	"github.com/shopspring/decimal"
 	"github.com/stretchr/testify/assert"
 )
@@ -115,6 +116,10 @@ func TestRedisRepository_CancelPartialFilledOrder(t *testing.T) {
 		mock.ExpectHSet(CreateOrderIDKey(partialFilledOrder.Id), "cancelled", "true").SetVal(1)
 		mock.ExpectZRem(CreateBuySidePricesKey(partialFilledOrder.Symbol), partialFilledOrder.Id.String()).SetVal(1)
 		mock.ExpectZRem(CreateUserOpenOrdersKey(partialFilledOrder.UserId), partialFilledOrder.Id.String()).SetVal(1)
+		mock.ExpectZAdd(CreateUserFilledOrdersKey(partialFilledOrder.UserId), redis.Z{
+			Score:  float64(partialFilledOrder.Timestamp.UTC().UnixNano()),
+			Member: partialFilledOrder.Id.String(),
+		}).SetVal(1)
 		mock.ExpectTxPipelineExec()
 
 		err := repo.CancelPartialFilledOrder(ctx, partialFilledOrder)