Address the comments

Author: caroline-ttd

examples/sample_identity_map_client.py

@@ -3,8 +3,8 @@
 from uid2_client import IdentityMapClient, IdentityMapInput
 
 
-# this sample client takes email addresses or phone numbers or hashed versions of either as input and generates
-# an IdentityMapResponse object which contains raw uid or the reason why it is unmapped
+# this sample client takes email addresses as input and generates an IdentityMapResponse object which contains raw uid
+# or the reason why it is unmapped
 
 def _usage():
     print('Usage: python3 sample_identity_map_client.py <base_url> <api_key> <client_secret> <email_1> <email_2> ... <email_n>'

tests/test_identity_map_client.py

@@ -149,20 +149,20 @@ def test_identity_map_bad_secret(self):
         self.assertRaises(HTTPError, client.generate_identity_map,
                           identity_map_input)
 
-    def assert_mapped(self, response, ddi):
-        mapped_identity = response.mapped_identities.get(ddi)
+    def assert_mapped(self, response, dii):
+        mapped_identity = response.mapped_identities.get(dii)
         self.assertIsNotNone(mapped_identity)
         self.assertIsNotNone(mapped_identity.get_raw_uid())
         self.assertIsNotNone(mapped_identity.get_bucket_id())
 
-        unmapped_identity = response.unmapped_identities.get(ddi)
+        unmapped_identity = response.unmapped_identities.get(dii)
         self.assertIsNone(unmapped_identity)
 
-    def assert_unmapped(self, response, reason, ddi):
-        unmapped_identity = response.unmapped_identities.get(ddi)
+    def assert_unmapped(self, response, reason, dii):
+        unmapped_identity = response.unmapped_identities.get(dii)
         self.assertEqual(reason, unmapped_identity.get_reason())
 
-        mapped_identity = response.mapped_identities.get(ddi)
+        mapped_identity = response.mapped_identities.get(dii)
         self.assertIsNone(mapped_identity)
 
 

uid2_client/identity_map_input.py

@@ -11,19 +11,19 @@ def __init__(self, identity_type, emails_or_phones, already_hashed):
         self.hashed_normalized_emails = None
         self.hashed_normalized_phones = None
         if identity_type == IdentityType.Email:
-            self.hashed_normalized_emails = []
             if already_hashed:
                 self.hashed_normalized_emails = emails_or_phones
             else:
+                self.hashed_normalized_emails = []
                 for email in emails_or_phones:
                     hashed_normalized_email = normalize_and_hash_email(email)
                     self._add_hashed_to_raw_dii_mapping(hashed_normalized_email, email)
                     self.hashed_normalized_emails.append(hashed_normalized_email)
         else:  # phone
-            self.hashed_normalized_phones = []
             if already_hashed:
                 self.hashed_normalized_phones = emails_or_phones
             else:
+                self.hashed_normalized_phones = []
                 for phone in emails_or_phones:
                     hashed_normalized_phone = normalize_and_hash_phone(phone)
                     self._add_hashed_to_raw_dii_mapping(hashed_normalized_phone, phone)

uid2_client/identity_map_response.py

@@ -48,14 +48,14 @@ def status(self):
 
 class MappedIdentity:
     def __init__(self, raw_uid, bucket_id):
-        self.raw_uid = raw_uid
-        self.bucket_id = bucket_id
+        self._raw_uid = raw_uid
+        self._bucket_id = bucket_id
 
     def get_raw_uid(self):
-        return self.raw_uid
+        return self._raw_uid
 
     def get_bucket_id(self):
-        return self.bucket_id
+        return self._bucket_id
 
     @staticmethod
     def from_json(json_obj):