update binance-usds-futures get account balance and position from v2 to v3

Author: ubuntu

include/ccapi_cpp/service/ccapi_execution_management_service_binance_derivatives_base.h

@@ -37,26 +37,30 @@ class ExecutionManagementServiceBinanceDerivativesBase : public ExecutionManagem
     switch (request.getOperation()) {
       case Request::Operation::GET_ACCOUNT_POSITIONS: {
         for (const auto& x : document.GetArray()) {
-          Element element;
-          element.insert(CCAPI_INSTRUMENT, x["symbol"].GetString());
-          element.insert(CCAPI_EM_POSITION_SIDE, x["positionSide"].GetString());
           std::string positionAmt;
           auto it = x.FindMember("positionAmt");
           if (it != x.MemberEnd()) {
             positionAmt = it->value.GetString();
           } else {
             positionAmt = x["maxQty"].GetString();
           }
-          element.insert(CCAPI_EM_POSITION_QUANTITY, positionAmt);
-          element.insert(CCAPI_EM_POSITION_ENTRY_PRICE, x["entryPrice"].GetString());
-          element.insert(CCAPI_EM_POSITION_LEVERAGE, x["leverage"].GetString());
-          if (x.HasMember("unrealizedProfit")) {
-            element.insert(CCAPI_EM_UNREALIZED_PNL, x["unrealizedProfit"].GetString());
-          } else {
-            element.insert(CCAPI_EM_UNREALIZED_PNL, x["unRealizedProfit"].GetString());
+          if (!positionAmt.empty()) {
+            const auto& positionAmtDecimal = Decimal(positionAmt);
+            if (positionAmtDecimal != Decimal::zero) {
+              Element element;
+              element.insert(CCAPI_INSTRUMENT, x["symbol"].GetString());
+              element.insert(CCAPI_EM_POSITION_SIDE, x["positionSide"].GetString());
+              element.insert(CCAPI_EM_POSITION_QUANTITY, positionAmt);
+              element.insert(CCAPI_EM_POSITION_ENTRY_PRICE, x["entryPrice"].GetString());
+              if (x.HasMember("unrealizedProfit")) {
+                element.insert(CCAPI_EM_UNREALIZED_PNL, x["unrealizedProfit"].GetString());
+              } else {
+                element.insert(CCAPI_EM_UNREALIZED_PNL, x["unRealizedProfit"].GetString());
+              }
+              element.insert(CCAPI_LAST_UPDATED_TIME_SECONDS, UtilTime::convertMillisecondsStrToSecondsStr(x["updateTime"].GetString()));
+              elementList.emplace_back(std::move(element));
+            }
           }
-          element.insert(CCAPI_LAST_UPDATED_TIME_SECONDS, UtilTime::convertMillisecondsStrToSecondsStr(x["updateTime"].GetString()));
-          elementList.emplace_back(std::move(element));
         }
       } break;
       default:

include/ccapi_cpp/service/ccapi_execution_management_service_binance_usds_futures.h

@@ -33,8 +33,8 @@ class ExecutionManagementServiceBinanceUsdsFutures : public ExecutionManagementS
     this->cancelOpenOrdersTarget = "/fapi/v1/allOpenOrders";
     this->isDerivatives = true;
     this->listenKeyTarget = CCAPI_BINANCE_USDS_FUTURES_LISTEN_KEY_PATH;
-    this->getAccountBalancesTarget = "/fapi/v2/account";
-    this->getAccountPositionsTarget = "/fapi/v2/positionRisk";
+    this->getAccountBalancesTarget = "/fapi/v3/account";
+    this->getAccountPositionsTarget = "/fapi/v3/positionRisk";
   }
 
   virtual ~ExecutionManagementServiceBinanceUsdsFutures() {}

test/test_unit/src/execution_management/binance_usds_futures/test.cpp

@@ -421,7 +421,7 @@ TEST_F(ExecutionManagementServiceBinanceUsdsFuturesTest, convertRequestGetAccoun
   EXPECT_EQ(req.method(), http::verb::get);
   verifyApiKey(req, this->credential.at(CCAPI_BINANCE_USDS_FUTURES_API_KEY));
   auto splitted = UtilString::split(std::string(req.target()), "?");
-  EXPECT_EQ(splitted.at(0), "/fapi/v2/positionRisk");
+  EXPECT_EQ(splitted.at(0), "/fapi/v3/positionRisk");
   auto paramMap = Url::convertQueryStringToMap(splitted.at(1));
   EXPECT_EQ(paramMap.at("timestamp"), std::to_string(this->timestamp));
   verifySignature(splitted.at(1), this->credential.at(CCAPI_BINANCE_USDS_FUTURES_API_SECRET));
@@ -439,7 +439,6 @@ TEST_F(ExecutionManagementServiceBinanceUsdsFuturesTest, convertTextMessageToMes
                 "unrealizedProfit": "0.00000000",
                 "positionInitialMargin": "0",
                 "openOrderInitialMargin": "0",
-                "leverage": "100",
                 "isolated": true,
                 "entryPrice": "0.00000",
                 "maxNotional": "250000",
@@ -461,7 +460,6 @@ TEST_F(ExecutionManagementServiceBinanceUsdsFuturesTest, convertTextMessageToMes
   EXPECT_EQ(element.getValue(CCAPI_EM_POSITION_SIDE), "BOTH");
   EXPECT_EQ(element.getValue(CCAPI_EM_POSITION_QUANTITY), "0");
   EXPECT_DOUBLE_EQ(std::stod(element.getValue(CCAPI_EM_POSITION_ENTRY_PRICE)), 0);
-  EXPECT_EQ(element.getValue(CCAPI_EM_POSITION_LEVERAGE), "100");
 }
 
 } /* namespace ccapi */