[KNOWAGE-8123] Cannot delete just created role

knowage-core/src/main/java/it/eng/spagobi/api/v2/RolesResource.java

@@ -134,6 +134,26 @@ public Response getRoleById(@PathParam("id") Integer id) {
 		}
 	}
 
+	@GET
+	@UserConstraint(functionalities = { CommunityFunctionalityConstants.PROFILE_MANAGEMENT })
+	@Path("/{id}/allElement")
+	@Produces(MediaType.APPLICATION_JSON + CHARSET)
+	public Response getRoleAllElemntById(@PathParam("id") Integer id) {
+		IRoleDAO rolesDao = null;
+
+		try {
+			Role role = null;
+			rolesDao = DAOFactory.getRoleDAO();
+			rolesDao.setUserProfile(getUserProfile());
+			role = rolesDao.loadAllElemtnsForRoleByID(id);
+			return Response.ok(role).build();
+		} catch (Exception e) {
+			LOGGER.error("Role with selected id: " + id + " doesn't exists", e);
+			throw new SpagoBIRestServiceException("Item with selected id: " + id + " doesn't exists",
+					buildLocaleFromSession(), e);
+		}
+	}
+
 	@GET
 	@Produces(MediaType.APPLICATION_JSON + CHARSET)
 	@Path("/idsByNames")

knowage-core/src/main/java/it/eng/spagobi/events/EventsManager.java

