Merge pull request #199 from intercom/timlim/fix-tagging-with-multiple-identifiers

Prioritise user_id over email in user tagging (Fixes: #197)

Author: thewheat

intercom-java/src/main/java/io/intercom/api/Tag.java

@@ -83,12 +83,12 @@ static TaggableCollection createTagTypedCollection(Tag tag, UserCollection users
             if (!Strings.isNullOrEmpty(id)) {
                 userMap.put("id", id);
                 usersLite.add(userMap);
-            } else if (!Strings.isNullOrEmpty(email)) {
-                userMap.put("email", email);
-                usersLite.add(userMap);
             } else if (!Strings.isNullOrEmpty(userId)) {
                 userMap.put("user_id", userId);
                 usersLite.add(userMap);
+            } else if (!Strings.isNullOrEmpty(email)) {
+                userMap.put("email", email);
+                usersLite.add(userMap);
             } else {
                 logger.warn("no identifiers found for user tag target, skipping [" + tag + "] [" + user.toString() + "]");
             }