Merge branch 'dev' into feat_token

Author: tigersk

include/tigerapi/trade_client.h

@@ -135,11 +135,11 @@ namespace TIGER_API {
                                   SegmentType seg_type = SegmentType::SEC);
 
         Order get_order(unsigned long long id, bool is_brief=false);
-        value get_transactions(utility::string_t account, long order_id);
+        value get_transactions(utility::string_t account, long long order_id);
         value get_transactions(utility::string_t account, utility::string_t symbol, utility::string_t sec_type = U(""),
                                long start_time = -1, time_t end_time = -1,
                                int limit = 100, utility::string_t expiry = U(""), utility::string_t strike = U(""), utility::string_t right = U(""),
-                               long order_id = 0);
+                               long long order_id = 0);
 
         value cancel_order(unsigned long long id);
         value place_order(value &order);

src/push_socket/push_client_impl.cpp

@@ -540,9 +540,9 @@ std::shared_ptr<tigeropen::push::pb::QuoteBasicData> TIGER_API::PushClientImpl::
         return nullptr;
     }
 
-    tigeropen::push::pb::SocketCommon_QuoteType quoteType = quote_data.type();
-    if (quoteType != tigeropen::push::pb::SocketCommon::QuoteType::SocketCommon_QuoteType_ALL &&
-        quoteType != tigeropen::push::pb::SocketCommon::QuoteType::SocketCommon_QuoteType_BASIC) {
+    tigeropen::push::pb::SocketCommon_QuoteType quote_type = quote_data.type();
+    if (quote_type != tigeropen::push::pb::SocketCommon::QuoteType::SocketCommon_QuoteType_ALL &&
+        quote_type != tigeropen::push::pb::SocketCommon::QuoteType::SocketCommon_QuoteType_BASIC) {
         return nullptr;
     }
 
@@ -551,7 +551,7 @@ std::shared_ptr<tigeropen::push::pb::QuoteBasicData> TIGER_API::PushClientImpl::
     auto builder = std::make_shared<tigeropen::push::pb::QuoteBasicData>();
     // Set required fields
     builder->set_symbol(quote_data.symbol());
-    builder->set_type(tigeropen::push::pb::SocketCommon::QuoteType::SocketCommon_QuoteType_BASIC);
+    builder->set_type(quote_type);
     builder->set_timestamp(quote_data.timestamp());
     builder->set_latestprice(quote_data.latestprice());
     builder->set_latesttime(quote_data.latesttime());
@@ -627,14 +627,15 @@ std::shared_ptr<tigeropen::push::pb::QuoteBBOData> TIGER_API::PushClientImpl::co
     }
 
     tigeropen::push::pb::SocketCommon_QuoteType quote_type = quote_data.type();
-    if (quote_type != tigeropen::push::pb::SocketCommon::QuoteType::SocketCommon_QuoteType_BBO) {
+    if (quote_type != tigeropen::push::pb::SocketCommon::QuoteType::SocketCommon_QuoteType_ALL &&
+        quote_type != tigeropen::push::pb::SocketCommon::QuoteType::SocketCommon_QuoteType_BBO) {
         return nullptr;
     }
 
     // Create and initialize builder
     auto builder = std::make_shared<tigeropen::push::pb::QuoteBBOData>();
     builder->set_symbol(quote_data.symbol());
-    builder->set_type(tigeropen::push::pb::SocketCommon::QuoteType::SocketCommon_QuoteType_BBO);
+    builder->set_type(quote_type);
     builder->set_timestamp(quote_data.timestamp());
     builder->set_bidprice(quote_data.bidprice());
     builder->set_bidsize(quote_data.bidsize());

src/trade_client.cpp

@@ -292,18 +292,18 @@ namespace TIGER_API {
                                    parent_id, enum_to_str(sort_by), enum_to_str(seg_type));
     }
 
-    value TradeClient::get_transactions(utility::string_t account, long order_id) {
+    value TradeClient::get_transactions(utility::string_t account, long long order_id) {
         value obj = value::object(true);
         obj[P_ACCOUNT] = get_account_param(account);
         set_secret_key(obj);
-        obj[U("order_id")] = (long long) order_id;
+        obj[U("order_id")] = order_id;
         return post(ORDER_TRANSACTIONS, obj)[P_ITEMS];
     }
 
     value TradeClient::get_transactions(utility::string_t account, utility::string_t symbol, utility::string_t sec_type,
                                         long start_time, time_t end_time,
                                         int limit, utility::string_t expiry, utility::string_t strike, utility::string_t right,
-                                        long order_id) {
+                                        long long order_id) {
         value obj = value::object(true);
         obj[P_ACCOUNT] = get_account_param(account);
         set_secret_key(obj);