crypto-chassis · cryptochassis · Sep 13, 2023 · Sep 12, 2023 · Sep 12, 2023 · Sep 12, 2023
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -164,7 +164,7 @@ jobs:
             COMMAND npm install -g node-gyp
           )
 
-    - name: Configure
+    - name: Configure 1
       shell: cmake -P {0}
       run: |
         set(ENV{CC} ${{ matrix.config.cc }})
@@ -207,7 +207,7 @@ jobs:
         execute_process(
           COMMAND ${{ steps.cmake_and_ninja.outputs.cmake_dir }}/cmake
             -DBUILD_TEST_BUILD=ON
-            -DBUILD_TEST_UNIT=ON
+            -DBUILD_TEST_UNIT=OFF
             -S test
             -B test/build
             -D CMAKE_BUILD_TYPE=$ENV{CMAKE_BUILD_TYPE}
@@ -291,7 +291,7 @@ jobs:
           message(FATAL_ERROR "Bad exit status")
         endif()
 
-    - name: Build
+    - name: Build 1
       shell: cmake -P {0}
       run: |
         set(ENV{NINJA_STATUS} "[%f/%t %o/sec] ")
@@ -380,6 +380,114 @@ jobs:
           message(FATAL_ERROR "Bad exit status")
         endif()
 
+        execute_process(
+          COMMAND rm -rf test/build
+          RESULT_VARIABLE result
+        )
+        if (NOT result EQUAL 0)
+          message(FATAL_ERROR "Bad exit status")
+        endif()
+
+        # execute_process(COMMAND ccache -s)
+
+    - name: Configure 2
+      shell: cmake -P {0}
+      run: |
+        set(ENV{CC} ${{ matrix.config.cc }})
+        set(ENV{CXX} ${{ matrix.config.cxx }})
+        if ("${{ runner.os }}" STREQUAL "macOS")
+          set(ENV{OPENSSL_ROOT_DIR} "/usr/local/Cellar/openssl")
+        elseif ("${{ runner.os }}" STREQUAL "Windows")
+          set(ENV{OPENSSL_ROOT_DIR} "C:/vcpkg/installed/x64-windows-static")
+          # set(ENV{CMAKE_TOOLCHAIN_FILE} "C:/vcpkg/scripts/buildsystems/vcpkg.cmake")
+        endif()
+        if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{ matrix.config.environment_script }}" STREQUAL "x")
+          execute_process(
+            COMMAND "${{ matrix.config.environment_script }}" && set
+            OUTPUT_FILE environment_script_output.txt
+          )
+          file(STRINGS environment_script_output.txt output_lines)
+          foreach(line IN LISTS output_lines)
+            if (line MATCHES "^([a-zA-Z0-9_-]+)=(.*)$")
+              set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}")
+            endif()
+          endforeach()
+        endif()
+
+        set(path_separator ":")
+        if ("${{ runner.os }}" STREQUAL "Windows")
+          set(path_separator ";")
+        endif()
+        set(ENV{PATH} "$ENV{GITHUB_WORKSPACE}${path_separator}$ENV{PATH}")
+
+        if ("$ENV{GITHUB_EVENT_NAME}" STREQUAL "push")
+          set(ENV{CMAKE_BUILD_TYPE} "Release")
+          set(ENV{DOTNET_BUILD_CONFIGURATION} "Release")
+          set(ENV{NODE_GYP_BUILD_MODE} "release")
+        else()
+          set(ENV{CMAKE_BUILD_TYPE} "Debug")
+          set(ENV{DOTNET_BUILD_CONFIGURATION} "Debug")
+          set(ENV{NODE_GYP_BUILD_MODE} "debug")
+        endif()
+
+        execute_process(
+          COMMAND ${{ steps.cmake_and_ninja.outputs.cmake_dir }}/cmake
+            -DBUILD_TEST_BUILD=OFF
+            -DBUILD_TEST_UNIT=ON
+            -S test
+            -B test/build
+            -D CMAKE_BUILD_TYPE=$ENV{CMAKE_BUILD_TYPE}
+            -G Ninja
+            -D CMAKE_MAKE_PROGRAM=ninja
+            # -D CMAKE_C_COMPILER_LAUNCHER=ccache
+            # -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
+          RESULT_VARIABLE result
+        )
+        if (NOT result EQUAL 0)
+          message(FATAL_ERROR "Bad exit status")
+        endif()
+
+    - name: Build 2
+      shell: cmake -P {0}
+      run: |
+        set(ENV{NINJA_STATUS} "[%f/%t %o/sec] ")
+
+        if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{ matrix.config.environment_script }}" STREQUAL "x")
+          file(STRINGS environment_script_output.txt output_lines)
+          foreach(line IN LISTS output_lines)
+            if (line MATCHES "^([a-zA-Z0-9_-]+)=(.*)$")
+              set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}")
+            endif()
+          endforeach()
+        endif()
+
+        set(path_separator ":")
+        if ("${{ runner.os }}" STREQUAL "Windows")
+          set(path_separator ";")
+        endif()
+        set(ENV{PATH} "$ENV{GITHUB_WORKSPACE}${path_separator}$ENV{PATH}")
+
+        # file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}" ccache_basedir)
+        # set(ENV{CCACHE_BASEDIR} "${ccache_basedir}")
+        # set(ENV{CCACHE_DIR} "${ccache_basedir}/.ccache")
+        # set(ENV{CCACHE_COMPRESS} "true")
+        # set(ENV{CCACHE_COMPRESSLEVEL} "6")
+        # set(ENV{CCACHE_MAXSIZE} "400M")
+        # if ("${{ matrix.config.cxx }}" STREQUAL "cl")
+        #   set(ENV{CCACHE_MAXSIZE} "600M")
+        # endif()
+        #
+        # execute_process(COMMAND ccache -p)
+        # execute_process(COMMAND ccache -z)
+
+        execute_process(
+          COMMAND ${{ steps.cmake_and_ninja.outputs.cmake_dir }}/cmake --build test/build -j 2
+          RESULT_VARIABLE result
+        )
+        if (NOT result EQUAL 0)
+          message(FATAL_ERROR "Bad exit status")
+        endif()
+
         # execute_process(COMMAND ccache -s)
 
     - name: Test

