audit the properties specific to cm:person before deleting the node in order to provide information about the delete user

This commit is contained in:
Rodica Sutu
2018-03-21 23:06:48 +02:00
parent 94581b56fa
commit da54db41c7
3 changed files with 44 additions and 10 deletions

View File

@@ -1514,6 +1514,16 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
json.put("nodeName", userName == null ? "": userName);
json.put("createPerson", true);
}
else if (entry.getEvent().equals("Delete Person") && entry.getNodeRef() != null)
{
String userName = null;
if (entry.getBeforeProperties() != null)
{
userName = (String) entry.getBeforeProperties().get(ContentModel.PROP_USERNAME);
}
json.put("nodeName", userName == null ? "" : userName);
json.put("deletePerson", true);
}
else
{
json.put("nodeName", entry.getNodeName() == null ? "": entry.getNodeName());
@@ -1525,11 +1535,6 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
json.put("deleteObject", true);
}
if (entry.getEvent().equals("Delete Person") && entry.getNodeRef() != null)
{
json.put("deletePerson", true);
}
json.put("nodeType", entry.getNodeType() == null ? "": entry.getNodeType());
json.put("event", entry.getEvent() == null ? "": getAuditEventLabel(entry.getEvent()));
json.put("identifier", entry.getIdentifier() == null ? "": entry.getIdentifier());

View File

@@ -26,11 +26,20 @@
*/
package org.alfresco.module.org_alfresco_module_rm.audit.event;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy;
import org.alfresco.repo.policy.annotation.Behaviour;
import org.alfresco.repo.policy.annotation.BehaviourBean;
import org.alfresco.repo.policy.annotation.BehaviourKind;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
/**
* Audits person deletion.
@@ -41,14 +50,21 @@ import org.alfresco.service.cmr.repository.NodeRef;
@BehaviourBean
public class DeletePersonAuditEvent extends AuditEvent implements BeforeDeleteNodePolicy
{
/*
private NodeService nodeService;
private DictionaryService dictionaryService;
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
*/
public void setDictionaryService(DictionaryService dictionaryService)
{
this.dictionaryService = dictionaryService;
}
/**
* @see org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy#(org.alfresco.service.cmr.repository.ChildAssociationRef)
*/
@@ -61,9 +77,21 @@ public class DeletePersonAuditEvent extends AuditEvent implements BeforeDeleteNo
)
public void beforeDeleteNode(NodeRef nodeRef)
{
//get the cm:person properties
Set<QName> properties = dictionaryService.getPropertyDefs(ContentModel.TYPE_PERSON).keySet();
//retrive the properties and the values
Map<QName, Serializable> result = new HashMap<>();
for (QName property : properties)
{
Serializable values = nodeService.getProperty(nodeRef, property);
if (values != null)
{
result.put(property, values);
}
}
//audit the property values before the delete event
// Map<QName, Serializable> before = nodeService.getProperties(nodeRef);
recordsManagementAuditService.auditEvent(nodeRef, getName(), null, null, true, false);
recordsManagementAuditService.auditEvent(nodeRef, getName(), result, null, true, false);
}