Skip to content
Merged
Show file tree
Hide file tree
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
14 changes: 1 addition & 13 deletions app/lib/frontend/handlers/package.dart
Original file line number Diff line number Diff line change
Expand Up @@ -531,17 +531,5 @@ Future<ListAdvisoriesResponse> listAdvisoriesForPackage(
throw NotFoundException.resource(packageName);
}

final advisories =
await securityAdvisoryBackend.lookupSecurityAdvisories(packageName);
if (advisories.isEmpty) {
return ListAdvisoriesResponse(advisories: []);
}
final advisoriesUpdated = advisories.fold(
advisories.first.syncTime,
(previousValue, advisory) => advisory.syncTime.isAfter(previousValue)
? advisory.syncTime
: previousValue);
return ListAdvisoriesResponse(
advisories: advisories.map((e) => e.advisory).toList(),
advisoriesUpdated: advisoriesUpdated);
return await securityAdvisoryBackend.listAdvisoriesResponse(packageName);
}
13 changes: 12 additions & 1 deletion app/lib/service/security_advisories/backend.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import 'dart:async';
import 'dart:convert';

import 'package:_pub_shared/data/advisories_api.dart' show OSV;
import 'package:_pub_shared/data/advisories_api.dart'
show ListAdvisoriesResponse, OSV;
import 'package:basics/basics.dart';
import 'package:clock/clock.dart';
import 'package:collection/collection.dart';
Expand Down Expand Up @@ -50,6 +51,16 @@ class SecurityAdvisoryBackend {
}))!;
}

/// Create a [ListAdvisoriesResponse] for [package] using advisories from
/// cache.
Future<ListAdvisoriesResponse> listAdvisoriesResponse(String package) async {
final advisories = await lookupSecurityAdvisories(package);
return ListAdvisoriesResponse(
advisories: advisories.map((a) => a.advisory).toList(),
advisoriesUpdated: advisories.map((a) => a.syncTime).maxOrNull,
);
}

Future<SecurityAdvisory?> lookupById(String id) async {
final key = _db.emptyKey.append(SecurityAdvisory, id: id);
return _db.lookupOrNull<SecurityAdvisory>(key);
Expand Down
Loading