From a336e942e7cbc50605f866e5f8018468e478cf74 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Sun, 19 Mar 2017 00:16:37 +0000
Subject: [PATCH] RM-4808 (Update Record Folder: Reopen a close folder via PUT
 request throw Permission denied exception)

---
 .../fileplancomponents/RecordFolderTests.java | 48 +++++++++++++++++++
 .../rm-capabilities-group-context.xml         |  1 -
 .../rm-capabilities-recordfolder-context.xml  |  1 -
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java
index 86bf3b2e1a..acb3f9425a 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java
@@ -441,6 +441,54 @@ public class RecordFolderTests extends BaseRMRestTest
         assertTrue(folder2.getPath().getName().contains(NEW_RELATIVE_PATH));
     }
 
+    /**
+     * Given that a record folder exists
+     * When the record folder is closed
+     * Then a request can be made to reopen it
+     */
+    @Test
+    (
+        description = "A closed record folder can be reopened"
+    )
+    @Bug(id="RM-4808")
+    public void openClosedRecordFolder() throws Exception
+    {
+        // Create a record folder
+        FilePlanComponent recordFolder = createCategoryFolderInFilePlan();
+
+        // Assert that the record folder is not closed
+        assertFalse(recordFolder.getProperties().getIsClosed());
+
+        // Get the file plan component API
+        FilePlanComponentAPI filePlanComponentsAPI = getRestAPIFactory().getFilePlanComponentsAPI();
+
+        // Create a record folder model to closed it
+        FilePlanComponent recordFolderModel = FilePlanComponent.builder()
+                                                .properties(FilePlanComponentProperties.builder()
+                                                        .isClosed(true)
+                                                        .build())
+                                                .build();
+
+        // Make a request to close the record folder
+        FilePlanComponent updatedRecordFolder = filePlanComponentsAPI.updateFilePlanComponent(recordFolderModel, recordFolder.getId());
+
+        // Verify that the record folder is closed now
+        assertTrue(updatedRecordFolder.getProperties().getIsClosed());
+
+        // Create a record folder model to reopen it
+        recordFolderModel = FilePlanComponent.builder()
+                                .properties(FilePlanComponentProperties.builder()
+                                        .isClosed(false)
+                                        .build())
+                                .build();
+
+        // Make a request to reopen the record folder
+        updatedRecordFolder = filePlanComponentsAPI.updateFilePlanComponent(recordFolderModel, recordFolder.getId());
+
+        // Verify that the record folder is open now
+        assertFalse(updatedRecordFolder.getProperties().getIsClosed());
+    }
+
     @AfterClass (alwaysRun = true)
     public void tearDown() throws Exception
     {
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
index f68edd726c..7560098bbc 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
@@ -61,7 +61,6 @@
             <ref bean="rmCreateModifyDestroyFileplanMetadataCapability"/>
             <ref bean="rmEditDeclaredRecordMetadataCapability"/>
             <ref bean="rmEditNonRecordMetadataCapability"/>
-            <ref bean="rmCreateModifyRecordsInCuttoffFoldersCapability"/>
             <ref bean="rmEditRecordMetadataCapability"/>
             <ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
             <ref bean="rmEditHoldCapability"/>
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
index cd98e93eb4..12ae4d7788 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
@@ -94,7 +94,6 @@
             <entry key="capabilityCondition.filling" value="true"/>
             <entry key="capabilityCondition.cutoff" value="false"/>
             <entry key="capabilityCondition.frozen" value="false"/>
-            <entry key="capabilityCondition.closed" value="false"/>
          </map>
       </property>
    </bean>