X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FUserRolesCommonServiceImpl.java;h=ab688820cea7319d4619c843fb9660496d628f71;hb=8e83c25788017acd56271a72286f7dcbc974e76d;hp=bfc232aaeab3fd602b5cbec5ba0be946562b3b61;hpb=6e50276a42ab82cfe34ced9cf97e545283f37f2a;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java
index bfc232aa..ab688820 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java
@@ -1084,7 +1084,7 @@ public class UserRolesCommonServiceImpl  {
 					
 				applyChangesToUserAppRolesForMyLoginsRequest(user, appId);
 
-				boolean systemUser = newAppRolesForUser.isSystemUser();
+				Boolean systemUser = (newAppRolesForUser.getIsSystemUser() != null ? newAppRolesForUser.getIsSystemUser() : false);
 
 				if ((app.getCentralAuth() || app.getId().equals(PortalConstants.PORTAL_APP_ID)) && systemUser) {
 
@@ -2303,10 +2303,15 @@ public class UserRolesCommonServiceImpl  {
 		EPApp app = appsService.getApp(appId);
 		//If local or centralized application
 		if (appId == PortalConstants.PORTAL_APP_ID || app.getCentralAuth()) {
+			Map<String, Object> params = new HashMap<>();
+			params.put("id", app.getId());
+			params.put("active", true);
 			@SuppressWarnings("unchecked")
-			List<EPUser> userList = (List<EPUser>) dataAccessService.executeNamedQuery("getActiveUsers", null, null);
+			//List<EPUser> userList = (List<EPUser>) dataAccessService.executeNamedQuery("getActiveUsers", null, null);
+			//List<Object[]> userList = (List<Object[]>) dataAccessService.executeNamedQuery("getActiveUsersForApp", params, null);
+			List<EPUser> userList = (List<EPUser>) dataAccessService.executeNamedQuery("getActiveUsersForApp", params, null);
 			for (EPUser user : userList) {
-				UserApplicationRoles userWithAppRoles = convertToUserApplicationRoles(appId, user, app);
+				UserApplicationRoles userWithAppRoles = convertToUserApplicationRoles(user, app.getId());
 				if (userWithAppRoles.getRoles() != null && userWithAppRoles.getRoles().size() > 0)
 					userApplicationRoles.add(userWithAppRoles);
 			}
@@ -2334,6 +2339,29 @@ public class UserRolesCommonServiceImpl  {
 		return userApplicationRoles;
 	}
 	
+	/**
+	 * 
+	 * @param user
+	 * @param app_id
+	 * @return
+	 */
+	private UserApplicationRoles convertToUserApplicationRoles(EPUser user, Long appId) {
+		UserApplicationRoles userWithRemoteAppRoles = new UserApplicationRoles();
+		userWithRemoteAppRoles.setAppId(appId);
+		userWithRemoteAppRoles.setOrgUserId(user.getOrgUserId());
+		userWithRemoteAppRoles.setFirstName(user.getFirstName());
+		userWithRemoteAppRoles.setLastName(user.getLastName());
+		List<RemoteRole> roleList = new ArrayList<RemoteRole>();
+		for(EPUserApp userApp :user.getEPUserApps()) {
+			RemoteRole remoteRole = new RemoteRole();
+			remoteRole.setName(userApp.getRole().getName());
+			remoteRole.setId(userApp.getRole().getId());
+			roleList.add(remoteRole);
+		}
+		userWithRemoteAppRoles.setRoles(roleList);
+		return userWithRemoteAppRoles;
+	}
+	
 	/**
 	 * 
 	 * @param appId