From 46240eb2575b24db844b1f1fb2be5fff894b6ac8 Mon Sep 17 00:00:00 2001 From: mohit-singh4 Date: Thu, 22 Aug 2024 19:14:09 +0530 Subject: [PATCH] [feature/MNT-24127-EndpointToCalculateFolderSize] Updated endpoints flow to calculate and retrieve folder size details --- .../alfresco/rest/api/impl/SizeDetailsImplTest.java | 5 +++-- .../alfresco/rest/api/tests/NodeSizeDetailsTest.java | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.java b/remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.java index 6413bd08aa..1f78634ce3 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.java @@ -54,12 +54,13 @@ public class SizeDetailsImplTest extends AbstractBaseApiTest private SizeDetailsImpl sizeDetailsImpl; private NodeService nodeService; private PermissionService permissionService; + private Nodes nodes; @Before public void setUp() { sizeDetailsImpl = new SizeDetailsImpl(); - Nodes nodes = mock(Nodes.class); + nodes = mock(Nodes.class); nodeService = mock(NodeService.class); permissionService = mock(PermissionService.class); ActionService actionService = mock(ActionService.class); @@ -82,7 +83,7 @@ public class SizeDetailsImplTest extends AbstractBaseApiTest String fileName = "content.txt"; String folder0Name = "f0-testParentFolder-"+RUNID; String parentFolder = createFolder(tDocLibNodeId, folder0Name,null).getId(); - permissionService.setPermission(nodeService.getNodeRef(Long.valueOf(parentFolder)), user1, PermissionService.READ, true); + permissionService.setPermission(nodes.validateNode(parentFolder), PermissionService.ALL_AUTHORITIES, PermissionService.READ, true); Document d1 = new Document(); d1.setIsFolder(false); diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeSizeDetailsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeSizeDetailsTest.java index 1864df9ddb..1e3d38bd0d 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeSizeDetailsTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeSizeDetailsTest.java @@ -25,6 +25,7 @@ */ package org.alfresco.rest.api.tests; +import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.model.Site; import org.alfresco.rest.api.tests.client.HttpResponse; import org.alfresco.rest.api.tests.client.PublicApiClient; @@ -67,6 +68,7 @@ public class NodeSizeDetailsTest extends AbstractBaseApiTest private Site userOneN1Site; private String folderId; private PermissionService permissionService; + private Nodes nodes; // Method to create content info private ContentInfo createContentInfo() @@ -108,6 +110,7 @@ public class NodeSizeDetailsTest extends AbstractBaseApiTest String folderName = "folder" + System.currentTimeMillis(); folderId = addToDocumentLibrary(userOneN1Site, folderName, TYPE_CM_FOLDER); permissionService = applicationContext.getBean("permissionService", PermissionService.class); + nodes = applicationContext.getBean("Nodes", Nodes.class); } /** @@ -201,11 +204,10 @@ public class NodeSizeDetailsTest extends AbstractBaseApiTest delete(getCalculateFolderSizeUrl(folderId), folderId, null, 401); setRequestContext(user1); - NodeRef folderIdRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, folderId); - params.put("nodeId", folderIdRef.getId()); + params.put("nodeId", folderId); params.put("maxItems", "1000"); - permissionService.setPermission(folderIdRef, user1, PermissionService.WRITE, false); - HttpResponse response = post(getCalculateFolderSizeUrl(folderIdRef.getId()), toJsonAsStringNonNull(params), null, 403); + permissionService.setPermission(nodes.validateNode(folderId), PermissionService.ALL_AUTHORITIES, PermissionService.READ, false); + HttpResponse response = post(getCalculateFolderSizeUrl(folderId), toJsonAsStringNonNull(params), null, 403); assertNotNull(response); // Create a folder within the site document's library. @@ -213,7 +215,7 @@ public class NodeSizeDetailsTest extends AbstractBaseApiTest String nestedFolderId = addToDocumentLibrary(userOneN1Site, folderName, TYPE_CM_CONTENT); params = new HashMap<>(); - params.put("nodeId", folderIdRef.getId()); + params.put("nodeId", folderId); params.put("maxItems", "1000"); // Perform POST request