From 87e27d9570b9419802ddbed6f664d42baf912db8 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Wed, 25 May 2016 12:16:02 -0700
Subject: [PATCH] Factor out metadata generation from heartbeat

---
 domain-server/src/DomainServer.cpp | 79 ++++++++++++++++--------------
 1 file changed, 43 insertions(+), 36 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 231e9ba014..ae3c26a34d 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1067,62 +1067,69 @@ void DomainServer::performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr)
     sendHeartbeatToMetaverse(newPublicSockAddr.getAddress().toString());
 }
 
-
-void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
-    const QString DOMAIN_UPDATE = "/api/v1/domains/%1";
-
-    auto nodeList = DependencyManager::get<LimitedNodeList>();
-    const QUuid& domainID = nodeList->getSessionUUID();
-
-    // setup the domain object to send to the data server
-    const QString PUBLIC_NETWORK_ADDRESS_KEY = "network_address";
-    const QString AUTOMATIC_NETWORKING_KEY = "automatic_networking";
-
-    QJsonObject domainObject;
-    if (!networkAddress.isEmpty()) {
-        domainObject[PUBLIC_NETWORK_ADDRESS_KEY] = networkAddress;
-    }
-
-    domainObject[AUTOMATIC_NETWORKING_KEY] = _automaticNetworkingSetting;
-
-    // add a flag to indicate if this domain uses restricted access - for now that will exclude it from listings
-    const QString RESTRICTED_ACCESS_FLAG = "restricted";
-
-    domainObject[RESTRICTED_ACCESS_FLAG] =
-        _settingsManager.valueOrDefaultValueForKeyPath(RESTRICTED_ACCESS_SETTINGS_KEYPATH).toBool();
-
-    // figure out the breakdown of currently connected interface clients
-    int numConnectedUnassigned = 0;
-    QJsonObject userHostnames;
-
+QVariantMap getMetadata() {
     static const QString DEFAULT_HOSTNAME = "*";
 
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
+    int numConnectedUnassigned = 0;
+    QVariantMap userHostnames;
+
+    // figure out the breakdown of currently connected interface clients
     nodeList->eachNode([&numConnectedUnassigned, &userHostnames](const SharedNodePointer& node) {
-        if (node->getLinkedData()) {
-            auto nodeData = static_cast<DomainServerNodeData*>(node->getLinkedData());
+        auto linkedData = node->getLinkedData();
+        if (linkedData) {
+            auto nodeData = static_cast<DomainServerNodeData*>(linkedData);
 
             if (!nodeData->wasAssigned()) {
                 ++numConnectedUnassigned;
 
                 // increment the count for this hostname (or the default if we don't have one)
-                auto hostname = nodeData->getPlaceName().isEmpty() ? DEFAULT_HOSTNAME : nodeData->getPlaceName();
+                auto placeName = nodeData->getPlaceName();
+                auto hostname = placeName.isEmpty() ? DEFAULT_HOSTNAME : placeName;
                 userHostnames[hostname] = userHostnames[hostname].toInt() + 1;
             }
         }
     });
 
-    static const QString DOMAIN_HEARTBEAT_KEY = "heartbeat";
+    QVariantMap metadata;
+
     static const QString HEARTBEAT_NUM_USERS_KEY = "num_users";
+    metadata[HEARTBEAT_NUM_USERS_KEY] = numConnectedUnassigned;
+
     static const QString HEARTBEAT_USER_HOSTNAMES_KEY = "user_hostnames";
+    metadata[HEARTBEAT_USER_HOSTNAMES_KEY] = userHostnames;
 
-    QJsonObject heartbeatObject;
-    heartbeatObject[HEARTBEAT_NUM_USERS_KEY] = numConnectedUnassigned;
-    heartbeatObject[HEARTBEAT_USER_HOSTNAMES_KEY] = userHostnames;
+    return metadata;
+}
 
-    domainObject[DOMAIN_HEARTBEAT_KEY] = heartbeatObject;
+void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
+    const QUuid& domainID = nodeList->getSessionUUID();
+
+    // Setup the domain object to send to the data server
+    QJsonObject domainObject;
+
+    if (!networkAddress.isEmpty()) {
+        static const QString PUBLIC_NETWORK_ADDRESS_KEY = "network_address";
+        domainObject[PUBLIC_NETWORK_ADDRESS_KEY] = networkAddress;
+    }
+
+    static const QString AUTOMATIC_NETWORKING_KEY = "automatic_networking";
+    domainObject[AUTOMATIC_NETWORKING_KEY] = _automaticNetworkingSetting;
+
+    // Add a flag to indicate if this domain uses restricted access -
+    // for now that will exclude it from listings
+    static const QString RESTRICTED_ACCESS_FLAG = "restricted";
+    domainObject[RESTRICTED_ACCESS_FLAG] =
+        _settingsManager.valueOrDefaultValueForKeyPath(RESTRICTED_ACCESS_SETTINGS_KEYPATH).toBool();
+
+    // Add the metadata to the heartbeat
+    static const QString DOMAIN_HEARTBEAT_KEY = "heartbeat";
+    domainObject[DOMAIN_HEARTBEAT_KEY] = QJsonObject::fromVariantMap(getMetadata());
 
     QString domainUpdateJSON = QString("{\"domain\":%1}").arg(QString(QJsonDocument(domainObject).toJson(QJsonDocument::Compact)));
 
+    static const QString DOMAIN_UPDATE = "/api/v1/domains/%1";
     DependencyManager::get<AccountManager>()->sendRequest(DOMAIN_UPDATE.arg(uuidStringWithoutCurlyBraces(domainID)),
                                               AccountManagerAuth::Required,
                                               QNetworkAccessManager::PutOperation,