role group fix (#6336)

Author: Shivam-nagar23

pkg/auth/user/UserCommonService.go

@@ -412,22 +412,13 @@ func (impl UserCommonServiceImpl) RemoveRolesAndReturnEliminatedPoliciesForGroup
 								impl.logger.Errorw("Error in fetching roles by filter", "user", request)
 								return nil, nil, err
 							}
-							oldRoleModel, err := impl.userAuthRepository.GetRoleByFilterForAllTypes(entity, "", "", "", "", accessType, roleFilter.Cluster, namespace, group, kind, resource, actionType, true, "")
-							if err != nil {
-								impl.logger.Errorw("Error in fetching roles by filter", "user", request)
-								return nil, nil, err
-							}
-							if roleModel.Id == 0 && oldRoleModel.Id == 0 {
+							if roleModel.Id == 0 {
 								impl.logger.Warnw("no role found for given filter", "filter", roleFilter)
 								continue
 							}
 							if _, ok := existingRoles[roleModel.Id]; ok {
 								delete(eliminatedRoles, roleModel.Id)
 							}
-							if _, ok := existingRoles[oldRoleModel.Id]; ok {
-								//delete old role mapping from existing but not from eliminated roles (so that it gets deleted)
-								delete(existingRoles, oldRoleModel.Id)
-							}
 						}
 					}
 				}