X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FRoleManageController.java;h=c9a6f5d111ca9926c3faff7d96fe00de7260e1ef;hb=refs%2Fchanges%2F95%2F31995%2F1;hp=1433fb21816dec68751a6bbb5187530f88f503b2;hpb=2036d5039c90736c54484e539f37dfb8f661e4f1;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
index 1433fb21..c9a6f5d1 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
@@ -500,7 +500,19 @@ public class RoleManageController extends EPRestrictedBaseController {
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
 				if (requestedApp.getCentralAuth()) {
-					saveOrUpdateResponse = externalAccessRolesService.saveCentralRoleFunction(roleFunc, requestedApp);
+					CentralV2RoleFunction domainRoleFunction = externalAccessRolesService.getRoleFunction(roleFunc.getCode(),
+							requestedApp.getUebKey());
+					if (domainRoleFunction != null && domainRoleFunction.getCode().equals(roleFunc.getCode())
+							&& domainRoleFunction.getType().equals(roleFunc.getType())
+							&& domainRoleFunction.getAction().equals(roleFunc.getAction())) {
+						domainRoleFunction.setName(roleFunc.getName());
+						saveOrUpdateResponse = externalAccessRolesService.saveCentralRoleFunction(domainRoleFunction,
+								requestedApp);
+					} else {
+						roleFunc.setAppId(requestedApp.getId());
+						saveOrUpdateResponse = externalAccessRolesService.saveCentralRoleFunction(roleFunc,
+								requestedApp);
+					}
 					if (saveOrUpdateResponse) {
 						EPUser requestedUser = externalAccessRolesService.getUser(user.getOrgUserId()).get(0);
 						EPApp app = externalAccessRolesService.getApp(requestedApp.getUebKey()).get(0);
@@ -557,11 +569,19 @@ public class RoleManageController extends EPRestrictedBaseController {
 				if (requestedApp.getCentralAuth()) {
 					ObjectMapper mapper = new ObjectMapper();
 					String data = roleFunc;
+					boolean getDelFuncResponse = false;
 					CentralV2RoleFunction availableRoleFunction = mapper.readValue(data, CentralV2RoleFunction.class);
-					CentralV2RoleFunction domainRoleFunction = externalAccessRolesService
-							.getRoleFunction(availableRoleFunction.getCode(), requestedApp.getUebKey());
-					boolean getDelFuncResponse = externalAccessRolesService
-							.deleteCentralRoleFunction(domainRoleFunction.getCode(), requestedApp);
+					String code = availableRoleFunction.getType() + "|" + availableRoleFunction.getCode() + "|"
+							+ availableRoleFunction.getAction();
+					CentralV2RoleFunction domainRoleFunction = externalAccessRolesService.getRoleFunction(code,
+							requestedApp.getUebKey());
+					if (domainRoleFunction.getCode().contains("|")) {
+						getDelFuncResponse = externalAccessRolesService
+								.deleteCentralRoleFunction(code, requestedApp);
+					} else {
+						getDelFuncResponse = externalAccessRolesService
+								.deleteCentralRoleFunction(domainRoleFunction.getCode(), requestedApp);
+					}
 					if (getDelFuncResponse) {
 						logger.info(EELFLoggerDelegate.applicationLogger,
 								"deleteRoleFunction: succeeded for app {}, role {}", requestedApp.getId(),