From be7f4b919cffe5c5450a6e8e4f775ca066e8519a Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Mon, 28 May 2018 22:48:57 +0300 Subject: [PATCH 1/4] RM-6337 Fix visibility conditions for accession step. --- .../disposition/DispositionServiceImpl.java | 25 +++++++++++++++---- .../jscript/app/JSONConversionComponent.java | 3 ++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 0da309a7c8..52fd93cf04 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -814,28 +814,43 @@ public class DispositionServiceImpl extends ServiceBaseImpl // Get the disposition instructions DispositionSchedule di = getDispositionSchedule(nodeRef); - NodeRef nextDa = getNextDispositionActionNodeRef(nodeRef); + NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef(); + DispositionAction nextDa = getNextDispositionAction(nodeRef); if (di != null && this.nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) && nextDa != null) { + Boolean combineSteps = null; + if (nextDa.getName().equals("accession")) + { + combineSteps = (Boolean)nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); + } + // If it has an asOf date and it is greater than now the action is eligible - Date asOf = (Date)this.nodeService.getProperty(nextDa, PROP_DISPOSITION_AS_OF); + Date asOf = (Date)this.nodeService.getProperty(nextDa.getNodeRef(), PROP_DISPOSITION_AS_OF); if (asOf != null && asOf.before(new Date())) { result = true; + if (combineSteps == null || !combineSteps) + { + return true; + } + } + else if(combineSteps != null && combineSteps) + { + return false; } - if (!result) + if (!result || (result && combineSteps)) { - DispositionAction da = new DispositionActionImpl(serviceRegistry, nextDa); + DispositionAction da = new DispositionActionImpl(serviceRegistry, nextDa.getNodeRef()); DispositionActionDefinition dad = da.getDispositionActionDefinition(); if (dad != null) { boolean firstComplete = dad.eligibleOnFirstCompleteEvent(); - List assocs = this.nodeService.getChildAssocs(nextDa, ASSOC_EVENT_EXECUTIONS, RegexQNamePattern.MATCH_ALL); + List assocs = this.nodeService.getChildAssocs(nextDa.getNodeRef(), ASSOC_EVENT_EXECUTIONS, RegexQNamePattern.MATCH_ALL); for (ChildAssociationRef assoc : assocs) { NodeRef eventExecution = assoc.getChildRef(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index da2a7234a3..4a9c6c633a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -29,7 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.jscript.app; import static org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel.READ_RECORDS; import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.PROP_COMBINE_DISPOSITION_STEP_CONDITIONS; -import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.PROP_RS_DISPOSITION_EVENTS; +import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.PROP_DISPOSITION_EVENT_COMBINATION; import static org.alfresco.service.cmr.security.AccessStatus.ALLOWED; import java.util.ArrayList; @@ -485,6 +485,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS HashMap properties = ((HashMap) rmNodeValues.get("properties")); properties.put("combineDispositionStepConditions", nodeService.getProperty(dispositionService.getNextDispositionAction(nodeRef).getDispositionActionDefinition().getNodeRef(), PROP_COMBINE_DISPOSITION_STEP_CONDITIONS)); properties.put("incompleteDispositionEvent", details.getEventName()); + properties.put("dispositionEventCombination", nodeService.getProperty(dispositionService.getNextDispositionAction(nodeRef).getDispositionActionDefinition().getNodeRef(), PROP_DISPOSITION_EVENT_COMBINATION)); break; } } From 66bbd743cfd566a469f47c4c3beeba6595f54f05 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Mon, 28 May 2018 23:53:59 +0300 Subject: [PATCH 2/4] RM-6337 Fix failing tests --- .../disposition/DispositionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 52fd93cf04..86a67b2fb8 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -814,7 +814,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl // Get the disposition instructions DispositionSchedule di = getDispositionSchedule(nodeRef); - NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef(); DispositionAction nextDa = getNextDispositionAction(nodeRef); if (di != null && this.nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) && @@ -823,6 +822,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl Boolean combineSteps = null; if (nextDa.getName().equals("accession")) { + NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef(); combineSteps = (Boolean)nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); } From 5b7452199950bc42eb3b8fadfcc65faea54fe28a Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Tue, 29 May 2018 15:21:59 +0300 Subject: [PATCH 3/4] RM-6337 Code review changes --- .../disposition/DispositionServiceImpl.java | 86 +++++++++---------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 86a67b2fb8..c9d33dd7f9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -811,7 +811,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl public boolean isNextDispositionActionEligible(NodeRef nodeRef) { boolean result = false; - // Get the disposition instructions DispositionSchedule di = getDispositionSchedule(nodeRef); DispositionAction nextDa = getNextDispositionAction(nodeRef); @@ -819,70 +818,69 @@ public class DispositionServiceImpl extends ServiceBaseImpl this.nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) && nextDa != null) { - Boolean combineSteps = null; + // for accession step we can have also AND between step conditions + Boolean combineSteps = false; if (nextDa.getName().equals("accession")) { NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef(); - combineSteps = (Boolean)nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); - } - - // If it has an asOf date and it is greater than now the action is eligible - Date asOf = (Date)this.nodeService.getProperty(nextDa.getNodeRef(), PROP_DISPOSITION_AS_OF); - if (asOf != null && - asOf.before(new Date())) - { - result = true; - if (combineSteps == null || !combineSteps) - { - return true; + if (accessionNodeRef != null) { + if (this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS) != null) + { + combineSteps = (Boolean)this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); + } } } - else if(combineSteps != null && combineSteps) + Date asOf = (Date)this.nodeService.getProperty(nextDa.getNodeRef(), PROP_DISPOSITION_AS_OF); + Boolean asOfDateInPast = false; + if (asOf != null) + { + asOfDateInPast = ((Date) this.nodeService.getProperty(nextDa.getNodeRef(), PROP_DISPOSITION_AS_OF)).before(new Date()); + } + if (asOfDateInPast && !combineSteps) + { + return true; + } + else if(!asOfDateInPast && combineSteps) { return false; } - - if (!result || (result && combineSteps)) + DispositionAction da = new DispositionActionImpl(serviceRegistry, nextDa.getNodeRef()); + DispositionActionDefinition dad = da.getDispositionActionDefinition(); + if (dad != null) { - DispositionAction da = new DispositionActionImpl(serviceRegistry, nextDa.getNodeRef()); - DispositionActionDefinition dad = da.getDispositionActionDefinition(); - if (dad != null) + boolean firstComplete = dad.eligibleOnFirstCompleteEvent(); + + List assocs = this.nodeService.getChildAssocs(nextDa.getNodeRef(), ASSOC_EVENT_EXECUTIONS, RegexQNamePattern.MATCH_ALL); + for (ChildAssociationRef assoc : assocs) { - boolean firstComplete = dad.eligibleOnFirstCompleteEvent(); - - List assocs = this.nodeService.getChildAssocs(nextDa.getNodeRef(), ASSOC_EVENT_EXECUTIONS, RegexQNamePattern.MATCH_ALL); - for (ChildAssociationRef assoc : assocs) + NodeRef eventExecution = assoc.getChildRef(); + Boolean isCompleteValue = (Boolean)this.nodeService.getProperty(eventExecution, PROP_EVENT_EXECUTION_COMPLETE); + boolean isComplete = false; + if (isCompleteValue != null) { - NodeRef eventExecution = assoc.getChildRef(); - Boolean isCompleteValue = (Boolean)this.nodeService.getProperty(eventExecution, PROP_EVENT_EXECUTION_COMPLETE); - boolean isComplete = false; - if (isCompleteValue != null) - { - isComplete = isCompleteValue.booleanValue(); + isComplete = isCompleteValue.booleanValue(); - // implement AND and OR combination of event completions - if (isComplete) + // implement AND and OR combination of event completions + if (isComplete) + { + result = true; + if (firstComplete) { - result = true; - if (firstComplete) - { - break; - } + break; } - else + } + else + { + result = false; + if (!firstComplete) { - result = false; - if (!firstComplete) - { - break; - } + break; } } } } } } - return result; } From d87861b199ef694935c38f0ec82df97be5648a22 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Wed, 30 May 2018 09:38:25 +0300 Subject: [PATCH 4/4] RM-6337 Code review changes --- .../disposition/DispositionServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index c9d33dd7f9..abe1efba5f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -824,9 +824,10 @@ public class DispositionServiceImpl extends ServiceBaseImpl { NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef(); if (accessionNodeRef != null) { - if (this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS) != null) + Boolean combineStepsProp = (Boolean)this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); + if (combineStepsProp != null) { - combineSteps = (Boolean)this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); + combineSteps = combineStepsProp; } } } @@ -834,7 +835,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl Boolean asOfDateInPast = false; if (asOf != null) { - asOfDateInPast = ((Date) this.nodeService.getProperty(nextDa.getNodeRef(), PROP_DISPOSITION_AS_OF)).before(new Date()); + asOfDateInPast = asOf.before(new Date()); } if (asOfDateInPast && !combineSteps) {