pushing error and audit log changes for portal

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / portal / service / AdminRolesServiceImpl.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/AdminRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/AdminRolesServiceImpl.java
index 6950bdd..6df7944 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/AdminRolesServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/AdminRolesServiceImpl.java
@@ -149,7 +149,7 @@ public class AdminRolesServiceImpl implements AdminRolesService {
                                                        " where userId = " + user.getId() + " and role.id = " + ACCOUNT_ADMIN_ROLE_ID, null, null);
                                } catch (Exception e) {
                                        logger.error(EELFLoggerDelegate.errorLogger, "getAppsWithAdminRoleStateForUser 1 failed", e);
-                                       EPLogUtil.logEcompError(EPAppMessagesEnum.BeDaoSystemError);
+                                       EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
                                }
                                for (EPUserApp userApp : userAppList) {
                                        appsUserAdmin.put(userApp.getAppId(), userApp.getUserId());
@@ -166,7 +166,7 @@ public class AdminRolesServiceImpl implements AdminRolesService {
                                appsList = dataAccessService.getList(EPApp.class, null);
                        } catch (Exception e) {
                                logger.error(EELFLoggerDelegate.errorLogger, "getAppsWithAdminRoleStateForUser 2 failed", e);
-                               EPLogUtil.logEcompError(EPAppMessagesEnum.BeDaoSystemError);
+                               EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
                        }
                        for (EPApp app : appsList) {
                                AppNameIdIsAdmin appNameIdIsAdmin = new AppNameIdIsAdmin();
@@ -349,7 +349,7 @@ public class AdminRolesServiceImpl implements AdminRolesService {
                        for (AppNameIdIsAdmin appNameIdIsAdmin : newAppsWhereUserIsAdmin) {
                                EPApp app = (EPApp) localSession.get(EPApp.class, appNameIdIsAdmin.id);
                                try {
-                                       if (app.getCentralAuth()) {
+                                       if (app.getRolesInAAF()) {
                                                String extRole = app.getNameSpace() + "." + PortalConstants.ADMIN_ROLE.replaceAll(" ", "_");
                                                HttpEntity<String> entity = new HttpEntity<>(headers);
                                                String name = "";