Merge branch 'dev' into dev-pg

Author: mtwomey

src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java

@@ -497,6 +497,11 @@ public ApiResponse createObject(
             assignDefaultUserRole(user); // Add Topcoder User role if the user was auto-activated
         }
 
+        // Add business user role if needed
+        if (user.getRegSource().matches("tcBusiness")) {
+            assignRoleByName("Business User", user);
+        }
+
         // publish event
         publishUserEvent("event.user.created", user);
 
@@ -1672,4 +1677,26 @@ private void assignDefaultUserRole(User user) {
             logger.error("Unable to assign default user role to user " + user.getId(), e);
         }
     }
+
+    private void assignRoleByName(String roleName, User user) {
+        Role role = roleDao.findRoleByName(roleName);
+        if (role == null) {
+            logger.error("No role found for '" + roleName + "'");
+            throw new IllegalStateException("Unable to assign user role " + roleName);
+        }
+        long roleId = Long.parseLong(role.getId().toString());
+
+        try {
+            long userId = Long.parseLong(user.getId().toString());
+            int rows = roleDao.assignRole(roleId, userId, userId);
+
+            if (rows == 0) {
+                logger.error("No assignment row created when assigning '" + roleName + "' role to user " + userId);
+            } else if (logger.isDebugEnabled()) {
+                logger.debug(String.format("Created role assignment for user %d", userId));
+            }
+        } catch (Exception e) {
+            logger.error("Unable to assign '" + roleName + "' role to user " + user.getId(), e);
+        }
+    }
 }