From 5c293646b960007ab8dfff83712909db57f84861 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Thu, 2 Jun 2016 17:22:39 -0700
Subject: [PATCH] Segment metadata users

---
 domain-server/src/DomainMetadata.cpp | 17 +++++++++++------
 domain-server/src/DomainMetadata.h   | 10 ++++++++--
 domain-server/src/DomainServer.cpp   |  2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/domain-server/src/DomainMetadata.cpp b/domain-server/src/DomainMetadata.cpp
index c45a07e646..c92303ee7b 100644
--- a/domain-server/src/DomainMetadata.cpp
+++ b/domain-server/src/DomainMetadata.cpp
@@ -15,6 +15,14 @@
 
 #include "DomainServerNodeData.h"
 
+const QString DomainMetadata::USERS_KEY = "users";
+const QString DomainMetadata::USERS_NUM_KEY = "num_users";
+const QString DomainMetadata::USERS_HOSTNAMES_KEY = "users_hostnames";
+
+DomainMetadata::DomainMetadata() :
+    _metadata{{ USERS_KEY, {} }} {
+}
+
 void DomainMetadata::usersChanged() {
     static const QString DEFAULT_HOSTNAME = "*";
 
@@ -39,13 +47,10 @@ void DomainMetadata::usersChanged() {
         }
     });
 
-    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;
+    QVariantMap users = {{ USERS_NUM_KEY, numConnectedUnassigned }, { USERS_HOSTNAMES_KEY, userHostnames }};
+    _metadata[USERS_KEY] = users;
 
 #if DEV_BUILD
-    qDebug() << "Regenerated domain metadata - users:" << _metadata;
+    qDebug() << "Regenerated domain metadata - users:" << users;
 #endif
 }
diff --git a/domain-server/src/DomainMetadata.h b/domain-server/src/DomainMetadata.h
index f92c40ce61..ae6dfe10a1 100644
--- a/domain-server/src/DomainMetadata.h
+++ b/domain-server/src/DomainMetadata.h
@@ -15,9 +15,15 @@
 #include <QJsonObject>
 
 class DomainMetadata {
+    static const QString USERS_KEY;
+    static const QString USERS_NUM_KEY;
+    static const QString USERS_HOSTNAMES_KEY;
+
 public:
-    QVariantMap toVariantMap() { return _metadata; }
-    QJsonObject toJSON() { return QJsonObject::fromVariantMap(_metadata); }
+    DomainMetadata();
+
+    QJsonObject get() { return QJsonObject::fromVariantMap(_metadata); }
+    QJsonObject getUsers() { return QJsonObject::fromVariantMap(_metadata[USERS_KEY].toMap()); }
 
 public slots:
     void usersChanged();
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 5a9fc816c5..c24fd02727 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1098,7 +1098,7 @@ void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
 
     // Add the metadata to the heartbeat
     static const QString DOMAIN_HEARTBEAT_KEY = "heartbeat";
-    domainObject[DOMAIN_HEARTBEAT_KEY] = _metadata.toJSON();
+    domainObject[DOMAIN_HEARTBEAT_KEY] = _metadata.getUsers();
 
     QString domainUpdateJSON = QString("{\"domain\":%1}").arg(QString(QJsonDocument(domainObject).toJson(QJsonDocument::Compact)));