minor fixes based on PR comments

user_sync/rules.py

@@ -71,7 +71,7 @@ def __init__(self, caller_options):
         self.directory_user_by_user_key = {}
         self.filtered_directory_user_by_user_key = {}
         self.umapi_info_by_name = {}
-        self.adobeid_user_by_email = {}
+        self.adobeid_user_by_username = {}
         # counters for action summary log
         self.action_summary = {
             # these are in alphabetical order!  Always add new ones that way!
@@ -971,10 +971,10 @@ def is_umapi_user_excluded(self, in_primary_org, user_key, current_groups):
     def filter_adobeID_user(self, umapi_user):
         id_type = self.get_identity_type_from_umapi_user(umapi_user)
         if id_type == user_sync.identity_type.ADOBEID_IDENTITY_TYPE:
-            self.adobeid_user_by_email[normalize_string(umapi_user['email'])] = umapi_user
+            self.adobeid_user_by_username[normalize_string(umapi_user['username'])] = umapi_user
 
     def is_adobeID_email_exist(self, email):
-        return bool(self.adobeid_user_by_email.get(normalize_string(email)))
+        return bool(self.adobeid_user_by_username.get(normalize_string(email)))
 
     @staticmethod
     def normalize_groups(group_names):