Menu Access Control Update

src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java

@@ -50,12 +50,7 @@ public class MenuController {
 		this.menuItemAccessRepository = menuItemAccessRepository;
 		this.subMenuItemAccessRepository = subMenuItemAccessRepository;
     }
-    /*
-    @ModelAttribute("menuItems") // This will add the mßenuItems to the model for all requests
-    public List<MenuItemEntity> getMenuItems() {
-        return menuItemRepository.findAll();
-    }
-    */
+    
     @ModelAttribute("menuItemsHTML") // This will add the menuItems to the model for all requests
     public String menuHTML() {
     	
@@ -63,11 +58,10 @@ public class MenuController {
     		return "";
     	}
     	
-    	//System.out.println("MenuController: ID: " + LoginUserInfo.getUserGroupId());
+    	
     	List<AppModuleAccessEntity> getAppModuleAccessEntities;
     	List<AppModuleEntity> getAppModuleEntities;
     	if(LoginUserInfo.getUserRole().equals("ADMIN")) {
-    		//getAppModuleAccessEntities = appModuleAccessRepository.findAll();
     		getAppModuleEntities = appModuleRepository.showAll();
     	}
     	else {
@@ -81,49 +75,10 @@ public class MenuController {
         	}
         	getAppModuleEntities = appModuleRepository.showAllById(checkModuleId);
     	}
-    	//System.out.println(LoginUserInfo.getUserRole());
-    	
-    	
-    	
-    	
-    	// Create a set to store module IDs to be excluded
-    	//Set<AppModuleEntity> includeModuleIds = new HashSet<>();
-
-    	/*
-    	// Populate the set with module IDs to be excluded
-    	for (AppModuleAccessEntity accessEntity : getAppModuleAccessEntities) {
-    	    includeModuleIds.add(accessEntity.getModuleId());
-    	}
-    	
-    	// Convert the set of module IDs to a comma-separated string
-    	StringBuilder moduleIdsBuilder = new StringBuilder();
-    	for (AppModuleEntity moduleId : includeModuleIds) {
-    	    moduleIdsBuilder.append(moduleId.getId()).append(",");
-    	}
-    	*/
-    	// Convert the set of module IDs to a comma-separated string
-    
-    	
-		//StringBuilder moduleIdsBuilder = new StringBuilder();
-    	
-    	/*
-    	for(i=0;i<checkModuleid.length;i++) {
-    		System.out.println("Check ID:"+getAppModuleAccessEntities.get(i).getId()+"\n");
-    		//System.out.println("Check ID:"+checkModuleid[i]+"\n");
-    	}
-    	*/
-    	// Remove the trailing comma
-    	//String moduleIds = moduleIdsBuilder.length() > 0 ? moduleIdsBuilder.substring(0, moduleIdsBuilder.length() - 1) : "";
-
-    	
-    	//System.out.println("Module IDs:"+moduleIds);
-    	
     	
-    	
-    	//System.out.println("IModule Size:"+getAppModuleEntities.size());
     	String menuHTML = "";
     	for (AppModuleEntity moduleName : getAppModuleEntities) {
-    		//System.out.println("IN Module IDs:"+moduleName.getId());
+    		
     		menuHTML = menuHTML+"<div class=\"nav-item has-sub\"><a href=\"javascript:void(0)\"><i class=\""+moduleName.getIcon()+"\"></i><span>"+moduleName.getName()+"</span></a><div class=\"submenu-content\">";
     		
     		List<MenuItemEntity> getMenuItems;