@@ -52,8 +52,9 @@ public class EventsManager {
 	 * @return single instance of EventsManager
 	 */
 	public static EventsManager getInstance() {
-		if (instance == null)
+		if (instance == null) {
 			instance = new EventsManager();
+		}
 		return instance;
 	}
 
@@ -102,7 +103,6 @@ public Integer registerEvent(String user, String desc, String params, List roles
 		eventLog.setDate(new Timestamp(System.currentTimeMillis()));
 		eventLog.setParams(params);
 		eventLog.setType(type);
-		eventLog.setRoles(roles);
 		try {
 			EventLogDAOHibImpl eventLogDAO = new EventLogDAOHibImpl();
 			eventLogDAO.setUserID(user);
@@ -145,16 +145,17 @@ public EventLog getRegisteredEvent(Integer id) {
 	 */
 	public static String getParamsStr(Map params) {
 		logger.debug("IN");
-		StringBuffer buffer = new StringBuffer();
+		StringBuilder buffer = new StringBuilder();
 		Iterator it = params.keySet().iterator();
 		boolean isFirstParameter = true;
 		while (it.hasNext()) {
 			String pname = (String) it.next();
 			String pvalue = (String) params.get(pname);
-			if (!isFirstParameter)
+			if (!isFirstParameter) {
 				buffer.append("&");
-			else
+			} else {
 				isFirstParameter = false;
+			}
 			buffer.append(pname + "=" + pvalue);
 		}
 		logger.debug("OUT");

knowagedao/src/main/java/it/eng/spagobi/commons/dao/IRoleDAO.java

@@ -54,6 +54,8 @@ public interface IRoleDAO extends ISpagoBIDao, EmittingEventDAO<RoleEventsEmitti
 	 */
 	Role loadByID(Integer roleID) throws EMFUserError;
 
+	Role loadAllElemtnsForRoleByID(Integer roleID) throws EMFUserError;
+
 	SbiExtRoles loadSbiExtRoleById(Integer roleId) throws EMFUserError;
 
 	/**

knowagedao/src/main/java/it/eng/spagobi/commons/dao/RoleDAOHibImpl.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Criteria;
@@ -44,6 +45,7 @@
 
 import it.eng.spago.error.EMFErrorSeverity;
 import it.eng.spago.error.EMFUserError;
+import it.eng.spagobi.analiticalmodel.functionalitytree.metadata.SbiFuncRole;
 import it.eng.spagobi.behaviouralmodel.analyticaldriver.metadata.SbiParuse;
 import it.eng.spagobi.behaviouralmodel.analyticaldriver.metadata.SbiParuseDet;
 import it.eng.spagobi.commons.bo.Role;
@@ -59,7 +61,10 @@
 import it.eng.spagobi.commons.metadata.SbiOrganizationProductType;
 import it.eng.spagobi.commons.metadata.SbiProductType;
 import it.eng.spagobi.mapcatalogue.metadata.SbiGeoLayersRoles;
+import it.eng.spagobi.profiling.bean.SbiUser;
+import it.eng.spagobi.tools.news.metadata.SbiNews;
 import it.eng.spagobi.utilities.exceptions.SpagoBIRuntimeException;
+import it.eng.spagobi.wapp.metadata.SbiMenu;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
@@ -117,6 +122,72 @@ public Role loadByID(Integer roleID) throws EMFUserError {
 		return toReturn;
 	}
 
+	@Override
+	public Role loadAllElemtnsForRoleByID(Integer roleID) throws EMFUserError {
+		Monitor m = MonitorFactory.start("knowage_loadAllElemtnByID");
+		Role toReturn = null;
+		Session aSession = null;
+		Transaction tx = null;
+
+		try {
+			aSession = getSession();
+			tx = aSession.beginTransaction();
+
+			SbiExtRoles hibRole = (SbiExtRoles) aSession.load(SbiExtRoles.class, roleID);
+			toReturn = toRole(hibRole);
+
+			if (hibRole.getSbiFuncRoles() != null && !hibRole.getSbiFuncRoles().isEmpty()) {
+				toReturn.setRoleFunzionalities((List<String>) hibRole.getSbiFuncRoles().stream().map(x -> ((SbiFuncRole) x).getId().getFunction().getPath())
+						.distinct().collect(Collectors.toList()));
+			}
+
+			if (hibRole.getSbiParuseDets() != null && !hibRole.getSbiParuseDets().isEmpty()) {
+
+				toReturn.setRoleAnaliticalDrivers((List<String>) hibRole.getSbiParuseDets().stream()
+						.map(x -> ((SbiParuseDet) x).getId().getSbiParuse().getSbiParameters().getLabel()).distinct().collect(Collectors.toList()));
+
+			}
+
+			if (hibRole.getSbiNewsRoles() != null && !hibRole.getSbiNewsRoles().isEmpty()) {
+
+				toReturn.setRoleNews(
+						(List<String>) hibRole.getSbiNewsRoles().stream().map(x -> ((SbiNews) x).getName()).distinct().collect(Collectors.toList()));
+
+			}
+
+			if (hibRole.getSbiLayersRoles() != null && !hibRole.getSbiLayersRoles().isEmpty()) {
+
+				toReturn.setRoleLayers(
+						hibRole.getSbiLayersRoles().stream().map(x -> x.getName()).distinct().toList());
+
+			}
+
+			if (hibRole.getSbiUsersRoles() != null && !hibRole.getSbiUsersRoles().isEmpty()) {
+
+				toReturn.setRoleUsers(hibRole.getSbiUsersRoles().stream().map(SbiUser::getUserId).distinct().toList());
+
+			}
+
+			if (hibRole.getSbiMenuRoles() != null && !hibRole.getSbiMenuRoles().isEmpty()) {
+
+				toReturn.setRoleMenu(hibRole.getSbiMenuRoles().stream().map(SbiMenu::getName).distinct().toList());
+
+			}
+
+
+			tx.commit();
+		} catch (HibernateException he) {
+			logException(he);
+			rollbackIfActive(tx);
+			throw new EMFUserError(EMFErrorSeverity.ERROR, 100);
+		} finally {
+			closeSessionIfOpen(aSession);
+		}
+
+		m.stop();
+		return toReturn;
+	}
+
 	@Override
 	public SbiExtRoles loadSbiExtRoleById(Integer roleId) throws EMFUserError {
 		SbiExtRoles toReturn = null;
@@ -160,8 +231,9 @@ public Role loadByName(String roleName) throws EMFUserError {
 				tx = aSession.beginTransaction();
 
 				SbiExtRoles hibRole = loadByNameInSession(roleName, aSession);
-				if (hibRole == null)
+				if (hibRole == null) {
 					return null;
+				}
 
 				toReturn = toRole(hibRole);
 				putIntoCache(roleName, toReturn);
@@ -506,7 +578,7 @@ public void modifyRole(Role aRole) throws EMFUserError {
 
 					SbiAuthorizationsRoles fr = new SbiAuthorizationsRoles();
 					SbiAuthorizationsRolesId id = new SbiAuthorizationsRolesId(authI.getId(), hibRole.getExtRoleId());
-					
+
 
 					fr.setSbiExtRoles(hibRole);
 					fr.setSbiAuthorizations(authI);
@@ -585,7 +657,7 @@ private boolean isAbleTo(Role aRole, SbiAuthorizations authI) {
 				|| (authI.getName().equals("ENABLE_DOSSIER") && aRole.getAbleToUseDossier())
 				|| (authI.getName().equals("ENABLE_DASHBOARD_THEME_MANAGEMENT") && aRole.getAbleToUseDashboardThemeManagement());
 
-				
+
 	}
 
 	/**
@@ -894,7 +966,7 @@ public Role toRole(SbiExtRoles hibRole) {
 			if(name.equals("ENABLE_DASHBOARD_THEME_MANAGEMENT")){
 				role.setAbleToUseDashboardThemeManagement(true);
 			}
-			
+
 
 		}
 
@@ -1124,8 +1196,9 @@ public List<Role> loadPagedRolesList(Integer offset, Integer fetchSize) throws E
 			hibernateQuery = aSession.createQuery("from SbiExtRoles order by name");
 
 			hibernateQuery.setFirstResult(offset);
-			if (fetchSize > 0)
+			if (fetchSize > 0) {
 				hibernateQuery.setMaxResults(fetchSize);
+			}
 
 			toTransform = hibernateQuery.list();
 
@@ -1740,8 +1813,9 @@ public Role loadPublicRole() throws EMFUserError {
 
 			Object hibRoleO = query.uniqueResult();
 
-			if (hibRoleO == null)
+			if (hibRoleO == null) {
 				return null;
+			}
 
 			SbiExtRoles hibRole = (SbiExtRoles) hibRoleO;
 

knowagedao/src/main/java/it/eng/spagobi/commons/metadata/SbiExtRoles.java

@@ -21,6 +21,9 @@
 import java.util.Set;
 
 import it.eng.spagobi.commons.dao.dto.SbiCategory;
+import it.eng.spagobi.mapcatalogue.metadata.SbiGeoLayers;
+import it.eng.spagobi.profiling.bean.SbiUser;
+import it.eng.spagobi.wapp.metadata.SbiMenu;
 
 /**
  * SbiExtRoles generated by hbm2java
@@ -44,6 +47,9 @@ public class SbiExtRoles extends SbiHibernateModel {
 	private Set sbiDataSetCategories;
 	private Set sbiAuthorizationsRoleses = new HashSet();
 	private Set sbiNewsRoles = new HashSet();
+	private Set<SbiGeoLayers> sbiLayersRoles = new HashSet();
+	private Set<SbiUser> sbiUsersRoles = new HashSet();
+	private Set<SbiMenu> sbiMenuRoles = new HashSet();
 
 	// Constructors
 
@@ -260,6 +266,30 @@ public void setSbiNewsRoles(Set sbiNewsRoles) {
 		this.sbiNewsRoles = sbiNewsRoles;
 	}
 
+	public Set<SbiGeoLayers> getSbiLayersRoles() {
+		return sbiLayersRoles;
+	}
+
+	public void setSbiLayersRoles(Set<SbiGeoLayers> sbiLayersRoles) {
+		this.sbiLayersRoles = sbiLayersRoles;
+	}
+
+	public Set<SbiUser> getSbiUsersRoles() {
+		return sbiUsersRoles;
+	}
+
+	public void setSbiUsersRoles(Set<SbiUser> sbiUsersRoles) {
+		this.sbiUsersRoles = sbiUsersRoles;
+	}
+
+	public Set<SbiMenu> getSbiMenuRoles() {
+		return sbiMenuRoles;
+	}
+
+	public void setSbiMenuRoles(Set<SbiMenu> sbiMenuRoles) {
+		this.sbiMenuRoles = sbiMenuRoles;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 *
@@ -280,24 +310,29 @@ public int hashCode() {
 	 */
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if (this == obj) {
 			return true;
-		if (obj == null)
+		}
+		if (obj == null) {
 			return false;
-		if (getClass() != obj.getClass())
+		}
+		if (getClass() != obj.getClass()) {
 			return false;
+		}
 		SbiExtRoles other = (SbiExtRoles) obj;
 		if (extRoleId == null) {
-			if (other.extRoleId != null)
+			if (other.extRoleId != null) {
 				return false;
-		} else if (!extRoleId.equals(other.extRoleId))
+			}
+		} else if (!extRoleId.equals(other.extRoleId)) {
 			return false;
+		}
 		return true;
 	}
 
 	public void changeExtRoleId(Integer id) {
 		this.setExtRoleId(id);
-		
+
 	}
 
 }

knowagedao/src/main/java/it/eng/spagobi/events/bo/EventLog.java

@@ -53,7 +53,6 @@ public class EventLog implements Serializable {
 	private String desc;
 	private String params;
 	private EventType type;
-	private List roles;
 
 	private static Logger logger = Logger.getLogger(EventLog.class);
 
@@ -152,25 +151,6 @@ public void setUser(String user) {
 		this.user = user;
 	}
 
-	/**
-	 * Gets the roles.
-	 *
-	 * @return the roles
-	 */
-	public List getRoles() {
-		return roles;
-	}
-
-	/**
-	 * Sets the roles.
-	 *
-	 * @param roles
-	 *            the new roles
-	 */
-	public void setRoles(List roles) {
-		this.roles = roles;
-	}
-
 	/**
 	 * Gets the type.
 	 *
@@ -195,8 +175,9 @@ public String getFormattedDescription() {
 		if (description != null) {
 			description = GeneralUtilities.replaceInternationalizedMessages(description);
 			description = description.replaceAll("<br/>", " ");
-			if (description.length() > 50)
+			if (description.length() > 50) {
 				description = description.substring(0, 50) + "...";
+			}
 			description = description.replaceAll(">", "&gt;");
 			description = description.replaceAll("<", "&lt;");
 			description = description.replaceAll("\"", "&quot;");