X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2FAdminRolesService.java;fp=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2FAdminRolesService.java;h=059979d22f10450c54dbd04556da6f1dec610a97;hb=500bd3b761971db9ff11d8583337799c7891185f;hp=187e175efae3455309400faad5ed5db00e65e5ad;hpb=f81c0c718043517218d55908bdad0bfcada9a969;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/service/AdminRolesService.java b/portal-BE/src/main/java/org/onap/portal/service/AdminRolesService.java
index 187e175e..059979d2 100644
--- a/portal-BE/src/main/java/org/onap/portal/service/AdminRolesService.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/AdminRolesService.java
@@ -194,23 +194,21 @@ public class AdminRolesService {
     return isSuperAdmin;
   }
 
-  public boolean isAccountAdmin(FnUser user) {
+  public boolean isAccountAdmin(final long userId, final String orgUserId, final Set<FnUserRole> userApps) {
     try {
-      logger.debug(EELFLoggerDelegate.debugLogger, ADMIN_ACCOUNT, user.getId());
-      List<Integer> userAdminApps = getAdminAppsForTheUser(user.getId());
+      logger.debug(EELFLoggerDelegate.debugLogger, ADMIN_ACCOUNT, userId);
+      List<Integer> userAdminApps = getAdminAppsForTheUser(userId);
       logger.debug(EELFLoggerDelegate.debugLogger,
           "Is account admin for userAdminApps() - for user {}, found userAdminAppsSize {}",
-          user.getOrgUserId(), userAdminApps.size());
+          orgUserId, userAdminApps.size());
 
-      if (user.getId() != null) {
-        for (FnUserRole userApp : user.getUserApps()) {
-          if (userApp.getRoleId().getId().equals(ACCOUNT_ADMIN_ROLE_ID) || (
-              userAdminApps.size() > 1)) {
-            logger.debug(EELFLoggerDelegate.debugLogger,
-                "Is account admin for userAdminApps() - for user {}, found Id {}",
-                user.getOrgUserId(), userApp.getRoleId().getId());
-            return true;
-          }
+      for (FnUserRole userApp : userApps) {
+        if (userApp.getRoleId().getId().equals(ACCOUNT_ADMIN_ROLE_ID) || (
+            userAdminApps.size() > 1)) {
+          logger.debug(EELFLoggerDelegate.debugLogger,
+              "Is account admin for userAdminApps() - for user {}, found Id {}",
+              orgUserId, userApp.getRoleId().getId());
+          return true;
         }
       }
     } catch (Exception e) {
@@ -222,9 +220,9 @@ public class AdminRolesService {
     return false;
   }
 
-  public boolean isUser(FnUser user) {
+  public boolean isUser(final long userId) {
     try {
-      FnUser currentUser = fnUserService.getUser(user.getId()).orElseThrow(Exception::new);
+      FnUser currentUser = fnUserService.getUser(userId).orElseThrow(Exception::new);
       if (currentUser != null && currentUser.getId() != null) {
         for (FnUserRole userApp : currentUser.getUserApps()) {
           if (!userApp.getFnAppId().getId().equals(ECOMP_APP_ID)) {