Merge pull request #2002 from zlamalp/membergroup

CORE,RPC: Added removeAttributes for member,group and user

Author: stavamichal

perun-core/src/main/java/cz/metacentrum/perun/core/api/AttributesManager.java

@@ -3259,6 +3259,20 @@ public interface AttributesManager {
 	 */
 	void removeAttributes(PerunSession sess, Member member, Group group, List<? extends AttributeDefinition> attributes) throws InternalErrorException, PrivilegeException, AttributeNotExistsException, MemberNotExistsException, GroupNotExistsException, WrongAttributeAssignmentException, WrongAttributeValueException, WrongReferenceAttributeValueException;
 
+
+	/**
+	 * PRIVILEGE: Remove attributes only when principal has access to write on them.
+	 * <p>
+	 * Batch version of removeAttribute. This method automatically skip all core attributes which can't be removed this way.
+	 * If workWithUserAttributes is true, unset also user attributes.
+	 *
+	 * @param workWithUserAttributes if true, remove also user attributes, if false, remove only member-group attributes
+	 *
+	 * @throws AttributeNotExistsException if the any of attributes doesn't exists in underlying data source
+	 * @see cz.metacentrum.perun.core.api.AttributesManager#removeAttribute(PerunSession, Member, Group, AttributeDefinition)
+	 */
+	void removeAttributes(PerunSession sess, Member member, Group group, List<? extends AttributeDefinition> attributes, boolean workWithUserAttributes) throws InternalErrorException, PrivilegeException, AttributeNotExistsException, MemberNotExistsException, GroupNotExistsException, WrongAttributeAssignmentException, WrongAttributeValueException, WrongReferenceAttributeValueException;
+
 	/**
 	 * Unset all attributes for the member in the group.
 	 * <p>

perun-core/src/main/java/cz/metacentrum/perun/core/entry/AttributesManagerEntry.java

@@ -3561,6 +3561,11 @@ public void removeAttribute(PerunSession sess, Member member, Group group, Attri
 
 	@Override
 	public void removeAttributes(PerunSession sess, Member member, Group group, List<? extends AttributeDefinition> attributes) throws InternalErrorException, PrivilegeException, AttributeNotExistsException, MemberNotExistsException, GroupNotExistsException, WrongAttributeAssignmentException, WrongAttributeValueException, WrongReferenceAttributeValueException {
+		removeAttributes(sess, member, group, attributes, false);
+	}
+
+	@Override
+	public void removeAttributes(PerunSession sess, Member member, Group group, List<? extends AttributeDefinition> attributes, boolean workWithUserAttributes) throws InternalErrorException, PrivilegeException, AttributeNotExistsException, MemberNotExistsException, GroupNotExistsException, WrongAttributeAssignmentException, WrongAttributeValueException, WrongReferenceAttributeValueException {
 		Utils.checkPerunSession(sess);
 		getPerunBl().getMembersManagerBl().checkMemberExists(sess, member);
 		getPerunBl().getGroupsManagerBl().checkGroupExists(sess, group);
@@ -3569,7 +3574,7 @@ public void removeAttributes(PerunSession sess, Member member, Group group, List
 		for(AttributeDefinition attrDef: attributes) {
 			if(!AuthzResolver.isAuthorizedForAttribute(sess, ActionType.WRITE, attrDef, member, group)) throw new PrivilegeException("Principal has no access to remove attribute = " + attrDef);
 		}
-		getAttributesManagerBl().removeAttributes(sess, member, group, attributes);
+		getAttributesManagerBl().removeAttributes(sess, member, group, attributes, workWithUserAttributes);
 	}
 
 	@Override

perun-rpc/src/main/java/cz/metacentrum/perun/rpc/methods/AttributesManagerMethod.java

@@ -2847,7 +2847,13 @@ public Void call(ApiCaller ac, Deserializer parms) throws PerunException {
 							attributes);
 				}
 			} else if (parms.contains("member")) {
-				if (parms.contains("workWithUserAttributes")) {
+				if (parms.contains("workWithUserAttributes") && parms.contains("group")) {
+					ac.getAttributesManager().removeAttributes(ac.getSession(),
+							ac.getMemberById(parms.readInt("member")),
+							ac.getGroupById(parms.readInt("group")),
+							attributes,
+							parms.readBoolean("workWithUserAttributes"));
+				} else if (parms.contains("workWithUserAttributes")) {
 					ac.getAttributesManager().removeAttributes(ac.getSession(),
 							ac.getMemberById(parms.readInt("member")),
 							parms.readBoolean("workWithUserAttributes"), attributes);