inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACE-4823: Fixed "list of a person's site memberships" REST API which only returned one of the two sites with identical titles.

Browse Source 
- Also, fixed code standards.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2015-12-07 18:29:10 +00:00
parent ee8bd08296
commit 6f569467af
2 changed files with 1208 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/rest/api/impl/SitesImpl.java
View File

@@ -22,6 +22,7 @@ import java.io.Serializable;
import java.text.Collator;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -447,19 +448,18 @@ public class SitesImpl implements Sites
SortOrder.ASCENDING ));
}
final Set<SiteMembership> sortedSiteMembers = new TreeSet<SiteMembership>(
new SiteMembershipComparator(
sortPairs,
SiteMembershipComparator.Type.SITES));
// get the unsorted list of site memberships
List<SiteMembership> siteMembers = siteService.listSiteMemberships (personId, 0);
// sort the list of site memberships
int totalSize = siteMembers.size();
sortedSiteMembers.addAll(siteMembers);
final List<SiteMembership> sortedSiteMembers = new ArrayList<>(siteMembers);
Collections.sort(sortedSiteMembers, new SiteMembershipComparator(
sortPairs,
SiteMembershipComparator.Type.SITES));
PageDetails pageDetails = PageDetails.getPageDetails(pagingRequest, totalSize);
List<MemberOfSite> ret = new ArrayList<MemberOfSite>(totalSize);
List<MemberOfSite> ret = new ArrayList<>(totalSize);
Iterator<SiteMembership> it = sortedSiteMembers.iterator();
for(int counter = 0; counter < pageDetails.getEnd() && it.hasNext(); counter++)

113
source/test-java/org/alfresco/rest/api/tests/TestPersonSites.java
View File

