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

APPS-659

Browse Source 
[Upgrade] Search Result points to incorrect link to Folder on Hold
This commit is contained in:
estan
2021-03-02 15:04:41 +02:00
parent aad5f99b9a
commit b3d8975444
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v35/RMv35HoldNewChildAssocPatch.java
View File

@@ -125,7 +125,7 @@ public class RMv35HoldNewChildAssocPatch extends AbstractModulePatch
NodeRef nodeRef = ref.getChildRef(); NodeRef nodeRef = ref.getChildRef();
//search the second parent //search the second parent
List<ChildAssociationRef> parentAssoc = nodeService.getParentAssocs(nodeRef, ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); List<ChildAssociationRef> parentAssoc = nodeService.getParentAssocs(nodeRef, ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
if (parentAssoc.isEmpty()) if (parentAssoc.size() <= 1)
{ {
ChildAssociationRef primaryParentAssoc = nodeService.getPrimaryParent(nodeRef); ChildAssociationRef primaryParentAssoc = nodeService.getPrimaryParent(nodeRef);
nodeService.addChild(hold, nodeRef, ASSOC_CONTAINS, primaryParentAssoc.getQName()); nodeService.addChild(hold, nodeRef, ASSOC_CONTAINS, primaryParentAssoc.getQName());

14
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v35/RMv35HoldNewChildAssocPatchUnitTest.java
View File

@@ -27,6 +27,8 @@
package org.alfresco.module.org_alfresco_module_rm.patch.v35; package org.alfresco.module.org_alfresco_module_rm.patch.v35;
import static org.alfresco.model.ContentModel.ASSOC_CONTAINS;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASSOC_FROZEN_CONTENT;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyMap; import static org.mockito.Matchers.anyMap;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
@@ -48,6 +50,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
@@ -77,11 +80,14 @@ public class RMv35HoldNewChildAssocPatchUnitTest
private RMv35HoldNewChildAssocPatch patch; private RMv35HoldNewChildAssocPatch patch;
private NodeRef filePlanRef, holdRef, heldItemRef; private NodeRef filePlanRef, holdRef, heldItemRef;
private Set<NodeRef> fileplans; private Set<NodeRef> fileplans;
private List<NodeRef> holds; private List<NodeRef> holds;
@Mock @Mock
private ChildAssociationRef childAssociationRef; private ChildAssociationRef childAssociationRef;
@Mock
private ChildAssociationRef primaryParentAssoc;
private List<ChildAssociationRef> childAssocs; private List<ChildAssociationRef> childAssocs;
@@ -104,15 +110,15 @@ public class RMv35HoldNewChildAssocPatchUnitTest
* Test held items are removed from a hold and re-add to make sure the association is correct * Test held items are removed from a hold and re-add to make sure the association is correct
*/ */
@Test @Test
public void testAHoldIsRemovedAndReplacedDuringUpgrade() public void testAddChildDuringUpgrade()
{ {
when(mockFilePlanService.getFilePlans()).thenReturn(fileplans); when(mockFilePlanService.getFilePlans()).thenReturn(fileplans);
when(mockHoldService.getHolds(filePlanRef)).thenReturn(holds); when(mockHoldService.getHolds(filePlanRef)).thenReturn(holds);
when(mockNodeService.getChildAssocs(holdRef, ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL)).thenReturn(childAssocs);
when(childAssociationRef.getChildRef()).thenReturn(heldItemRef); when(childAssociationRef.getChildRef()).thenReturn(heldItemRef);
when(mockNodeService.getChildAssocs(holdRef)).thenReturn(childAssocs); when(mockNodeService.getPrimaryParent(heldItemRef)).thenReturn(primaryParentAssoc);
patch.applyInternal(); patch.applyInternal();
verify(mockHoldService, times(1)).removeFromHold(holdRef, heldItemRef); verify(mockNodeService, times(1)).addChild(holdRef, heldItemRef, ASSOC_CONTAINS, primaryParentAssoc.getQName());
verify(mockHoldService, times(1)).addToHold(holdRef, heldItemRef);
} }
@Test @Test