mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
ACS-4027: Introduce changes to support removing tag from all associated nodes (#1709)
* ACS-4027: Introduce changes to support removing tag from all associated nodes * ACS-4027: fix implementation and add tests
This commit is contained in:
committed by
GitHub
parent
c9522f299e
commit
a59234f47f
@@ -82,4 +82,15 @@ public class Tags extends ModelRequest<Tags>
|
|||||||
|
|
||||||
return restWrapper.processModel(RestTagModel.class, request);
|
return restWrapper.processModel(RestTagModel.class, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete tag.
|
||||||
|
* - DELETE /tags/{tagId}
|
||||||
|
*/
|
||||||
|
public void deleteTag()
|
||||||
|
{
|
||||||
|
RestRequest request = RestRequest.
|
||||||
|
simpleRequest(HttpMethod.DELETE, "/tags/{tagId}", tag.getId());
|
||||||
|
restWrapper.processEmptyModel(request);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,4 +41,6 @@ public interface Tags
|
|||||||
public CollectionWithPagingInfo<Tag> getTags(StoreRef storeRef, Parameters params);
|
public CollectionWithPagingInfo<Tag> getTags(StoreRef storeRef, Parameters params);
|
||||||
public Tag changeTag(StoreRef storeRef, String tagId, Tag tag);
|
public Tag changeTag(StoreRef storeRef, String tagId, Tag tag);
|
||||||
public CollectionWithPagingInfo<Tag> getTags(String nodeId, Parameters params);
|
public CollectionWithPagingInfo<Tag> getTags(String nodeId, Parameters params);
|
||||||
|
|
||||||
|
void deleteTagById(StoreRef storeRef, String tagId);
|
||||||
}
|
}
|
||||||
|
@@ -42,12 +42,14 @@ import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
|
|||||||
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
|
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
|
||||||
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
|
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
|
||||||
import org.alfresco.rest.framework.core.exceptions.NotFoundException;
|
import org.alfresco.rest.framework.core.exceptions.NotFoundException;
|
||||||
|
import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
|
||||||
import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
|
import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
|
||||||
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
|
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
|
||||||
import org.alfresco.rest.framework.resource.parameters.Paging;
|
import org.alfresco.rest.framework.resource.parameters.Paging;
|
||||||
import org.alfresco.rest.framework.resource.parameters.Parameters;
|
import org.alfresco.rest.framework.resource.parameters.Parameters;
|
||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
import org.alfresco.service.cmr.repository.StoreRef;
|
import org.alfresco.service.cmr.repository.StoreRef;
|
||||||
|
import org.alfresco.service.cmr.security.AuthorityService;
|
||||||
import org.alfresco.service.cmr.tagging.TaggingService;
|
import org.alfresco.service.cmr.tagging.TaggingService;
|
||||||
import org.alfresco.util.Pair;
|
import org.alfresco.util.Pair;
|
||||||
import org.alfresco.util.TypeConstraint;
|
import org.alfresco.util.TypeConstraint;
|
||||||
@@ -64,6 +66,9 @@ public class TagsImpl implements Tags
|
|||||||
private Nodes nodes;
|
private Nodes nodes;
|
||||||
private TaggingService taggingService;
|
private TaggingService taggingService;
|
||||||
private TypeConstraint typeConstraint;
|
private TypeConstraint typeConstraint;
|
||||||
|
private AuthorityService authorityService;
|
||||||
|
|
||||||
|
static final String NO_PERMISSION_TO_MANAGE_A_TAG = "Current user does not have permission to manage a tag";
|
||||||
|
|
||||||
public void setTypeConstraint(TypeConstraint typeConstraint)
|
public void setTypeConstraint(TypeConstraint typeConstraint)
|
||||||
{
|
{
|
||||||
@@ -80,6 +85,11 @@ public class TagsImpl implements Tags
|
|||||||
this.taggingService = taggingService;
|
this.taggingService = taggingService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setAuthorityService(AuthorityService authorityService)
|
||||||
|
{
|
||||||
|
this.authorityService = authorityService;
|
||||||
|
}
|
||||||
|
|
||||||
public List<Tag> addTags(String nodeId, final List<Tag> tags)
|
public List<Tag> addTags(String nodeId, final List<Tag> tags)
|
||||||
{
|
{
|
||||||
NodeRef nodeRef = nodes.validateNode(nodeId);
|
NodeRef nodeRef = nodes.validateNode(nodeId);
|
||||||
@@ -128,6 +138,18 @@ public class TagsImpl implements Tags
|
|||||||
taggingService.removeTag(nodeRef, tagValue);
|
taggingService.removeTag(nodeRef, tagValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteTagById(StoreRef storeRef, String tagId) {
|
||||||
|
if (!authorityService.hasAdminAuthority())
|
||||||
|
{
|
||||||
|
throw new PermissionDeniedException(NO_PERMISSION_TO_MANAGE_A_TAG);
|
||||||
|
}
|
||||||
|
|
||||||
|
NodeRef tagNodeRef = validateTag(storeRef, tagId);
|
||||||
|
String tagValue = taggingService.getTagName(tagNodeRef);
|
||||||
|
taggingService.deleteTag(storeRef, tagValue);
|
||||||
|
}
|
||||||
|
|
||||||
public CollectionWithPagingInfo<Tag> getTags(StoreRef storeRef, Parameters params)
|
public CollectionWithPagingInfo<Tag> getTags(StoreRef storeRef, Parameters params)
|
||||||
{
|
{
|
||||||
Paging paging = params.getPaging();
|
Paging paging = params.getPaging();
|
||||||
|
@@ -38,7 +38,7 @@ import org.alfresco.util.ParameterCheck;
|
|||||||
import org.springframework.beans.factory.InitializingBean;
|
import org.springframework.beans.factory.InitializingBean;
|
||||||
|
|
||||||
@EntityResource(name="tags", title = "Tags")
|
@EntityResource(name="tags", title = "Tags")
|
||||||
public class TagsEntityResource implements EntityResourceAction.Read<Tag>, EntityResourceAction.ReadById<Tag>, EntityResourceAction.Update<Tag>, InitializingBean
|
public class TagsEntityResource implements EntityResourceAction.Read<Tag>, EntityResourceAction.ReadById<Tag>, EntityResourceAction.Update<Tag>, EntityResourceAction.Delete, InitializingBean
|
||||||
{
|
{
|
||||||
private Tags tags;
|
private Tags tags;
|
||||||
|
|
||||||
@@ -77,4 +77,10 @@ public class TagsEntityResource implements EntityResourceAction.Read<Tag>, Entit
|
|||||||
{
|
{
|
||||||
return tags.getTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id);
|
return tags.getTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void delete(String id, Parameters parameters)
|
||||||
|
{
|
||||||
|
tags.deleteTagById(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -856,6 +856,7 @@
|
|||||||
<bean id="tags" class="org.alfresco.rest.api.impl.TagsImpl">
|
<bean id="tags" class="org.alfresco.rest.api.impl.TagsImpl">
|
||||||
<property name="nodes" ref="nodes" />
|
<property name="nodes" ref="nodes" />
|
||||||
<property name="taggingService" ref="TaggingService" />
|
<property name="taggingService" ref="TaggingService" />
|
||||||
|
<property name="authorityService" ref="AuthorityService" />
|
||||||
<property name="typeConstraint" ref="nodeTypeConstraint" />
|
<property name="typeConstraint" ref="nodeTypeConstraint" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
@@ -0,0 +1,119 @@
|
|||||||
|
/*
|
||||||
|
* #%L
|
||||||
|
* Alfresco Remote API
|
||||||
|
* %%
|
||||||
|
* Copyright (C) 2005 - 2023 Alfresco Software Limited
|
||||||
|
* %%
|
||||||
|
* This file is part of the Alfresco software.
|
||||||
|
* If the software was purchased under a paid Alfresco license, the terms of
|
||||||
|
* the paid license agreement will prevail. Otherwise, the software is
|
||||||
|
* provided under the following open source license terms:
|
||||||
|
*
|
||||||
|
* Alfresco is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Alfresco is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
* #L%
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.alfresco.rest.api.impl;
|
||||||
|
|
||||||
|
import org.alfresco.rest.api.Nodes;
|
||||||
|
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
|
||||||
|
import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
|
||||||
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
|
import org.alfresco.service.cmr.repository.StoreRef;
|
||||||
|
import org.alfresco.service.cmr.security.AuthorityService;
|
||||||
|
import org.alfresco.service.cmr.tagging.TaggingService;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.InjectMocks;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.junit.MockitoJUnitRunner;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertThrows;
|
||||||
|
import static org.mockito.BDDMockito.given;
|
||||||
|
import static org.mockito.BDDMockito.then;
|
||||||
|
|
||||||
|
@RunWith(MockitoJUnitRunner.class)
|
||||||
|
public class TagsImplTest
|
||||||
|
{
|
||||||
|
private static final String TAG_ID = "tag-node-id";
|
||||||
|
private static final String TAG_NAME = "tag-dummy-name";
|
||||||
|
private static final NodeRef TAG_NODE_REF = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,TAG_ID);
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private Nodes nodesMock;
|
||||||
|
@Mock
|
||||||
|
private AuthorityService authorityServiceMock;
|
||||||
|
@Mock
|
||||||
|
private TaggingService taggingServiceMock;
|
||||||
|
|
||||||
|
@InjectMocks
|
||||||
|
private TagsImpl objectUnderTest;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setup()
|
||||||
|
{
|
||||||
|
given(authorityServiceMock.hasAdminAuthority()).willReturn(true);
|
||||||
|
given(nodesMock.validateNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID)).willReturn(TAG_NODE_REF);
|
||||||
|
given(taggingServiceMock.getTagName(TAG_NODE_REF)).willReturn(TAG_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDeleteTagById()
|
||||||
|
{
|
||||||
|
//when
|
||||||
|
objectUnderTest.deleteTagById(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID);
|
||||||
|
|
||||||
|
then(authorityServiceMock).should().hasAdminAuthority();
|
||||||
|
then(authorityServiceMock).shouldHaveNoMoreInteractions();
|
||||||
|
|
||||||
|
then(nodesMock).should().validateNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID);
|
||||||
|
then(nodesMock).shouldHaveNoMoreInteractions();
|
||||||
|
|
||||||
|
then(taggingServiceMock).should().getTagName(TAG_NODE_REF);
|
||||||
|
then(taggingServiceMock).should().deleteTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, TAG_NAME);
|
||||||
|
then(taggingServiceMock).shouldHaveNoMoreInteractions();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDeleteTagById_asNonAdminUser()
|
||||||
|
{
|
||||||
|
given(authorityServiceMock.hasAdminAuthority()).willReturn(false);
|
||||||
|
|
||||||
|
//when
|
||||||
|
assertThrows(PermissionDeniedException.class, () -> objectUnderTest.deleteTagById(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID));
|
||||||
|
|
||||||
|
then(authorityServiceMock).should().hasAdminAuthority();
|
||||||
|
then(authorityServiceMock).shouldHaveNoMoreInteractions();
|
||||||
|
|
||||||
|
then(nodesMock).shouldHaveNoInteractions();
|
||||||
|
|
||||||
|
then(taggingServiceMock).shouldHaveNoInteractions();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDeleteTagById_nonExistentTag()
|
||||||
|
{
|
||||||
|
//when
|
||||||
|
assertThrows(EntityNotFoundException.class, () -> objectUnderTest.deleteTagById(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "dummy-id"));
|
||||||
|
|
||||||
|
then(authorityServiceMock).should().hasAdminAuthority();
|
||||||
|
then(authorityServiceMock).shouldHaveNoMoreInteractions();
|
||||||
|
|
||||||
|
then(nodesMock).should().validateNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "dummy-id");
|
||||||
|
then(nodesMock).shouldHaveNoMoreInteractions();
|
||||||
|
|
||||||
|
then(taggingServiceMock).shouldHaveNoInteractions();
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user