User fix (#39)

Author: kp-cat

configcatclient/user.py

@@ -1,4 +1,6 @@
-__PREDEFINED__ = ["Identifier", 'Email', 'Country']
+import json
+
+__PREDEFINED__ = ['Identifier', 'Email', 'Country']
 
 
 class User(object):
@@ -19,23 +21,13 @@ def get_attribute(self, attribute):
         if attribute in __PREDEFINED__:
             return self.__data[attribute]
 
-        if self.__custom is not None:
-            for customField in self.__custom:
-                if customField == attribute:
-                    return self.__custom[customField]
-
-        return None
+        return self.__custom.get(attribute) if self.__custom else None
 
     def __str__(self):
-        r = '{\n    "Identifier": "%s"' % self.__identifier
-        if self.__data['Email'] is not None:
-            r += ',\n    "Email": "%s"' % self.__data['Email']
-        if self.__data['Country'] is not None:
-            r += ',\n    "Country": "%s"' % self.__data['Country']
-        if self.__custom is not None:
-            r += ',\n    "Custom": {'
-            for customField in self.__custom:
-                r += '\n        "%s": "%s",' % (customField, self.__custom[customField])
-            r += '\n    }'
-        r += '\n}'
-        return r
+        dump = {
+            'Identifier': self.__identifier,
+            'Email': self.__data.get('Email'),
+            'Country': self.__data.get('Country'),
+            'Custom': self.__custom,
+        }
+        return json.dumps(dump, indent=4)

configcatclienttests/test_user.py

@@ -1,4 +1,5 @@
 import unittest
+import json
 from configcatclient.user import User
 
 
@@ -10,13 +11,35 @@ def test_empty_or_none_identifier(self):
         self.assertEqual('', u2.get_identifier())
 
     def test_attribute_case_sensitivity(self):
+        user_id = 'id'
         email = '[email protected]'
         country = 'country'
-        user = User('user_id', email=email, country=country)
-        self.assertEqual(email, user.get_attribute("Email"))
-        self.assertIsNone(user.get_attribute("EMAIL"))
-        self.assertIsNone(user.get_attribute("email"))
-
-        self.assertEqual(country, user.get_attribute("Country"))
-        self.assertIsNone(user.get_attribute("COUNTRY"))
-        self.assertIsNone(user.get_attribute("country"))
+        custom = {'custom': 'test'}
+        user = User(identifier=user_id, email=email, country=country, custom=custom)
+
+        self.assertEqual(user_id, user.get_identifier())
+
+        self.assertEqual(email, user.get_attribute('Email'))
+        self.assertIsNone(user.get_attribute('EMAIL'))
+        self.assertIsNone(user.get_attribute('email'))
+
+        self.assertEqual(country, user.get_attribute('Country'))
+        self.assertIsNone(user.get_attribute('COUNTRY'))
+        self.assertIsNone(user.get_attribute('country'))
+
+        self.assertEqual('test', user.get_attribute('custom'))
+        self.assertIsNone(user.get_attribute('non-existing'))
+
+    def test_to_str(self):
+        user_id = 'id'
+        email = '[email protected]'
+        country = 'country'
+        custom = {'custom': 'test'}
+        user = User(identifier=user_id, email=email, country=country, custom=custom)
+
+        user_json = json.loads(str(user))
+
+        self.assertEqual(user_id, user_json['Identifier'])
+        self.assertEqual(email, user_json['Email'])
+        self.assertEqual(country, user_json['Country'])
+        self.assertEqual(custom, user_json['Custom'])