diff --git a/example/src/cross_exchange_arbitrage/CMakeLists.txt b/example/src/cross_exchange_arbitrage/CMakeLists.txt
@@ -5,6 +5,4 @@ add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_GEMINI)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/custom_service_class/CMakeLists.txt b/example/src/custom_service_class/CMakeLists.txt
@@ -4,6 +4,4 @@ add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_compile_definitions(CCAPI_EXPOSE_INTERNAL)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/enable_library_logging/CMakeLists.txt b/example/src/enable_library_logging/CMakeLists.txt
@@ -4,6 +4,4 @@ add_compile_definitions(CCAPI_ENABLE_LOG_TRACE)
 add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/execution_management_advanced_request/CMakeLists.txt b/example/src/execution_management_advanced_request/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_US)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/execution_management_advanced_subscription/CMakeLists.txt b/example/src/execution_management_advanced_subscription/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_OKX)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/execution_management_simple_request/CMakeLists.txt b/example/src/execution_management_simple_request/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/execution_management_simple_subscription/CMakeLists.txt b/example/src/execution_management_simple_subscription/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/generic_private_request/CMakeLists.txt b/example/src/generic_private_request/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/generic_public_request/CMakeLists.txt b/example/src/generic_public_request/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/market_data_advanced_request/CMakeLists.txt b/example/src/market_data_advanced_request/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/market_data_advanced_subscription/CMakeLists.txt b/example/src/market_data_advanced_subscription/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/market_data_simple_request/CMakeLists.txt b/example/src/market_data_simple_request/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/market_data_simple_subscription/CMakeLists.txt b/example/src/market_data_simple_subscription/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/market_making/CMakeLists.txt b/example/src/market_making/CMakeLists.txt
@@ -4,6 +4,4 @@ add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
 add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/override_exchange_url_at_runtime/CMakeLists.txt b/example/src/override_exchange_url_at_runtime/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_OKX)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/example/src/utility_set_timer/CMakeLists.txt b/example/src/utility_set_timer/CMakeLists.txt
