Ensuring identity_hash only contains variables with valid values. intercom#100

jkeyes · jkeyes · commit 493b3da358a1 · 2015-08-11T17:01:40.000+01:00
diff --git a/intercom/api_operations/save.py b/intercom/api_operations/save.py
@@ -63,5 +63,7 @@ def identity_hash(self):
         identity_vars = getattr(self, 'identity_vars', [])
         parts = {}
         for var in identity_vars:
-            parts[var] = getattr(self, var, None)
+            id_var = getattr(self, var, None)
+            if id_var:  # only present id var if it is not blank or None
+                parts[var] = id_var
         return parts
diff --git a/tests/unit/test_user.py b/tests/unit/test_user.py
@@ -423,3 +423,24 @@ def it_can_call_increment_on_the_same_key_twice_and_increment_by_2(self):  # noq
         self.user.increment('mad')
         self.user.increment('mad')
         eq_(self.user.to_dict['custom_attributes']['mad'], 125)
+
+    @istest
+    def it_can_save_after_increment(self):  # noqa
+        user = User(
+            email=None, user_id="i-1224242",
+            companies=[{'company_id': 6, 'name': 'Intercom'}])
+        body = {
+            'custom_attributes': {},
+            'email': "",
+            'user_id': 'i-1224242',
+            'companies': [{
+                'company_id': 6,
+                'name': 'Intercom'
+            }]
+        }
+        with patch.object(Intercom, 'post', return_value=body) as mock_method:  # noqa
+            user.increment('mad')
+            eq_(user.to_dict['custom_attributes']['mad'], 1)
+            user.save()
+            ok_('email' not in user.identity_hash)
+            ok_('user_id' in user.identity_hash)