@@ -1,10 +1,31 @@
/*
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* 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/>.
*/
package org.alfresco.rest.api.tests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -41,7 +62,7 @@ public class TestPersonSites extends EnterpriseTestApi
private TestPerson person12;
private TestPerson person21;
private List<TestSite> sites = new ArrayList<TestSite>(10);
private List<TestSite> sites = new ArrayList<>(10);
/* Sites and users used to test the site sorting */
private TestPerson person31;
@@ -49,21 +70,19 @@ public class TestPersonSites extends EnterpriseTestApi
private TestSite site1;
private TestSite site2;
private TestSite site3;
private static String site1_name = "a_" + GUID.generate();;
private static String site1_title = "c_" + GUID.generate();
private static SiteRole site1_role = SiteRole.SiteContributor;
private static String site2_name = "b_" + GUID.generate();;
private static String site2_title = "a_" + GUID.generate();
private static SiteRole site2_role = SiteRole.SiteManager;
private static String site3_name = "c_" + GUID.generate();;
private static String site3_title = "b_" + GUID.generate();
private static SiteRole site3_role = SiteRole.SiteConsumer;
private String site1_name = "a_" + GUID.generate();
private String site1_title = "c_" + GUID.generate();
private SiteRole site1_role = SiteRole.SiteContributor;
private String site2_name = "b_" + GUID.generate();
private String site2_title = "a_" + GUID.generate();
private SiteRole site2_role = SiteRole.SiteManager;
private String site3_name = "c_" + GUID.generate();
private String site3_title = "b_" + GUID.generate();
private SiteRole site3_role = SiteRole.SiteConsumer;
public void initializeSites() throws Exception
{
/*
* Create data for testing the site sorting. We create the sites as
* person31 and assign roles to person32. The list requests will be
@@ -459,8 +478,6 @@ public class TestPersonSites extends EnterpriseTestApi
/**
* Retrieves the site memberships associated to a user
*
* @param skipCount
* @param maxItems
* @param sortColumn
* @param asc
* @return
@@ -511,11 +528,12 @@ public class TestPersonSites extends EnterpriseTestApi
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "SiteTitle", true);
// check results
List<MemberOfSite> expectedList = new LinkedList<MemberOfSite>();
List<MemberOfSite> expectedList = new LinkedList<>();
expectedList.add(new MemberOfSite(site3, site3_role));
expectedList.add(new MemberOfSite(site1, site1_role));
checkList(expectedList, paging.getExpectedPaging(), resp);
}
/**
@@ -536,7 +554,7 @@ public class TestPersonSites extends EnterpriseTestApi
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "SiteTitle", false);
// check results
List<MemberOfSite> expectedList = new LinkedList<MemberOfSite>();
List<MemberOfSite> expectedList = new LinkedList<>();
expectedList.add(new MemberOfSite(site3, site3_role));
expectedList.add(new MemberOfSite(site2, site2_role));
@@ -561,7 +579,7 @@ public class TestPersonSites extends EnterpriseTestApi
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "Role", true);
// check results
List<MemberOfSite> expectedList = new LinkedList<MemberOfSite>();
List<MemberOfSite> expectedList = new LinkedList<>();
expectedList.add(new MemberOfSite(site1, site1_role));
expectedList.add(new MemberOfSite(site2, site2_role));
@@ -586,7 +604,7 @@ public class TestPersonSites extends EnterpriseTestApi
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "Role", false);
// check results
List<MemberOfSite> expectedList = new LinkedList<MemberOfSite>();
List<MemberOfSite> expectedList = new LinkedList<>();
expectedList.add(new MemberOfSite(site1, site1_role));
expectedList.add(new MemberOfSite(site3, site3_role));
@@ -611,7 +629,7 @@ public class TestPersonSites extends EnterpriseTestApi
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "SiteShortName", true);
// check results
List<MemberOfSite> expectedList = new LinkedList<MemberOfSite>();
List<MemberOfSite> expectedList = new LinkedList<>();
expectedList.add(new MemberOfSite(site2, site2_role));
expectedList.add(new MemberOfSite(site3, site3_role));
@@ -636,7 +654,7 @@ public class TestPersonSites extends EnterpriseTestApi
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "SiteShortName", false);
// check results
List<MemberOfSite> expectedList = new LinkedList<MemberOfSite>();
List<MemberOfSite> expectedList = new LinkedList<>();
expectedList.add(new MemberOfSite(site2, site2_role));
expectedList.add(new MemberOfSite(site1, site1_role));
@@ -659,12 +677,13 @@ public class TestPersonSites extends EnterpriseTestApi
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(null, null, false);
// check results
List<MemberOfSite> expectedList = new LinkedList<MemberOfSite>();
List<MemberOfSite> expectedList = new LinkedList<>();
expectedList.add(new MemberOfSite(site2, site2_role));
expectedList.add(new MemberOfSite(site3, site3_role));
expectedList.add(new MemberOfSite(site1, site1_role));
checkList(expectedList, paging.getExpectedPaging(), resp);
}
@Test
@@ -680,4 +699,56 @@ public class TestPersonSites extends EnterpriseTestApi
testSortingAndPagingBySiteNameDesc();
testSortingAndPagingDefault();
}
// ACE-4823
@Test
public void testSitesWithSameTitles() throws Exception
{
// Creates 3 sites
initializeSites();
final String site4_name = "d_" + GUID.generate();
final String site4_title = site3_title; // Same title as site3
final SiteRole site4_role = SiteRole.SiteCollaborator;
TestSite site4 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
{
@Override
public TestSite doWork() throws Exception
{
SiteInformation siteInfo = new SiteInformation(site4_name, site4_title, site4_title, SiteVisibility.PRIVATE);
TestSite site = network1.createSite(siteInfo);
site.inviteToSite(person32.getId(), site4_role);
return site;
}
}, person31.getId(), network1.getId());
assertNotNull(site4);
// paging
int totalResults = 4;
Paging paging = getPaging(null, null, totalResults, null);
// get memberships
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(null, null, false);
// check results
List<MemberOfSite> expectedList = new LinkedList<>();
expectedList.add(new MemberOfSite(site2, site2_role));
expectedList.add(new MemberOfSite(site3, site3_role));
expectedList.add(new MemberOfSite(site4, site4_role));
expectedList.add(new MemberOfSite(site1, site1_role));
try
{
checkList(expectedList, paging.getExpectedPaging(), resp);
}
catch (AssertionError error)
{
// Site3 and Site4 have a same title, and as we are sorting on titles (default sorting),
// we can't guarantee the order in which the sites will
// return, hence swap the sites and compare again.
Collections.swap(expectedList, 1, 2);
checkList(expectedList, paging.getExpectedPaging(), resp);
}
}
}