@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson)
-endif()
+add_dependencies(${NAME} boost rapidjson)
diff --git a/include/ccapi_cpp/service/ccapi_market_data_service.h b/include/ccapi_cpp/service/ccapi_market_data_service.h
@@ -390,7 +390,7 @@ class MarketDataService : public Service {
   void onClose(wspp::connection_hdl hdl) override {
     CCAPI_LOGGER_FUNCTION_ENTER;
     WsConnection& wsConnection = this->getWsConnectionFromConnectionPtr(this->serviceContextPtr->tlsClientPtr->get_con_from_hdl(hdl));
-    this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.erase(wsConnection.id);
+    this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.erase(wsConnection.id);
     this->exchangeJsonPayloadIdByConnectionIdMap.erase(wsConnection.id);
     this->instrumentGroupByWsConnectionIdMap.erase(wsConnection.id);
     this->correlationIdByConnectionIdMap.erase(wsConnection.id);
@@ -650,7 +650,7 @@ class MarketDataService : public Service {
   virtual void onClose(std::shared_ptr<WsConnection> wsConnectionPtr, ErrorCode ec) override {
     CCAPI_LOGGER_FUNCTION_ENTER;
     WsConnection& wsConnection = *wsConnectionPtr;
-    this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.erase(wsConnection.id);
+    this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.erase(wsConnection.id);
     this->exchangeJsonPayloadIdByConnectionIdMap.erase(wsConnection.id);
     this->instrumentGroupByWsConnectionIdMap.erase(wsConnection.id);
     this->correlationIdByConnectionIdMap.erase(wsConnection.id);
@@ -1787,7 +1787,7 @@ class MarketDataService : public Service {
   std::string getInstrumentTarget;
   std::string getInstrumentsTarget;
   std::map<std::string, int> exchangeJsonPayloadIdByConnectionIdMap;
-  std::map<std::string, std::map<int, std::vector<std::string>>> exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap;
+  std::map<std::string, std::map<int, std::vector<std::string>>> exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap;
   // only needed for generic public subscription
   std::map<std::string, std::string> correlationIdByConnectionIdMap;
   std::map<std::string, std::map<std::string, std::map<int64_t, MarketDataMessage::TypeForData>>>

diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_binance_base.h b/include/ccapi_cpp/service/ccapi_market_data_service_binance_base.h
@@ -94,7 +94,7 @@ class MarketDataServiceBinanceBase : public MarketDataService {
     }
     document.AddMember("params", params, allocator);
     document.AddMember("id", rj::Value(this->exchangeJsonPayloadIdByConnectionIdMap[wsConnection.id]).Move(), allocator);
-    this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap[wsConnection.id][this->exchangeJsonPayloadIdByConnectionIdMap[wsConnection.id]] =
+    this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap[wsConnection.id][this->exchangeJsonPayloadIdByConnectionIdMap[wsConnection.id]] =
         exchangeSubscriptionIdList;
     this->exchangeJsonPayloadIdByConnectionIdMap[wsConnection.id] += 1;
     rj::StringBuffer stringBuffer;
@@ -127,11 +127,11 @@ class MarketDataServiceBinanceBase : public MarketDataService {
       std::vector<std::string> correlationIdList;
       if (this->correlationIdListByConnectionIdChannelIdSymbolIdMap.find(wsConnection.id) != this->correlationIdListByConnectionIdChannelIdSymbolIdMap.end()) {
         int id = std::stoi(document["id"].GetString());
-        if (this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.find(wsConnection.id) !=
-                this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.end() &&
-            this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.at(wsConnection.id).find(id) !=
-                this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.at(wsConnection.id).end()) {
-          for (const auto& exchangeSubscriptionId : this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.at(wsConnection.id).at(id)) {
+        if (this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.find(wsConnection.id) !=
+                this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.end() &&
+            this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.at(wsConnection.id).find(id) !=
+                this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.at(wsConnection.id).end()) {
+          for (const auto& exchangeSubscriptionId : this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.at(wsConnection.id).at(id)) {
             std::string channelId = this->channelIdSymbolIdByConnectionIdExchangeSubscriptionIdMap[wsConnection.id][exchangeSubscriptionId][CCAPI_CHANNEL_ID];
             std::string symbolId = this->channelIdSymbolIdByConnectionIdExchangeSubscriptionIdMap[wsConnection.id][exchangeSubscriptionId][CCAPI_SYMBOL_ID];
             if (this->correlationIdListByConnectionIdChannelIdSymbolIdMap.at(wsConnection.id).find(channelId) !=

diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_bybit.h b/include/ccapi_cpp/service/ccapi_market_data_service_bybit.h
@@ -72,7 +72,7 @@ class MarketDataServiceBybit : public MarketDataServiceBybitBase {
     }
     document.AddMember("args", args, allocator);
     document.AddMember("req_id", rj::Value(std::to_string(this->exchangeJsonPayloadIdByConnectionIdMap[wsConnection.id]).c_str(), allocator).Move(), allocator);
-    this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap[wsConnection.id][this->exchangeJsonPayloadIdByConnectionIdMap[wsConnection.id]] =
+    this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap[wsConnection.id][this->exchangeJsonPayloadIdByConnectionIdMap[wsConnection.id]] =
         exchangeSubscriptionIdList;
     this->exchangeJsonPayloadIdByConnectionIdMap[wsConnection.id] += 1;
     rj::StringBuffer stringBuffer;
@@ -109,11 +109,11 @@ class MarketDataServiceBybit : public MarketDataServiceBybitBase {
         if (this->correlationIdListByConnectionIdChannelIdSymbolIdMap.find(wsConnection.id) !=
             this->correlationIdListByConnectionIdChannelIdSymbolIdMap.end()) {
           int id = std::stoi(document["req_id"].GetString());
-          if (this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.find(wsConnection.id) !=
-                  this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.end() &&
-              this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.at(wsConnection.id).find(id) !=
-                  this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.at(wsConnection.id).end()) {
-            for (const auto& exchangeSubscriptionId : this->exchangeSubscriptionIdListByExchangeJsonPayloadIdByConnectionIdMap.at(wsConnection.id).at(id)) {
+          if (this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.find(wsConnection.id) !=
+                  this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.end() &&
+              this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.at(wsConnection.id).find(id) !=
+                  this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.at(wsConnection.id).end()) {
+            for (const auto& exchangeSubscriptionId : this->exchangeSubscriptionIdListByConnectionIdExchangeJsonPayloadIdMap.at(wsConnection.id).at(id)) {
               std::string channelId = this->channelIdSymbolIdByConnectionIdExchangeSubscriptionIdMap[wsConnection.id][exchangeSubscriptionId][CCAPI_CHANNEL_ID];
               std::string symbolId = this->channelIdSymbolIdByConnectionIdExchangeSubscriptionIdMap[wsConnection.id][exchangeSubscriptionId][CCAPI_SYMBOL_ID];
               if (this->correlationIdListByConnectionIdChannelIdSymbolIdMap.at(wsConnection.id).find(channelId) !=