custom fields

Author: dorin-ga

source/gameanalytics/Server/GACustomFields.cpp

@@ -1,43 +1,40 @@
 #include "Server/GACustomFields.h"
 #include "GACommon.h"
 #include "GASerialize.h"
+#include "GALogger.h"
 
 namespace gameanalytics
 {
-    void CustomFields::setValue(std::string const& key, int64_t val)
+    bool CustomFields::checkCustomFieldLimit() const
     {
-        Value v;
-        v.key = key;
-        v.value = val;
+        int num = numFields() + 1;
+        if(num > MAX_CUSTOM_FIELDS_COUNT)
+        {
+            logging::GALogger::w("Too many custom fields. Maximum number of allowed custom fields is: %i. New size is: %i", MAX_CUSTOM_FIELDS_COUNT, num);
+            return false;
+        }
 
-        fields[key] = v;
+        return true;
     }
 
-    void CustomFields::setValue(std::string const& key, double val)
+    bool CustomFields::setValue(std::string const& key, int64_t val)
     {
-        Value v;
-        v.key = key;
-        v.value = val;
-
-        fields[key] = v;
+        return setField(key, val);
     }
 
-    void CustomFields::setValue(std::string const& key, std::string const& val)
+    bool CustomFields::setValue(std::string const& key, double val)
     {
-        Value v;
-        v.key = key;
-        v.value = val;
-
-        fields[key] = v;
+        return setField(key, val);
     }
 
-    void CustomFields::setValue(std::string const& key, bool val)
+    bool CustomFields::setValue(std::string const& key, std::string const& val)
     {
-        Value v;
-        v.key = key;
-        v.value = val;
+        return setField(key, val);
+    }
 
-        fields[key] = v;
+    bool CustomFields::setValue(std::string const& key, bool val)
+    {
+        return setField(key, val);
     }
 
     std::string CustomFields::toString() const
@@ -46,16 +43,23 @@ namespace gameanalytics
         return j.dump();
     }
 
-    void CustomFields::merge(CustomFields const& other)
+    bool CustomFields::merge(CustomFields const& other)
     {
+        if(other.isEmpty())
+            return true;
+
+        const int num = other.numFields() + numFields();
+        if(num > MAX_CUSTOM_FIELDS_COUNT)
+        {
+            logging::GALogger::w("Too many custom fields. Maximum number of allowed custom fields is: %i. New size is: %i", MAX_CUSTOM_FIELDS_COUNT, num);
+            return false;
+        }
+
         for(auto& [key, val]: other.fields)
         {
             fields[key] = val;
         }
-    }
 
-    bool CustomFields::checkSize() const
-    {
-        return fields.size() <= NUM_MAX_CUSTOM_FIELDS;
+        return true;
     }
 }

source/gameanalytics/Server/GACustomFields.h

@@ -27,16 +27,16 @@ namespace gameanalytics
 
         inline bool isEmpty() const { return fields.empty(); }
 
-        std::string toString() const;
+        inline size_t numFields() const { return fields.size(); }
 
-        void setValue(std::string const& key, int64_t val);
-        void setValue(std::string const& key, double val);
-        void setValue(std::string const& key, std::string const& val);
-        void setValue(std::string const& key, bool val);
+        std::string toString() const;
 
-        void merge(CustomFields const& other);
+        bool setValue(std::string const& key, int64_t val);
+        bool setValue(std::string const& key, double val);
+        bool setValue(std::string const& key, std::string const& val);
+        bool setValue(std::string const& key, bool val);
 
-        bool checkSize() const;
+        bool merge(CustomFields const& other);
 
         template<typename T>
         T getValue(std::string const& key, T const& defaultValue)
@@ -46,6 +46,21 @@ namespace gameanalytics
 
         private:
 
+        bool checkCustomFieldLimit() const;
+
+        template<typename T>
+        bool setField(std::string const& key, T const& val)
+        {
+            if(checkCustomFieldLimit())
+            {
+                Value v;
+                v.key = key;
+                v.value = val;
+
+                fields[key] = v;
+            }
+        }
+
         template<typename T>
         T getValueById(std::string const& key, int id, T const& defaultValue)
         {

source/gameanalytics/Server/GAPlayerDatabase.cpp

@@ -46,6 +46,13 @@ namespace gameanalytics
             return false;
         }
 
+        Player& p = getPlayer(uid);
+        if(p.isActive())
+        {
+            logging::GALogger::w("Cannot remove player while the player is active, user id: %s", uid.c_str());
+            return false;
+        }
+
         _players.erase(uid);
         return true;
     }
@@ -66,12 +73,16 @@ namespace gameanalytics
             return false;
         }
 
-        Player player = getPlayer(uid);
-        player._userId = newUserId;
+        Player& player = getPlayer(uid);
+        if(player.isActive())
+        {
+            logging::GALogger::w("Cannot change user id while the user is active, user id: %s", uid.c_str());
+            return false;
+        }
 
+        player._userId = newUserId;
         _players[newUserId] = std::move(player);
-        
-        return true;
+        return removePlayer(uid);
     }
 
     Player& PlayerDatabase::getPlayer(std::string const& userId)
@@ -139,7 +150,7 @@ namespace gameanalytics
         data["connection_type"]         = p.connectionType;
 
         utilities::addIfNotEmpty(data, "country_code", p.countryCode);
-        
+
         utilities::addIfNotEmpty(data, "ab_id", p._abId);
         utilities::addIfNotEmpty(data, "ab_variant_id", p._abVariantId); 
         utilities::addIfNotEmpty(data, "user_id_ext", p.extUserId);