MIFOSX-126 - Objective 1 Complete - new permission regime implemented plus a more intuitive UI

mifosng-provider/src/main/java/org/mifosng/platform/exceptions/PermissionNotFoundException.java

@@ -0,0 +1,13 @@
+package org.mifosng.platform.exceptions;
+
+/**
+ * A {@link RuntimeException} thrown when permission resources are not found.
+ */
+public class PermissionNotFoundException extends
+		AbstractPlatformResourceNotFoundException {
+
+	public PermissionNotFoundException(String code) {
+		super("error.msg.permission.code.invalid", "Permission with Code "
+				+ code + " does not exist", code);
+	}
+}

mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import org.mifosng.platform.accounting.api.commands.RolePermissionCommand;
 import org.mifosng.platform.api.commands.RoleCommand;
+import org.mifosng.platform.exceptions.PermissionNotFoundException;
 import org.mifosng.platform.exceptions.RoleNotFoundException;
 import org.mifosng.platform.security.PlatformSecurityContext;
 import org.mifosng.platform.user.domain.Permission;
@@ -19,7 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 @Service
-public class RoleWritePlatformServiceJpaRepositoryImpl implements RoleWritePlatformService {
+public class RoleWritePlatformServiceJpaRepositoryImpl implements
+		RoleWritePlatformService {
 
 	private final PlatformSecurityContext context;
 	private final RoleRepository roleRepository;
@@ -27,7 +29,9 @@ public class RoleWritePlatformServiceJpaRepositoryImpl implements RoleWritePlatf
 	private final PermissionRepository permissionRepository;
 
 	@Autowired
-    public RoleWritePlatformServiceJpaRepositoryImpl(final PlatformSecurityContext context, final RoleRepository roleRepository,
+	public RoleWritePlatformServiceJpaRepositoryImpl(
+			final PlatformSecurityContext context,
+			final RoleRepository roleRepository,
 			final PermissionRepository permissionRepository) {
 		this.context = context;
 		this.roleRepository = roleRepository;
@@ -43,9 +47,11 @@ public class RoleWritePlatformServiceJpaRepositoryImpl implements RoleWritePlatf
 		RoleCommandValidator validator = new RoleCommandValidator(command);
 		validator.validateForCreate();
 
-        List<Permission> selectedPermissions = assembleListOfSelectedPermissions(command.getPermissions());
+		List<Permission> selectedPermissions = assembleListOfSelectedPermissions(command
+				.getPermissions());
 
-        Role entity = new Role(command.getName(), command.getDescription(), selectedPermissions);
+		Role entity = new Role(command.getName(), command.getDescription(),
+				selectedPermissions);
 
 		this.roleRepository.save(entity);
 
@@ -61,10 +67,13 @@ public class RoleWritePlatformServiceJpaRepositoryImpl implements RoleWritePlatf
 		RoleCommandValidator validator = new RoleCommandValidator(command);
 		validator.validateForUpdate();
 
-        List<Permission> selectedPermissions = assembleListOfSelectedPermissions(command.getPermissions());
+		List<Permission> selectedPermissions = assembleListOfSelectedPermissions(command
+				.getPermissions());
 
 		Role role = this.roleRepository.findOne(command.getId());
-        if (role == null) { throw new RoleNotFoundException(command.getId()); }
+		if (role == null) {
+			throw new RoleNotFoundException(command.getId());
+		}
 		role.update(command, selectedPermissions);
 
 		this.roleRepository.save(role);
@@ -77,30 +86,54 @@ public class RoleWritePlatformServiceJpaRepositoryImpl implements RoleWritePlatf
 	public Long updateRolePermissions(final RolePermissionCommand command) {
 		context.authenticatedUser();
 
-//        RoleCommandValidator validator = new RoleCommandValidator(command);
-//        validator.validateForUpdate();
-
 		final Role role = this.roleRepository.findOne(command.getRoleId());
 		if (role == null) {
 			throw new RoleNotFoundException(command.getRoleId());
 		}
 
-        Map<String, Boolean> permissions = command.getPermissions();
+		Collection<Permission> allPermissions = this.permissionRepository
-        for (String permissionCode : permissions.keySet()) {
+				.findAll();
-            Boolean selected = permissions.get(permissionCode);
+
-            if (selected.booleanValue()) {
+		Map<String, Boolean> commandPermissions = command.getPermissions();
-//                this.permissionRepository.findOne(id)
+		for (String permissionCode : commandPermissions.keySet()) {
-            }
+			Boolean selected = commandPermissions.get(permissionCode);
+
+			Permission permission = getPermissionByCode(allPermissions,
+					permissionCode);
+
+			if (role.getPermissions().contains(permission)) {
+				if (!(selected)) {
+					role.getPermissions().remove(permission);
 				}
 
-//        role.update(command, selectedPermissions);
+			} else {
+				if (selected) {
+					role.getPermissions().add(permission);
+				}
+
+			}
+		}
 
 		this.roleRepository.save(role);
 
 		return role.getId();
 	}
 
-    private List<Permission> assembleListOfSelectedPermissions(final String[] selectedPermissionsArray) {
+	private Permission getPermissionByCode(
+			Collection<Permission> allPermissions, String permissionCode) {
+				
+		if (allPermissions != null) {
+			for (Permission permission : allPermissions) {
+				if (permission.code().equals(permissionCode)) return permission;
+				
+			}
+		}
+
+		throw new PermissionNotFoundException(permissionCode);
+	}
+
+	private List<Permission> assembleListOfSelectedPermissions(
+			final String[] selectedPermissionsArray) {
 		List<Long> selectedPermissionIds = new ArrayList<Long>();
 		List<Permission> selectedPermissions = new ArrayList<Permission>();
 
@@ -109,7 +142,8 @@ public class RoleWritePlatformServiceJpaRepositoryImpl implements RoleWritePlatf
 				selectedPermissionIds.add(Long.valueOf(selectedId));
 			}
 
-            Collection<Permission> allPermissions = this.permissionRepository.findAll();
+			Collection<Permission> allPermissions = this.permissionRepository
+					.findAll();
 			for (Permission permission : allPermissions) {
 				if (selectedPermissionIds.contains(permission.getId())) {
 					selectedPermissions.add(permission);