inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/RM-7014_CheckForRmSite' into 'master'

Browse Source 
RM-7014 add code to check an rm site has been created before running the...

Closes RM-7014

See merge request records-management/records-management!1277
This commit is contained in:
Ross Gale
2019-10-19 11:26:07 +01:00
parent e6983ce90f bd4c398205
commit 1608781182
6 changed files with 84 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v23-context.xml
View File

@@ -40,8 +40,10 @@
class="org.alfresco.module.org_alfresco_module_rm.patch.v23.RMv23SavedSearchesPatch">
<property name="description" value="Add aspect to saved searches."/>
<property name="fixesToSchema" value="2700"/>
<property name="targetSchema" value="2701" />
<property name="recordsManagementSearchService" ref="RecordsManagementSearchService"/>
<property name="nodeService" ref="NodeService"/>
<property name="siteService" ref="SiteService"/>
</bean>

4
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v32-context.xml
View File

@@ -10,8 +10,8 @@
<bean id="rm.holdChildAssocPatch"
parent="rm.parentModulePatch"
class="org.alfresco.module.org_alfresco_module_rm.patch.v32.RMv32HoldChildAssocPatch">
<property name="description" value="Change hold child assoc from frozenRecords frozenContent to support holding active content."/>
<property name="fixesToSchema" value="2700"/>
<property name="description" value="Change hold child association from frozenRecords to frozenContent to support holding active content."/>
<property name="fixesToSchema" value="2701"/>
<property name="targetSchema" value="3200"/>
<property name="qnameDAO" ref="qnameDAO" />
<property name="filePlanService" ref="filePlanService" />

18
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatch.java
View File

@@ -34,6 +34,7 @@ import org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteService;
/**
* RM v2.3 patch that adds the saved search aspect.
@@ -53,6 +54,11 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
*/
private NodeService nodeService;
/**
* Site service fundamental API.
*/
private SiteService siteService;
/**
* @param recordsManagementSearchService records management search service
*/
@@ -69,11 +75,22 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
this.nodeService = nodeService;
}
/**
* Setter for siteService
* @param siteService Site service fundamental API.
*/
public void setSiteService(SiteService siteService)
{
this.siteService = siteService;
}
/**
* Retrieves all saved searches for the records management site and adds ASPECT_SAVED_SEARCH
*/
@Override
public void applyInternal()
{
if(siteService.getSite(DEFAULT_SITE_NAME) != null)
{
for (SavedSearchDetails savedSearchDetails : recordsManagementSearchService.getSavedSearches(DEFAULT_SITE_NAME))
{
@@ -85,4 +102,5 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
}
}
}
}

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v32/RMv32HoldChildAssocPatch.java
View File

@@ -104,8 +104,11 @@ public class RMv32HoldChildAssocPatch extends AbstractModulePatch
this.nodeService = nodeService;
}
@SuppressWarnings ("deprecation")
@Override
public void applyInternal()
{
if(qnameDAO.getQName(ASSOC_FROZEN_RECORDS) != null)
{
qnameDAO.updateQName(ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_CONTENT);
for (NodeRef filePlan : filePlanService.getFilePlans())
@@ -121,3 +124,4 @@ public class RMv32HoldChildAssocPatch extends AbstractModulePatch
}
}
}
}

35
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatchUnitTest.java
View File

@@ -29,6 +29,9 @@ package org.alfresco.module.org_alfresco_module_rm.patch.v23;
import static java.util.Arrays.asList;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_SAVED_SEARCH;
import static org.alfresco.module.org_alfresco_module_rm.model.rma.type.RmSiteType.DEFAULT_SITE_NAME;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyMap;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -39,6 +42,10 @@ import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearch
import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.namespace.QName;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
@@ -56,6 +63,12 @@ public class RMv23SavedSearchesPatchUnitTest
@Mock
private NodeService nodeService;
@Mock
private SiteService siteService;
@Mock
private SiteInfo siteInfo;
@Mock
private RecordsManagementSearchServiceImpl recordsManagementSearchService;
@@ -65,6 +78,12 @@ public class RMv23SavedSearchesPatchUnitTest
@InjectMocks
private RMv23SavedSearchesPatch patch;
@Before
public void setUp()
{
MockitoAnnotations.initMocks(this);
}
/**
* Given that I am upgrading an existing repository to v2.3
* When I execute the patch
@@ -73,13 +92,13 @@ public class RMv23SavedSearchesPatchUnitTest
@Test
public void executePatch()
{
MockitoAnnotations.initMocks(this);
NodeRef noderef1 = new NodeRef("foo://123/456");
NodeRef noderef2 = new NodeRef("bar://123/456");
List<SavedSearchDetails> searches = asList(mockSavedSearchDetails1, mockSavedSearchDetails2);
when(mockSavedSearchDetails1.getNodeRef()).thenReturn(noderef1);
when(mockSavedSearchDetails2.getNodeRef()).thenReturn(noderef2);
when(recordsManagementSearchService.getSavedSearches("rm")).thenReturn(searches);
when(siteService.getSite(DEFAULT_SITE_NAME)).thenReturn(siteInfo);
// execute patch
patch.applyInternal();
@@ -88,4 +107,18 @@ public class RMv23SavedSearchesPatchUnitTest
verify(nodeService, times(1)).addAspect(noderef2, ASPECT_SAVED_SEARCH, null);
}
/**
* Test patch code doesnt run with an rm site
*/
@Test
public void testPatchDoesntRunWithoutRmSite()
{
when(siteService.getSite(DEFAULT_SITE_NAME)).thenReturn(null);
// execute patch
patch.applyInternal();
verify(nodeService, times(0)).addAspect(any(NodeRef.class), any(QName.class), anyMap());
}
}

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

@@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.patch.v32;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASSOC_FROZEN_CONTENT;
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASSOC_FROZEN_RECORDS;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -44,6 +45,7 @@ import org.alfresco.repo.domain.qname.QNameDAO;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.util.Pair;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
@@ -105,6 +107,7 @@ public class RMv32HoldChildAssocPatchUnitTest
@Test
public void testAHoldIsRemovedAndReplacedDuringUpgrade()
{
when(qNameDAO.getQName(ASSOC_FROZEN_RECORDS)).thenReturn(new Pair(ASSOC_FROZEN_CONTENT,null));
when(filePlanService.getFilePlans()).thenReturn(fileplans);
when(holdService.getHolds(filePlanRef)).thenReturn(holds);
when(nodeService.getChildAssocs(holdRef, ASSOC_FROZEN_CONTENT, ASSOC_FROZEN_RECORDS)).thenReturn(childAssocs);
@@ -113,4 +116,15 @@ public class RMv32HoldChildAssocPatchUnitTest
verify(holdService, times(1)).removeFromHold(holdRef, heldItemRef);
verify(holdService, times(1)).addToHold(holdRef, heldItemRef);
}
/**
* Test patch doesnt run without an association added during rm site creation
*/
@Test
public void testAHoldIsntRemovedAndReplacedDuringUpgradeWithNoRmSite()
{
when(qNameDAO.getQName(ASSOC_FROZEN_RECORDS)).thenReturn(null);
patch.applyInternal();
verify(qNameDAO, never()).updateQName(ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_CONTENT);
}
}