BCLOUD-1079 getSelectedProperties/InCategories

include/braincloud/BrainCloudGlobalApp.h

@@ -3,6 +3,8 @@
 #pragma once
 
 #include <stddef.h>
+#include <vector>
+#include <string>
 
 namespace BrainCloud
 {
@@ -24,6 +26,30 @@ namespace BrainCloud
          */
         void readProperties(IServerCallback * in_callback = NULL);
 
+        /**
+         * Returns a list of properties, identified by the property names provided.
+         * If a property from the list isn't found, it just isn't returned (no error).
+         *
+         * Service Name - GlobalApp
+         * Service Operation - READ_SELECTED_PROPERTIES
+         * 
+         * @param propertyNames Specifies which properties to return
+         * @param in_callback The method to be invoked when the server response is received
+         */
+        void readSelectedProperties(const std::vector<std::string> &propertyNames, IServerCallback * in_callback = NULL);
+
+        /**
+         * Returns a list of properties, identified by the categories provided.
+         * If a category from the list isn't found, it just isn't returned (no error).
+         *
+         * Service Name - GlobalApp
+         * Service Operation - READ_PROPERTIES_IN_CATEGORIES
+         * 
+         * @param categories Specifies which category to return
+         * @param in_callback The method to be invoked when the server response is received
+         */
+        void readPropertiesInCategories(const std::vector<std::string> &categories, IServerCallback * in_callback = NULL);
+
     private:
         BrainCloudClient * m_client;
     };

include/braincloud/OperationParam.h

@@ -331,6 +331,10 @@ namespace BrainCloud {
 		static const OperationParam DataStreamEventName;
 		static const OperationParam DataStreamEventProperties;
 
+		// Global Properties
+		static const OperationParam GlobalAppPropertyNames;
+		static const OperationParam GlobalAppCategories;
+
 		// Profanity
 		static const OperationParam ProfanityText;
 		static const OperationParam ProfanityReplaceSymbol;

include/braincloud/ServiceOperation.h

@@ -290,6 +290,8 @@ namespace BrainCloud {
 		static const ServiceOperation UpdateLanguageCode;
 
 		static const ServiceOperation ReadProperties;
+		static const ServiceOperation ReadSelectedProperties;
+		static const ServiceOperation ReadPropertiesInCategories;
 
 		static const ServiceOperation GetUpdatedFiles;
 		static const ServiceOperation GetFileList;

src/BrainCloudGlobalApp.cpp

@@ -10,6 +10,9 @@
 #include "braincloud/OperationParam.h"
 #include "json/json.h"
 
+#include "braincloud/internal/StringUtil.h"
+#include "braincloud/internal/JsonUtil.h"
+
 namespace BrainCloud
 {
     BrainCloudGlobalApp::BrainCloudGlobalApp(BrainCloudClient* in_client) : m_client(in_client) { }
@@ -20,4 +23,24 @@ namespace BrainCloud
         ServerCall * sc = new ServerCall(ServiceName::GlobalApp, ServiceOperation::ReadProperties, message, in_callback);
         m_client->sendRequest(sc);
     }
+
+    void BrainCloudGlobalApp::readSelectedProperties(const std::vector<std::string> &propertyNames, IServerCallback * in_callback)
+    {
+        Json::Value message = Json::nullValue;
+
+		message[OperationParam::GlobalAppPropertyNames.getValue()] = JsonUtil::stringVectorToJson(propertyNames);
+
+        ServerCall * sc = new ServerCall(ServiceName::GlobalApp, ServiceOperation::ReadSelectedProperties, message, in_callback);
+        m_client->sendRequest(sc);
+    }
+
+    void BrainCloudGlobalApp::readPropertiesInCategories(const std::vector<std::string> &categories, IServerCallback * in_callback )
+    {
+        Json::Value message = Json::nullValue;
+
+		message[OperationParam::GlobalAppCategories.getValue()] = JsonUtil::stringVectorToJson(categories);
+
+        ServerCall * sc = new ServerCall(ServiceName::GlobalApp, ServiceOperation::ReadPropertiesInCategories, message, in_callback);
+        m_client->sendRequest(sc);
+    }
 }

src/OperationParam.cpp

@@ -370,6 +370,9 @@ namespace BrainCloud
 	const OperationParam OperationParam::UpdateContactEmail = OperationParam("updateContactEmail");
 	const OperationParam OperationParam::FieldAuthenticationToken = OperationParam("authenticationToken");
 
+	// Global Properties
+	const OperationParam OperationParam::GlobalAppPropertyNames = OperationParam("propertyNames");
+	const OperationParam OperationParam::GlobalAppCategories = OperationParam("categories");
 
 	//mail
 	const OperationParam OperationParam::EmailAddress = OperationParam("emailAddress");

src/ServiceOperation.cpp

@@ -271,6 +271,8 @@ namespace BrainCloud
 	const ServiceOperation ServiceOperation::UpdateLanguageCode = ServiceOperation("UPDATE_LANGUAGE_CODE");
 
 	const ServiceOperation ServiceOperation::ReadProperties = ServiceOperation("READ_PROPERTIES");
+	const ServiceOperation ServiceOperation::ReadSelectedProperties = ServiceOperation("READ_SELECTED_PROPERTIES");
+	const ServiceOperation ServiceOperation::ReadPropertiesInCategories = ServiceOperation("READ_PROPERTIES_IN_CATEGORIES");
 
 	const ServiceOperation ServiceOperation::GetUpdatedFiles = ServiceOperation("GET_UPDATED_FILES");
 	const ServiceOperation ServiceOperation::GetFileList = ServiceOperation("GET_FILE_LIST");

tests/src/TestBCGlobalApp.cpp

@@ -12,4 +12,20 @@ TEST_F(TestBCGlobalApp, ReadProperties)
 
     m_bc->getGlobalAppService()->readProperties(&tr);
     tr.run(m_bc);
+}
+
+TEST_F(TestBCGlobalApp, ReadSelectedProperties)
+{
+    TestResult tr;
+
+    m_bc->getGlobalAppService()->readSelectedProperties({ "prop1", "prop2", "prop3" }, &tr);
+    tr.run(m_bc);
+}
+
+TEST_F(TestBCGlobalApp, ReadPropertiesInCategories)
+{
+    TestResult tr;
+
+    m_bc->getGlobalAppService()->readPropertiesInCategories({ "test" }, &tr);
+    tr.run(m_bc);
 }