tomas.kracmar/ma1sd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

De-duplicate results from Identity stores in Directory searches

Browse Source
This commit is contained in:
Max Dor
2018-04-26 01:40:43 +02:00
parent 03e72ba155
commit b493ccd479
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/io/kamax/mxisd/controller/directory/v1/io/UserDirectorySearchResult.java
View File

@@ -20,8 +20,8 @@
package io.kamax.mxisd.controller.directory.v1.io; package io.kamax.mxisd.controller.directory.v1.io;
import java.util.ArrayList; import java.util.HashSet;
import java.util.List; import java.util.Set;
public class UserDirectorySearchResult { public class UserDirectorySearchResult {
@@ -55,10 +55,31 @@ public class UserDirectorySearchResult {
this.userId = userId; this.userId = userId;
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Result result = (Result) o;
if (displayName != null ? !displayName.equals(result.displayName) : result.displayName != null)
return false;
if (avatarUrl != null ? !avatarUrl.equals(result.avatarUrl) : result.avatarUrl != null) return false;
return userId.equals(result.userId);
}
@Override
public int hashCode() {
int result = displayName != null ? displayName.hashCode() : 0;
result = 31 * result + (avatarUrl != null ? avatarUrl.hashCode() : 0);
result = 31 * result + userId.hashCode();
return result;
}
} }
private boolean limited; private boolean limited;
private List<Result> results = new ArrayList<>(); private Set<Result> results = new HashSet<>();
public boolean isLimited() { public boolean isLimited() {
return limited; return limited;
@@ -68,11 +89,11 @@ public class UserDirectorySearchResult {
this.limited = limited; this.limited = limited;
} }
public List<Result> getResults() { public Set<Result> getResults() {
return results; return results;
} }
public void setResults(List<Result> results) { public void setResults(Set<Result> results) {
this.results = results; this.results = results;
} }

11
src/test/java/io/kamax/mxisd/backend/rest/RestDirectoryProviderTest.java
View File

@@ -33,8 +33,7 @@ import org.junit.Test;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import static com.github.tomakehurst.wiremock.client.WireMock.*; import static com.github.tomakehurst.wiremock.client.WireMock.*;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.*;
import static org.junit.Assert.assertTrue;
public class RestDirectoryProviderTest { public class RestDirectoryProviderTest {
@@ -89,8 +88,8 @@ public class RestDirectoryProviderTest {
UserDirectorySearchResult result = p.searchByDisplayName(byNameSearch); UserDirectorySearchResult result = p.searchByDisplayName(byNameSearch);
assertTrue(!result.isLimited()); assertTrue(!result.isLimited());
assertTrue(result.getResults().size() == 1); assertEquals(1, result.getResults().size());
UserDirectorySearchResult.Result entry = result.getResults().get(0); UserDirectorySearchResult.Result entry = result.getResults().iterator().next();
assertNotNull(entry); assertNotNull(entry);
assertTrue(StringUtils.equals(byNameAvatar, entry.getAvatarUrl())); assertTrue(StringUtils.equals(byNameAvatar, entry.getAvatarUrl()));
assertTrue(StringUtils.equals(byNameDisplay, entry.getDisplayName())); assertTrue(StringUtils.equals(byNameDisplay, entry.getDisplayName()));
@@ -132,8 +131,8 @@ public class RestDirectoryProviderTest {
UserDirectorySearchResult result = p.searchBy3pid(byThreepidSearch); UserDirectorySearchResult result = p.searchBy3pid(byThreepidSearch);
assertTrue(!result.isLimited()); assertTrue(!result.isLimited());
assertTrue(result.getResults().size() == 1); assertEquals(1, result.getResults().size());
UserDirectorySearchResult.Result entry = result.getResults().get(0); UserDirectorySearchResult.Result entry = result.getResults().iterator().next();
assertNotNull(entry); assertNotNull(entry);
assertTrue(StringUtils.equals(byThreepidAvatar, entry.getAvatarUrl())); assertTrue(StringUtils.equals(byThreepidAvatar, entry.getAvatarUrl()));
assertTrue(StringUtils.equals(byThreepidDisplay, entry.getDisplayName())); assertTrue(StringUtils.equals(byThreepidDisplay, entry.getDisplayName()));