Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 32 additions & 43 deletions app/lib/search/search_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,11 @@ class SearchClient {
if (hasLikedByMeTag) {
skipCache = true;
}
final useLikedByMe =
hasLikedByMeTag && requestContext.experimentalFlags.useMyLikedSearch;

List<String>? packages;
if (userId != null && hasLikedByMeTag) {
if (userId != null && useLikedByMe) {
final likedPackages = await likeBackend.listPackageLikes(userId);
packages = likedPackages.map((l) => l.package!).toList();
}
Expand All @@ -88,53 +90,40 @@ class SearchClient {
}) async {
final httpHostPort = prefix ?? activeConfiguration.searchServicePrefix;
try {
if (requestContext.experimentalFlags.useMyLikedSearch) {
return await withRetryHttpClient(
(client) async {
var data = query.toSearchRequestData();
if (userId != null && hasLikedByMeTag) {
final newQuery = data.query
?.replaceAll(AccountTag.isLikedByMe, ' ')
.trim();
final newTags = data.tags!
.where((e) => e != AccountTag.isLikedByMe)
.toList();
data = data.replace(
query: newQuery,
tags: newTags,
packages: packages,
);
}
// NOTE: Keeping the query parameter to help investigating logs.
final uri = Uri.parse(
'$httpHostPort/search',
).replace(queryParameters: {'q': data.query});
final rs = await client.post(
uri,
headers: {
...?cloudTraceHeaders(),
'content-type': 'application/json',
},
body: json.encode(data.toJson()),
return await withRetryHttpClient(
(client) async {
var data = query.toSearchRequestData();
if (userId != null && useLikedByMe) {
final newQuery = data.query
?.replaceAll(AccountTag.isLikedByMe, ' ')
.trim();
final newTags = data.tags!
.where((e) => e != AccountTag.isLikedByMe)
.toList();
data = data.replace(
query: newQuery,
tags: newTags,
packages: packages,
);
return (statusCode: rs.statusCode, body: rs.body);
},
client: _httpClient,
retryIf: (e) =>
(e is UnexpectedStatusException &&
e.statusCode == searchIndexNotReadyCode),
);
}
final serviceUrl = '$httpHostPort/search$serviceUrlParams';
return await httpGetWithRetry(
Uri.parse(serviceUrl),
}
// NOTE: Keeping the query parameter to help investigating logs.
final uri = Uri.parse(
'$httpHostPort/search',
).replace(queryParameters: {'q': data.query});
final rs = await client.post(
uri,
headers: {
...?cloudTraceHeaders(),
'content-type': 'application/json',
},
body: json.encode(data.toJson()),
);
return (statusCode: rs.statusCode, body: rs.body);
},
client: _httpClient,
headers: cloudTraceHeaders(),
perRequestTimeout: Duration(seconds: 5),
retryIf: (e) =>
(e is UnexpectedStatusException &&
e.statusCode == searchIndexNotReadyCode),
responseFn: (rs) => (statusCode: rs.statusCode, body: rs.body),
);
} on TimeoutException {
return null;
Expand Down