inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge RM-2396 and RM-3727 to master

Browse Source
This commit is contained in:
Ana Bozianu
2017-04-06 10:52:25 +03:00
parent 77e1d30cda 4ea6723600
commit eef010c2cb
10 changed files with 227 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
View File

@@ -91,12 +91,8 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob
// Query is for all records that are due for review and for which
// notification has not been sent.
StringBuilder queryBuffer = new StringBuilder();
queryBuffer.append("+ASPECT:\"rma:vitalRecord\" ");
queryBuffer.append("ASPECT:\"rma:vitalRecord\" ");
queryBuffer.append("AND @rma\\:reviewAsOf:[MIN TO NOW] ");
queryBuffer.append("AND ( ");
queryBuffer.append("@rma\\:notificationIssued:false ");
queryBuffer.append("OR ISNULL:\"rma:notificationIssued\" ");
queryBuffer.append(") ");
String query = queryBuffer.toString();
ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_FTS_ALFRESCO, query);
@@ -124,27 +120,12 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob
}
};
RetryingTransactionCallback<Boolean> txUpdateNodesCallback = new RetryingTransactionCallback<Boolean>()
{
// Set the notification issued property.
public Boolean execute()
{
for (NodeRef node : resultNodes)
{
nodeService.setProperty(node, RecordsManagementModel.PROP_NOTIFICATION_ISSUED, "true");
}
return Boolean.TRUE;
}
};
/**
* Now do the work, one action in each transaction
*/
// don't retry the send email
retryingTransactionHelper.setMaxRetries(0);
retryingTransactionHelper.doInTransaction(txCallbackSendEmail);
retryingTransactionHelper.setMaxRetries(10);
retryingTransactionHelper.doInTransaction(txUpdateNodesCallback);
}
return null;
}

1
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
View File

@@ -136,7 +136,6 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
// Vital record aspect
QName ASPECT_VITAL_RECORD = QName.createQName(RM_URI, "vitalRecord");
QName PROP_REVIEW_AS_OF = QName.createQName(RM_URI, "reviewAsOf");
QName PROP_NOTIFICATION_ISSUED = QName.createQName(RM_URI, "notificationIssued");
// Cut off aspect
QName ASPECT_CUT_OFF = QName.createQName(RM_URI, "cutOff");

27
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -92,6 +92,7 @@ import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -128,6 +129,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
RecordsManagementModel,
RecordsManagementCustomModel,
NodeServicePolicies.OnCreateChildAssociationPolicy,
NodeServicePolicies.OnRemoveAspectPolicy,
NodeServicePolicies.OnUpdatePropertiesPolicy,
ContentServicePolicies.OnContentUpdatePolicy
{
@@ -416,6 +418,29 @@ public class RecordServiceImpl extends BaseBehaviourBean
*/
@Override
@Behaviour
(
kind = BehaviourKind.CLASS,
type = "sys:noContent"
)
public void onRemoveAspect(NodeRef nodeRef, QName aspect)
{
if (nodeService.hasAspect(nodeRef, ASPECT_RECORD))
{
ContentData contentData = (ContentData) nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
if (ContentData.hasContent(contentData) && contentData.getSize() > 0)
{
renameRecord(nodeRef);
}
}
}
/**
* Behaviour executed when a new item is added to a record folder.
*
* @see org.alfresco.repo.node.NodeServicePolicies.OnCreateChildAssociationPolicy#onCreateChildAssociation(org.alfresco.service.cmr.repository.ChildAssociationRef, boolean)
*/
@Override
@Behaviour
(
kind = ASSOCIATION,
type = "rma:recordFolder",
@@ -1765,7 +1790,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
)
public void onContentUpdate(NodeRef nodeRef, boolean newContent)
{
if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN))
if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_LOCKABLE))
{
renameRecord(nodeRef);
}

85
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/ReviewedAction.java
View File

@@ -30,6 +30,7 @@ package org.alfresco.module.org_alfresco_module_rm.vital;
import java.util.Date;
import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;
import org.alfresco.repo.dictionary.types.period.Immediately;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.repository.NodeRef;
import org.apache.commons.logging.Log;
@@ -44,56 +45,72 @@ public class ReviewedAction extends RMActionExecuterAbstractBase
{
private static Log logger = LogFactory.getLog(ReviewedAction.class);
/**
*
* @see org.alfresco.repo.action.executer.ActionExecuterAbstractBase#executeImpl(org.alfresco.service.cmr.action.Action,
* org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
{
VitalRecordDefinition vrDef = getVitalRecordService().getVitalRecordDefinition(actionedUponNodeRef);
/**
*
* @see org.alfresco.repo.action.executer.ActionExecuterAbstractBase#executeImpl(org.alfresco.service.cmr.action.Action,
* org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
{
VitalRecordDefinition vrDef = getVitalRecordService().getVitalRecordDefinition(actionedUponNodeRef);
if (vrDef != null && vrDef.isEnabled())
{
if (getRecordService().isRecord(actionedUponNodeRef))
{
reviewRecord(actionedUponNodeRef, vrDef);
}
else if (getRecordFolderService().isRecordFolder(actionedUponNodeRef))
{
for (NodeRef record : getRecordService().getRecords(actionedUponNodeRef))
if (getRecordService().isRecord(actionedUponNodeRef))
{
reviewRecord(actionedUponNodeRef, vrDef);
}
else if (getRecordFolderService().isRecordFolder(actionedUponNodeRef))
{
for (NodeRef record : getRecordService().getRecords(actionedUponNodeRef))
{
reviewRecord(record, vrDef);
}
}
}
}
}
}
}
/**
* Make record as reviewed.
*
* @param nodeRef
* @param vrDef
*/
private void reviewRecord(NodeRef nodeRef, VitalRecordDefinition vrDef)
{
/**
* Make record as reviewed.
*
* @param nodeRef
* @param vrDef
*/
private void reviewRecord(NodeRef nodeRef, VitalRecordDefinition vrDef)
{
// Calculate the next review date
Date reviewAsOf = vrDef.getNextReviewDate();
if (reviewAsOf != null)
if (vrDef.getReviewPeriod().getPeriodType().equals(Immediately.PERIOD_TYPE))
{
// Log
if (logger.isDebugEnabled())
{
StringBuilder msg = new StringBuilder();
msg.append("Removing reviewAsOf property from")
.append(nodeRef);
logger.debug(msg.toString());
}
this.getNodeService().removeProperty(nodeRef, PROP_REVIEW_AS_OF);
}
else
{
Date reviewAsOf = vrDef.getNextReviewDate();
if (reviewAsOf != null)
{
// Log
if (logger.isDebugEnabled())
{
StringBuilder msg = new StringBuilder();
msg.append("Setting new reviewAsOf property [")
.append(reviewAsOf)
.append("] on ")
.append(nodeRef);
logger.debug(msg.toString());
logger.debug(msg.toString());
}
this.getNodeService().setProperty(nodeRef, PROP_REVIEW_AS_OF, reviewAsOf);
// TODO And record previous review date, time, user
}
this.getNodeService().setProperty(nodeRef, PROP_REVIEW_AS_OF, reviewAsOf);
//TODO And record previous review date, time, user
}
}
}
}