Skip to content

Commit 11de346

Browse files
authored
Remove caching of download counts in PackageView (#8522)
1 parent 7b46c93 commit 11de346

File tree

7 files changed

+9
-23
lines changed

7 files changed

+9
-23
lines changed

app/lib/frontend/handlers/custom_api.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import '../../scorecard/backend.dart';
2121
import '../../search/backend.dart';
2222
import '../../search/search_client.dart';
2323
import '../../search/search_service.dart';
24+
import '../../service/download_counts/backend.dart';
2425
import '../../service/topics/count_topics.dart';
2526
import '../../shared/configuration.dart';
2627
import '../../shared/exceptions.dart';
@@ -244,7 +245,8 @@ Future<VersionScore> packageVersionScoreHandler(
244245
grantedPoints: card.grantedPubPoints,
245246
maxPoints: card.maxPubPoints,
246247
likeCount: pkg.likes,
247-
downloadCount30Days: card.thirtyDaysDownloadCounts,
248+
downloadCount30Days:
249+
downloadCountsBackend.lookup30DaysTotalCounts(package),
248250
tags: tags.toList(),
249251
lastUpdated: updated,
250252
);

app/lib/frontend/templates/package_misc.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import 'package:_pub_shared/search/search_form.dart';
66
import 'package:_pub_shared/search/tags.dart';
7+
import 'package:pub_dev/service/download_counts/backend.dart';
78

89
import '../../package/models.dart';
910
import '../../shared/urls.dart' as urls;
@@ -196,7 +197,8 @@ d.Node labeledScoresNodeFromPackageView(PackageView view, {String? version}) {
196197
pkgScorePageUrl: urls.pkgScoreUrl(view.name, version: version),
197198
likeCount: view.likes,
198199
grantedPubPoints: view.grantedPubPoints,
199-
thirtyDaysDownloads: view.thirtyDaysDownloadCounts,
200+
thirtyDaysDownloads:
201+
downloadCountsBackend.lookup30DaysTotalCounts(view.name),
200202
);
201203
}
202204

app/lib/frontend/templates/views/pkg/score_tab.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'dart:convert';
77
import 'package:_pub_shared/data/download_counts_data.dart';
88
import 'package:_pub_shared/format/number_format.dart';
99
import 'package:pana/models.dart';
10+
import 'package:pub_dev/service/download_counts/backend.dart';
1011
import 'package:pub_dev/shared/utils.dart';
1112

1213
import '../../../../scorecard/models.dart' hide ReportStatus;
@@ -43,7 +44,8 @@ d.Node scoreTabNode({
4344
children: [
4445
_likeKeyFigureNode(likeCount),
4546
_pubPointsKeyFigureNode(report, showPending),
46-
_downloadCountsKeyFigureNode(card.thirtyDaysDownloadCounts),
47+
_downloadCountsKeyFigureNode(
48+
downloadCountsBackend.lookup30DaysTotalCounts(package)),
4749
],
4850
),
4951
if (showPending)

app/lib/package/models.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:_pub_shared/search/tags.dart';
99
import 'package:clock/clock.dart';
1010
import 'package:json_annotation/json_annotation.dart';
1111
import 'package:pana/models.dart';
12-
import 'package:pub_dev/service/download_counts/backend.dart';
1312
import 'package:pub_dev/service/download_counts/download_counts.dart';
1413
import 'package:pub_semver/pub_semver.dart';
1514

@@ -937,7 +936,6 @@ class PackageView {
937936
final List<ProcessedScreenshot>? screenshots;
938937

939938
final List<String>? topics;
940-
final int? thirtyDaysDownloadCounts;
941939

942940
PackageView({
943941
this.screenshots,
@@ -955,7 +953,6 @@ class PackageView {
955953
this.spdxIdentifiers,
956954
this.apiPages,
957955
this.topics,
958-
required this.thirtyDaysDownloadCounts,
959956
}) : isPending = isPending ?? false,
960957
tags = tags ?? <String>[];
961958

@@ -968,7 +965,6 @@ class PackageView {
968965
PackageVersion? version,
969966
required ScoreCardData scoreCard,
970967
List<ApiPageRef>? apiPages,
971-
required int? thirtyDaysDownloadCounts,
972968
}) {
973969
final tags = <String>{
974970
...package.getTags(),
@@ -992,7 +988,6 @@ class PackageView {
992988
apiPages: apiPages,
993989
screenshots: scoreCard.panaReport?.screenshots,
994990
topics: version?.pubspec?.canonicalizedTopics,
995-
thirtyDaysDownloadCounts: thirtyDaysDownloadCounts,
996991
);
997992
}
998993

@@ -1013,7 +1008,6 @@ class PackageView {
10131008
apiPages: apiPages ?? this.apiPages,
10141009
screenshots: screenshots,
10151010
topics: topics,
1016-
thirtyDaysDownloadCounts: thirtyDaysDownloadCounts,
10171011
);
10181012
}
10191013

@@ -1172,8 +1166,6 @@ class PackagePageData {
11721166
releases: latestReleases,
11731167
version: version,
11741168
scoreCard: scoreCard,
1175-
thirtyDaysDownloadCounts:
1176-
downloadCountsBackend.lookup30DaysTotalCounts(package.name!),
11771169
);
11781170
}
11791171
}

app/lib/package/models.g.dart

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/scorecard/backend.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:gcloud/service_scope.dart' as ss;
99
import 'package:logging/logging.dart';
1010
import 'package:meta/meta.dart';
1111
import 'package:pool/pool.dart';
12-
import 'package:pub_dev/service/download_counts/backend.dart';
1312
import 'package:pub_dev/service/download_counts/computations.dart';
1413
import 'package:pub_dev/shared/exceptions.dart';
1514
import 'package:pub_dev/task/backend.dart';
@@ -97,8 +96,6 @@ class ScoreCardBackend {
9796
releases: releases,
9897
version: pv,
9998
scoreCard: card,
100-
thirtyDaysDownloadCounts:
101-
downloadCountsBackend.lookup30DaysTotalCounts(package),
10299
);
103100
});
104101
}

app/lib/scorecard/models.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'package:_pub_shared/data/download_counts_data.dart';
88
import 'package:_pub_shared/search/tags.dart';
99
import 'package:json_annotation/json_annotation.dart';
1010
import 'package:pana/models.dart';
11-
import 'package:pub_dev/service/download_counts/backend.dart';
1211
import 'package:pub_dev/task/models.dart';
1312

1413
import '../scorecard/backend.dart';
@@ -70,10 +69,6 @@ class ScoreCardData {
7069
late final report = panaReport?.report;
7170

7271
List<String>? get tags => panaReport?.derivedTags;
73-
74-
// TODO: refactor code to use downloadCountsBackend directly.
75-
int? get thirtyDaysDownloadCounts =>
76-
downloadCountsBackend.lookup30DaysTotalCounts(packageName!);
7772
}
7873

7974
@JsonSerializable(includeIfNull: false)

0 commit comments

Comments
 (0)