Unverified Commit 816ff8f4 authored by AMIT KUMAR's avatar AMIT KUMAR Committed by GitHub
Browse files

Issue #SB-27557 feat: put null check for lastName (#1015)

Showing with 6 additions and 2 deletions
+6 -2
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.sunbird.actor.core.BaseActor;
import org.sunbird.keys.JsonKey;
import org.sunbird.request.Request;
......@@ -50,8 +51,11 @@ public class FetchUserRoleActor extends BaseActor {
Map<String, Object> user =
userService.getUserDetailsById(userId, request.getRequestContext());
if (MapUtils.isNotEmpty(user)) {
response.put(
JsonKey.NAME, user.get(JsonKey.FIRST_NAME) + " " + user.get(JsonKey.LAST_NAME));
String name = (String) user.get(JsonKey.FIRST_NAME);
if (StringUtils.isNotEmpty((String) user.get(JsonKey.LAST_NAME))) {
name = name + " " + user.get(JsonKey.LAST_NAME);
}
response.put(JsonKey.NAME, name);
}
}
response.put(JsonKey.ROLES, userRoles);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment