[coinex] Add cancelling of orders

knowm · Dec 13, 2024 · 40d5af3 · 40d5af3
1 parent 038860c
commit 40d5af3
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 0 deletions.
diff --git a/xchange-coinex/src/main/java/org/knowm/xchange/coinex/CoinexAuthenticated.java b/xchange-coinex/src/main/java/org/knowm/xchange/coinex/CoinexAuthenticated.java
@@ -55,6 +55,16 @@ CoinexResponse<CoinexOrder> createOrder(
       CoinexOrder coinexOrder)
       throws IOException, CoinexException;
 
+  @POST
+  @Path("v2/spot/cancel-order")
+  @Consumes(MediaType.APPLICATION_JSON)
+  CoinexResponse<CoinexOrder> cancelOrder(
+      @HeaderParam("X-COINEX-KEY") String apiKey,
+      @HeaderParam("X-COINEX-TIMESTAMP") SynchronizedValueFactory<Long> timestamp,
+      @HeaderParam("X-COINEX-SIGN") ParamsDigest signer,
+      CoinexCancelOrderRequest coinexCancelOrderRequest)
+      throws IOException, CoinexException;
+
   @GET
   @Path("v2/spot/order-status")
   CoinexResponse<CoinexOrder> orderStatus(

diff --git a/...nge-coinex/src/main/java/org/knowm/xchange/coinex/dto/trade/CoinexCancelOrderRequest.java b/...nge-coinex/src/main/java/org/knowm/xchange/coinex/dto/trade/CoinexCancelOrderRequest.java
@@ -0,0 +1,27 @@
+package org.knowm.xchange.coinex.dto.trade;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.jackson.Jacksonized;
+import org.knowm.xchange.coinex.config.converter.CurrencyPairToStringConverter;
+import org.knowm.xchange.coinex.dto.account.CoinexMarketType;
+import org.knowm.xchange.instrument.Instrument;
+
+@Data
+@Builder
+@Jacksonized
+public class CoinexCancelOrderRequest {
+
+  @JsonProperty("market")
+  @JsonSerialize(converter = CurrencyPairToStringConverter.class)
+  Instrument instrument;
+
+  @JsonProperty("market_type")
+  private CoinexMarketType marketType;
+
+  @JsonProperty("order_id")
+  private Long orderId;
+
+}
diff --git a/xchange-coinex/src/main/java/org/knowm/xchange/coinex/service/CoinexTradeService.java b/xchange-coinex/src/main/java/org/knowm/xchange/coinex/service/CoinexTradeService.java
@@ -96,4 +96,26 @@ public Collection<Order> getOrder(OrderQueryParams... orderQueryParams) throws I
       throw CoinexErrorAdapter.adapt(e);
     }
   }
+
+  @Override
+  public boolean cancelOrder(CancelOrderParams orderParams) throws IOException {
+    Validate.isInstanceOf(DefaultCancelOrderByInstrumentAndIdParams.class, orderParams);
+    DefaultCancelOrderByInstrumentAndIdParams params =
+        (DefaultCancelOrderByInstrumentAndIdParams) orderParams;
+
+    try {
+      CoinexOrder order = cancelOrder(Long.valueOf(params.getOrderId()), params.getInstrument());
+      return Objects.equals(order.getOrderId(), Long.valueOf(params.getOrderId()));
+    } catch (CoinexException e) {
+      throw CoinexErrorAdapter.adapt(e);
+    }
+
+  }
+
+  @Override
+  public Class[] getRequiredCancelOrderParamClasses() {
+    return new Class[] {DefaultCancelOrderByInstrumentAndIdParams.class};
+  }
+
+
 }
diff --git a/xchange-coinex/src/main/java/org/knowm/xchange/coinex/service/CoinexTradeServiceRaw.java b/xchange-coinex/src/main/java/org/knowm/xchange/coinex/service/CoinexTradeServiceRaw.java
@@ -23,6 +23,17 @@ public CoinexOrder createOrder(CoinexOrder coinexOrder) throws IOException {
         .getData();
   }
 
