RM-7014 add code to check an rm site has been created before running the patches that require an rm site

This commit is contained in:
Ross Gale
2019-10-17 17:49:01 +01:00
parent 1e236e085f
commit 6c1808731b
5 changed files with 80 additions and 11 deletions

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,19 +75,31 @@ 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()
{
for (SavedSearchDetails savedSearchDetails : recordsManagementSearchService.getSavedSearches(DEFAULT_SITE_NAME))
if(siteService.getSite(DEFAULT_SITE_NAME) != null)
{
if(nodeService.hasAspect(savedSearchDetails.getNodeRef(),ASPECT_SAVED_SEARCH))
for (SavedSearchDetails savedSearchDetails : recordsManagementSearchService.getSavedSearches(DEFAULT_SITE_NAME))
{
break;
if (nodeService.hasAspect(savedSearchDetails.getNodeRef(), ASPECT_SAVED_SEARCH))
{
break;
}
nodeService.addAspect(savedSearchDetails.getNodeRef(), ASPECT_SAVED_SEARCH, null);
}
nodeService.addAspect(savedSearchDetails.getNodeRef(), ASPECT_SAVED_SEARCH, null);
}
}
}

View File

@@ -107,15 +107,18 @@ public class RMv32HoldChildAssocPatch extends AbstractModulePatch
@Override
public void applyInternal()
{
qnameDAO.updateQName(ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_CONTENT);
for (NodeRef filePlan : filePlanService.getFilePlans())
if(qnameDAO.getQName(ASSOC_FROZEN_RECORDS) != null)
{
for (NodeRef hold : holdService.getHolds(filePlan))
qnameDAO.updateQName(ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_CONTENT);
for (NodeRef filePlan : filePlanService.getFilePlans())
{
for (ChildAssociationRef ref : nodeService.getChildAssocs(hold, ASSOC_FROZEN_CONTENT, ASSOC_FROZEN_RECORDS))
for (NodeRef hold : holdService.getHolds(filePlan))
{
holdService.removeFromHold(hold, ref.getChildRef());
holdService.addToHold(hold, ref.getChildRef());
for (ChildAssociationRef ref : nodeService.getChildAssocs(hold, ASSOC_FROZEN_CONTENT, ASSOC_FROZEN_RECORDS))
{
holdService.removeFromHold(hold, ref.getChildRef());
holdService.addToHold(hold, ref.getChildRef());
}
}
}
}