structure in file plan as the admin user
+ * Helper method to create a randomly-named [category]/[folder] structure in file plan as the admin user
*
* @return {@link RecordCategoryChild} which represents the record folder
- * @throws Exception on failed creation
+ * @throws RuntimeException on failed creation
*/
- public RecordCategoryChild createCategoryFolderInFilePlan() throws Exception
+ public RecordCategoryChild createCategoryFolderInFilePlan()
{
return createCategoryFolderInFilePlan(getAdminUser());
}
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
index 7cfa70a35c..a906c5217a 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
@@ -46,6 +46,10 @@ import static org.springframework.http.HttpStatus.NOT_FOUND;
import static org.springframework.http.HttpStatus.NO_CONTENT;
import static org.springframework.http.HttpStatus.OK;
+import org.alfresco.rest.core.RestResponse;
+import org.alfresco.rest.model.RestNodeBodyMoveCopyModel;
+import org.alfresco.rest.model.RestNodeModel;
+import org.alfresco.rest.requests.Node;
import org.alfresco.rest.rm.community.base.BaseRMRestTest;
import org.alfresco.rest.rm.community.model.record.Record;
import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
@@ -55,8 +59,10 @@ import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
import org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI;
import org.alfresco.test.AlfrescoTest;
import org.alfresco.utility.data.RandomData;
+import org.alfresco.utility.model.RepoTestModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.UserModel;
+import org.alfresco.utility.report.log.Step;
import org.testng.annotations.Test;
/**
@@ -245,6 +251,40 @@ public class DeleteRecordTests extends BaseRMRestTest
assertStatusCode(FORBIDDEN);
}
+ /**
+ *
+ * Given a record
+ * And a copy of that record
+ * When I delete the copy
+ * Then it is still possible to view the content of the original record
+ *
+ */
+ @Test(description = "Deleting copy of record doesn't delete original content")
+ @AlfrescoTest(jira="MNT-18806")
+ public void deleteCopyOfRecord()
+ {
+ Step.STEP("Create two record categories and folders.");
+ RecordCategoryChild recordFolderA = createCategoryFolderInFilePlan();
+ RecordCategoryChild recordFolderB = createCategoryFolderInFilePlan();
+
+ Step.STEP("Create a record in folder A and copy it into folder B.");
+ String recordId = getRestAPIFactory().getRecordFolderAPI()
+ .createRecord(createElectronicRecordModel(), recordFolderA.getId(), getFile(IMAGE_FILE)).getId();
+ String copyId = copyRecord(recordId, recordFolderB.getId()).getId();
+ assertStatusCode(CREATED);
+
+ Step.STEP("Check that it's possible to load the original content.");
+ getNodeContent(recordId);
+ assertStatusCode(OK);
+
+ Step.STEP("Delete the copy.");
+ deleteAndVerify(copyId);
+
+ Step.STEP("Check that the original record node and content still exist.");
+ checkNodeExists(recordId);
+ getNodeContent(recordId);
+ }
+
/**
* Utility method to delete a record and verify successful deletion
*
@@ -263,4 +303,73 @@ public class DeleteRecordTests extends BaseRMRestTest
assertStatusCode(NOT_FOUND);
}
+ /**
+ * Copy a record to a record folder.
+ *
+ * @param recordId The id of the record to copy.
+ * @param destinationFolder The id of the record folder to copy it to.
+ * @return The model returned by the copy API.
+ */
+ private RestNodeModel copyRecord(String recordId, String destinationFolder)
+ {
+ Node node = getNode(recordId);
+ RestNodeBodyMoveCopyModel copyBody = new RestNodeBodyMoveCopyModel();
+ copyBody.setTargetParentId(destinationFolder);
+ try
+ {
+ return node.copy(copyBody);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Problem copying record.", e);
+ }
+ }
+
+ /**
+ * Get the content from a node.
+ *
+ * @param nodeId
+ * @return The response containing the node content.
+ */
+ private RestResponse getNodeContent(String nodeId)
+ {
+ try
+ {
+ return getNode(nodeId).getNodeContent();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Failed to load content for node.", e);
+ }
+ }
+
+ /**
+ * Check that the given node exists.
+ *
+ * @param nodeId The node to check.
+ */
+ private void checkNodeExists(String nodeId)
+ {
+ try
+ {
+ getNode(nodeId).getNode();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Node does not exist.", e);
+ }
+ }
+
+ /**
+ * Get the node from a record id.
+ *
+ * @param recordId The record to get.
+ * @return The node object.
+ */
+ private Node getNode(String recordId)
+ {
+ RepoTestModel repoTestModel = new RepoTestModel() {};
+ repoTestModel.setNodeRef(recordId);
+ return getRestAPIFactory().getNodeAPI(repoTestModel);
+ }
}
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
index ddd303c982..4cb71d28e0 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
@@ -143,6 +143,7 @@
+
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
index c2e67a2460..16c8423228 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
@@ -51,9 +51,13 @@ import org.alfresco.repo.policy.annotation.BehaviourBean;
import org.alfresco.repo.policy.annotation.BehaviourKind;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.quickshare.QuickShareService;
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.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.ScriptService;
import org.alfresco.service.namespace.QName;
@@ -94,6 +98,9 @@ public class RecordAspect extends AbstractDisposableItem
/** quickShare service */
private QuickShareService quickShareService;
+ /** File folder service */
+ private FileFolderService fileFolderService;
+
/** I18N */
private static final String MSG_CANNOT_UPDATE_RECORD_CONTENT = "rm.service.update-record-content";
@@ -130,6 +137,15 @@ public class RecordAspect extends AbstractDisposableItem
this.quickShareService = quickShareService;
}
+ /**
+ *
+ * @param fileFolderService file folder service
+ */
+ public void setFileFolderService(FileFolderService fileFolderService)
+ {
+ this.fileFolderService = fileFolderService;
+ }
+
/**
* Behaviour to ensure renditions have the appropriate extended security.
*
@@ -358,6 +374,14 @@ public class RecordAspect extends AbstractDisposableItem
{
// then remove any extended security from the newly copied record
extendedSecurityService.remove(targetNodeRef);
+
+ //create a new content URL for the copy
+ ContentReader reader = fileFolderService.getReader(targetNodeRef);
+ if (reader != null)
+ {
+ ContentWriter writer = fileFolderService.getWriter(targetNodeRef);
+ writer.putContent(reader);
+ }
}
}