Merge pull request #5071 from PasinduYeshan/fix/rolev2

Fix shared shared v2 role display name update issue
wso2 · Oct 26, 2023 · 20ec4f1 · 20ec4f1
2 parents 622bf35 + 2b7d24a
commit 20ec4f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...le.v2.mgt.core/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/RoleConstants.java b/...le.v2.mgt.core/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/RoleConstants.java
@@ -98,6 +98,7 @@ public static class RoleTableColumns {
         public static final String UM_MAIN_ROLE_TENANT_ID = "UM_MAIN_ROLE_TENANT_ID";
         public static final String UM_GROUP_ID = "UM_GROUP_ID";
         public static final String GROUP_NAME = "GROUP_NAME";
+        public static final String ID = "ID";
 
         public static final String NEW_ROLE_NAME = "NEW_ROLE_NAME";
         public static final String USER_NOT_FOUND_ERROR_MESSAGE = "A user doesn't exist with name: %s " +

diff --git a/....v2.mgt.core/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/dao/RoleDAOImpl.java b/....v2.mgt.core/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/dao/RoleDAOImpl.java
@@ -1191,7 +1191,7 @@ private void updateSharedSCIMRolesName(List<RoleDTO> sharedRoles, String newRole
 
         for (RoleDTO roleDTO : sharedRoles) {
             try (NamedPreparedStatement statement = new NamedPreparedStatement(connection, UPDATE_SCIM_ROLE_NAME_SQL,
-                    RoleConstants.RoleTableColumns.UM_ID)) {
+                    RoleConstants.RoleTableColumns.ID)) {
                 statement.setString(RoleConstants.RoleTableColumns.NEW_ROLE_NAME, newRoleName);
                 statement.setInt(RoleConstants.RoleTableColumns.TENANT_ID, roleDTO.getTenantId());
                 statement.setString(ROLE_NAME, roleDTO.getName());