From: Muni Mohan Kunchi <munmohan@att.com>
Date: Wed, 1 Jul 2020 13:38:08 +0000 (-0400)
Subject: Fix for Meridian call and moving from 3.3.0 to 3.4.0 pom version
X-Git-Tag: 3.4.0~50
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=commitdiff_plain;h=fca38e174e85b66c67ab9e8b754a9b53d70fbfd9

Fix for Meridian call and moving from 3.3.0 to 3.4.0 pom version

Issue-ID: PORTAL-909
Signed-off-by: Muni Mohan Kunchi <munmohan@att.com>
Change-Id: Ie844576054aec05328675a758ead1041eedca3d8
---

diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index 8e89aa2c..85cf8757 100644
--- a/ecomp-portal-BE-common/pom.xml
+++ b/ecomp-portal-BE-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.portal</groupId>
 		<artifactId>onap-portal-parent</artifactId>
-		<version>3.3.0</version>
+		<version>3.4.0</version>
 	</parent>
 
 	<artifactId>portal-be-common</artifactId>
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 a97dc58b..7a7f9ee4 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
@@ -1127,8 +1127,7 @@ public class UserRolesCommonServiceImpl  {
 							userRolesInLocalApp);
 					List<RoleInAppForUser> roleAppUserList = rolesInAppForUser.roles;
 					if (EcompPortalUtils.checkIfRemoteCentralAccessAllowed()) {
-
-					// Apply changes in external Access system
+						// Apply changes in external Access system
 						updateUserRolesInExternalSystem(app, rolesInAppForUser.orgUserId, roleAppUserList,
 								epRequestValue,false,rolesGotDeletedFromApprover,checkIfUserisOnlyRoleAdmin);
 					}
@@ -1147,7 +1146,7 @@ public class UserRolesCommonServiceImpl  {
 					if(!app.getRolesInAAF() && !app.getId().equals(PortalConstants.PORTAL_APP_ID)){
 						
 						remoteAppUser = checkIfRemoteUserExits(userId, app, applicationsRestClientService);
-		
+
 						if (remoteAppUser == null) {
 							remoteAppUser = addRemoteUser(roleInAppForUserList, userId, app, mapper, searchService, applicationsRestClientService);
 						}
@@ -1655,6 +1654,7 @@ public class UserRolesCommonServiceImpl  {
 						// If adding just account admin role dont make remote application user call or
 						// if request has only single non admin role then make remote call
 						if (!(app.getId().equals(PortalConstants.PORTAL_APP_ID) && reqType.equals("DELETE"))
+								&& (app.getAppAck() != null && app.getAppAck())
 								&& ((checkIfAdminRoleExists && roleInAppForUserList.size() > 1)
 										|| (!checkIfAdminRoleExists && roleInAppForUserList.size() >= 1))) {
 							// check if admin role exist then delete
@@ -1664,6 +1664,7 @@ public class UserRolesCommonServiceImpl  {
 								return (role.getRoleId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID));
 							});
 							String orgUserIdNewOrExist = (userInfo.size() != 0 || !userInfo.isEmpty()) ? user.getOrgUserId() : orgUserId;
+								
 							pushRemoteUser(remoteUserRoles, orgUserIdNewOrExist , app, mapper, searchService,
 									applicationsRestClientService,true);
 						}
diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 41615df5..4bc54036 100644
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.portal</groupId>
 		<artifactId>onap-portal-parent</artifactId>
-		<version>3.3.0</version>
+		<version>3.4.0</version>
 	</parent>
 
 	<artifactId>portal-be-os</artifactId>
diff --git a/ecomp-portal-FE-os/pom.xml b/ecomp-portal-FE-os/pom.xml
index 735ce79e..29154e82 100644
--- a/ecomp-portal-FE-os/pom.xml
+++ b/ecomp-portal-FE-os/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.portal</groupId>
 		<artifactId>onap-portal-parent</artifactId>
-		<version>3.3.0</version>
+		<version>3.4.0</version>
 	</parent>
 
 	<artifactId>portal-FE-os</artifactId>
diff --git a/ecomp-portal-widget-ms/common-widgets/pom.xml b/ecomp-portal-widget-ms/common-widgets/pom.xml
index 2fdc2f82..7844390a 100644
--- a/ecomp-portal-widget-ms/common-widgets/pom.xml
+++ b/ecomp-portal-widget-ms/common-widgets/pom.xml
@@ -6,7 +6,7 @@
         <parent>
                 <groupId>org.onap.portal</groupId>
                 <artifactId>widget-ms-parent</artifactId>
-				<version>3.3.0</version>
+				<version>3.4.0</version>
         </parent>
 
 	<artifactId>common-widgets</artifactId>
diff --git a/ecomp-portal-widget-ms/pom.xml b/ecomp-portal-widget-ms/pom.xml
index 553535d5..913ac445 100644
--- a/ecomp-portal-widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.onap.portal</groupId>
 		<artifactId>onap-portal-parent</artifactId>
-		<version>3.3.0</version>
+		<version>3.4.0</version>
 	</parent>
 
 	<artifactId>widget-ms-parent</artifactId>
diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml
index f4275067..50a285c2 100644
--- a/ecomp-portal-widget-ms/widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/widget-ms/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.onap.portal</groupId>
 	<artifactId>widget-ms</artifactId>
-	<version>3.3.0</version>
+	<version>3.4.0</version>
 	<packaging>jar</packaging>
 	<name>widget-microservice</name>
 
diff --git a/pom.xml b/pom.xml
index 157db9ef..e4ccbdef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.onap.portal</groupId>
 	<artifactId>onap-portal-parent</artifactId>
-	<version>3.3.0</version>
+	<version>3.4.0</version>
 
 	<packaging>pom</packaging>
 	<name>portal</name>
diff --git a/portal-FE-os/pom.xml b/portal-FE-os/pom.xml
index a74e837c..615e7fa9 100644
--- a/portal-FE-os/pom.xml
+++ b/portal-FE-os/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.onap.portal</groupId>
 	<artifactId>portal-FE-os</artifactId>
-	<version>3.3.0</version>
+	<version>3.4.0</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>