+  public CoinexOrder cancelOrder(Long orderId, Instrument instrument) throws IOException {
+    CoinexCancelOrderRequest request = CoinexCancelOrderRequest.builder()
+        .orderId(orderId)
+        .instrument(instrument)
+        .marketType(CoinexMarketType.SPOT)
+        .build();
+    return coinexAuthenticated
+        .cancelOrder(apiKey, exchange.getNonceFactory(), coinexV2ParamsDigest, request)
+        .getData();
+  }
+
   public CoinexOrder orderStatus(Instrument instrument, String orderId) throws IOException {
     String market = CoinexAdapters.toString(instrument);
     return coinexAuthenticated

diff --git a/xchange-coinex/src/test/java/org/knowm/xchange/coinex/service/CoinexTradeServiceTest.java b/xchange-coinex/src/test/java/org/knowm/xchange/coinex/service/CoinexTradeServiceTest.java
@@ -8,6 +8,7 @@
 import org.knowm.xchange.currency.CurrencyPair;
 import org.knowm.xchange.dto.trade.OpenOrders;
 import org.knowm.xchange.service.trade.TradeService;
+import org.knowm.xchange.service.trade.params.DefaultCancelOrderByInstrumentAndIdParams;
 import org.knowm.xchange.service.trade.params.orders.DefaultOpenOrdersParamInstrument;
 
 class CoinexTradeServiceTest extends CoinexExchangeWiremock {
@@ -38,4 +39,11 @@ void filtered_open_orders() throws IOException {
         .isEqualTo(CurrencyPair.BTC_USDT);
   }
 
+  @Test
+  void valid_cancel_order() throws IOException {
+    boolean actual = tradeService.cancelOrder(new DefaultCancelOrderByInstrumentAndIdParams(CurrencyPair.BTC_USDT, "136215219959"));
+    assertThat(actual).isTrue();
+  }
+
+
 }
diff --git a/xchange-coinex/src/test/resources/__files/v2_spot_cancel-order.json b/xchange-coinex/src/test/resources/__files/v2_spot_cancel-order.json
@@ -0,0 +1,27 @@
+{
+  "code": 0,
+  "data": {
+    "amount": "0.00005263",
+    "base_fee": "0",
+    "ccy": "BTC",
+    "client_id": "",
+    "created_at": 1734126246894,
+    "discount_fee": "0",
+    "filled_amount": "0",
+    "filled_value": "0",
+    "last_fill_amount": "0",
+    "last_fill_price": "0",
+    "maker_fee_rate": "0.0018",
+    "market": "BTCUSDT",
+    "market_type": "SPOT",
+    "order_id": 136215219959,
+    "price": "95000.99",
+    "quote_fee": "0",
+    "side": "buy",
+    "taker_fee_rate": "0.0018",
+    "type": "limit",
+    "unfilled_amount": "0.00005263",
+    "updated_at": 1734126246894
+  },
+  "message": "OK"
+}
diff --git a/xchange-coinex/src/test/resources/mappings/v2_spot_cancel-order.json b/xchange-coinex/src/test/resources/mappings/v2_spot_cancel-order.json
@@ -0,0 +1,20 @@
+{
+  "id" : "339fb318-39e7-49de-9c83-452a2a524977",
+  "name" : "v2_spot_cancel-order",
+  "request" : {
+    "url" : "/v2/spot/cancel-order",
+    "method" : "POST",
+    "bodyPatterns" : [ {
+      "equalToJson" : "{\"market\":\"BTCUSDT\",\"market_type\":\"SPOT\",\"order_id\":136215219959}",
+      "ignoreArrayOrder" : true,
+      "ignoreExtraElements" : true
+    } ]
+  },
+  "response" : {
+    "status" : 200,
+    "bodyFileName" : "v2_spot_cancel-order.json"
+  },
+  "uuid" : "339fb318-39e7-49de-9c83-452a2a524977",
+  "persistent" : true,
+  "insertionIndex" : 4
+}