ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve UserDiscoveryService behavior (#1039)

Browse Source 
* Refactor UserDiscoveryService

* Add UTs
This commit is contained in:
Alfonso Grillo
2023-06-07 11:58:00 +02:00
committed by GitHub
parent 8af688eee6
commit 0b56d5673f
2 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Users/UserDiscoveryService.swift
+21 -21
View File
@@ -28,36 +28,45 @@ final class UserDiscoveryService: UserDiscoveryServiceProtocol {
}
func searchProfiles(with searchQuery: String) async -> Result<[UserProfileProxy], UserDiscoveryErrorType> {
async let queriedProfile = profileIfPossible(with: searchQuery)
do {
async let queriedProfile = try? profileIfPossible(with: searchQuery).get()
async let searchedUsers = clientProxy.searchUsers(searchTerm: searchQuery, limit: 10)
let users = try await merge(searchQuery: searchQuery, queriedProfile: queriedProfile, searchResults: searchedUsers.get())
async let searchedUsers = clientProxy.searchUsers(searchTerm: searchQuery, limit: 10).get()
let users = try await merge(queriedProfile: queriedProfile, searchResults: searchedUsers)
return .success(users)
} catch {
return .failure(.failedSearchingUsers)
// we want to show the profile (if any) even if the search fails
if let queriedProfile = await queriedProfile {
return .success([queriedProfile])
} else {
return .failure(.failedSearchingUsers)
}
}
}
private func merge(searchQuery: String, queriedProfile: UserProfileProxy?, searchResults: SearchUsersResultsProxy) -> [UserProfileProxy] {
let localProfile = queriedProfile ?? UserProfileProxy(searchQuery: searchQuery)
private func merge(queriedProfile: UserProfileProxy?, searchResults: SearchUsersResultsProxy) -> [UserProfileProxy] {
let searchResults = searchResults.results
guard let localProfile else {
guard let queriedProfile else {
return searchResults
}
let filteredSearchResult = searchResults.filter {
$0.userID != localProfile.userID
$0.userID != queriedProfile.userID
}
return [localProfile] + filteredSearchResult
return [queriedProfile] + filteredSearchResult
}
private func profileIfPossible(with searchQuery: String) async -> Result<UserProfileProxy, ClientProxyError> {
private func profileIfPossible(with searchQuery: String) async -> UserProfileProxy? {
guard searchQuery.isMatrixIdentifier else {
return .failure(.failedGettingUserProfile)
return nil
}
return await clientProxy.profile(for: searchQuery)
let getProfileResult = try? await clientProxy.profile(for: searchQuery).get()
// fallback to a "local profile" if the profile api fails
return getProfileResult ?? .init(userID: searchQuery)
}
}
@@ -66,12 +75,3 @@ private extension String {
MatrixEntityRegex.isMatrixUserIdentifier(self)
}
}
private extension UserProfileProxy {
init?(searchQuery: String) {
guard searchQuery.isMatrixIdentifier else {
return nil
}
self.init(userID: searchQuery)
}
}