diff --git a/app/lib/frontend/handlers/custom_api.dart b/app/lib/frontend/handlers/custom_api.dart index 4311432459..d4d71d3df5 100644 --- a/app/lib/frontend/handlers/custom_api.dart +++ b/app/lib/frontend/handlers/custom_api.dart @@ -21,6 +21,7 @@ import '../../scorecard/backend.dart'; import '../../search/backend.dart'; import '../../search/search_client.dart'; import '../../search/search_service.dart'; +import '../../service/download_counts/backend.dart'; import '../../service/topics/count_topics.dart'; import '../../shared/configuration.dart'; import '../../shared/exceptions.dart'; @@ -244,7 +245,8 @@ Future packageVersionScoreHandler( grantedPoints: card.grantedPubPoints, maxPoints: card.maxPubPoints, likeCount: pkg.likes, - downloadCount30Days: card.thirtyDaysDownloadCounts, + downloadCount30Days: + downloadCountsBackend.lookup30DaysTotalCounts(package), tags: tags.toList(), lastUpdated: updated, ); diff --git a/app/lib/frontend/templates/package_misc.dart b/app/lib/frontend/templates/package_misc.dart index d8b96e8319..e63856fe1f 100644 --- a/app/lib/frontend/templates/package_misc.dart +++ b/app/lib/frontend/templates/package_misc.dart @@ -4,6 +4,7 @@ import 'package:_pub_shared/search/search_form.dart'; import 'package:_pub_shared/search/tags.dart'; +import 'package:pub_dev/service/download_counts/backend.dart'; import '../../package/models.dart'; import '../../shared/urls.dart' as urls; @@ -196,7 +197,8 @@ d.Node labeledScoresNodeFromPackageView(PackageView view, {String? version}) { pkgScorePageUrl: urls.pkgScoreUrl(view.name, version: version), likeCount: view.likes, grantedPubPoints: view.grantedPubPoints, - thirtyDaysDownloads: view.thirtyDaysDownloadCounts, + thirtyDaysDownloads: + downloadCountsBackend.lookup30DaysTotalCounts(view.name), ); } diff --git a/app/lib/frontend/templates/views/pkg/score_tab.dart b/app/lib/frontend/templates/views/pkg/score_tab.dart index 7bfda58766..90d32d941f 100644 --- a/app/lib/frontend/templates/views/pkg/score_tab.dart +++ b/app/lib/frontend/templates/views/pkg/score_tab.dart @@ -7,6 +7,7 @@ import 'dart:convert'; import 'package:_pub_shared/data/download_counts_data.dart'; import 'package:_pub_shared/format/number_format.dart'; import 'package:pana/models.dart'; +import 'package:pub_dev/service/download_counts/backend.dart'; import 'package:pub_dev/shared/utils.dart'; import '../../../../scorecard/models.dart' hide ReportStatus; @@ -43,7 +44,8 @@ d.Node scoreTabNode({ children: [ _likeKeyFigureNode(likeCount), _pubPointsKeyFigureNode(report, showPending), - _downloadCountsKeyFigureNode(card.thirtyDaysDownloadCounts), + _downloadCountsKeyFigureNode( + downloadCountsBackend.lookup30DaysTotalCounts(package)), ], ), if (showPending) diff --git a/app/lib/package/models.dart b/app/lib/package/models.dart index 11157e0a37..f6178686b7 100644 --- a/app/lib/package/models.dart +++ b/app/lib/package/models.dart @@ -9,7 +9,6 @@ import 'package:_pub_shared/search/tags.dart'; import 'package:clock/clock.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:pana/models.dart'; -import 'package:pub_dev/service/download_counts/backend.dart'; import 'package:pub_dev/service/download_counts/download_counts.dart'; import 'package:pub_semver/pub_semver.dart'; @@ -937,7 +936,6 @@ class PackageView { final List? screenshots; final List? topics; - final int? thirtyDaysDownloadCounts; PackageView({ this.screenshots, @@ -955,7 +953,6 @@ class PackageView { this.spdxIdentifiers, this.apiPages, this.topics, - required this.thirtyDaysDownloadCounts, }) : isPending = isPending ?? false, tags = tags ?? []; @@ -968,7 +965,6 @@ class PackageView { PackageVersion? version, required ScoreCardData scoreCard, List? apiPages, - required int? thirtyDaysDownloadCounts, }) { final tags = { ...package.getTags(), @@ -992,7 +988,6 @@ class PackageView { apiPages: apiPages, screenshots: scoreCard.panaReport?.screenshots, topics: version?.pubspec?.canonicalizedTopics, - thirtyDaysDownloadCounts: thirtyDaysDownloadCounts, ); } @@ -1013,7 +1008,6 @@ class PackageView { apiPages: apiPages ?? this.apiPages, screenshots: screenshots, topics: topics, - thirtyDaysDownloadCounts: thirtyDaysDownloadCounts, ); } @@ -1172,8 +1166,6 @@ class PackagePageData { releases: latestReleases, version: version, scoreCard: scoreCard, - thirtyDaysDownloadCounts: - downloadCountsBackend.lookup30DaysTotalCounts(package.name!), ); } } diff --git a/app/lib/package/models.g.dart b/app/lib/package/models.g.dart index a7bd2807a7..fd84df077f 100644 --- a/app/lib/package/models.g.dart +++ b/app/lib/package/models.g.dart @@ -111,8 +111,6 @@ PackageView _$PackageViewFromJson(Map json) => PackageView( .toList(), topics: (json['topics'] as List?)?.map((e) => e as String).toList(), - thirtyDaysDownloadCounts: - (json['thirtyDaysDownloadCounts'] as num?)?.toInt(), ); Map _$PackageViewToJson(PackageView instance) => @@ -134,6 +132,4 @@ Map _$PackageViewToJson(PackageView instance) => if (instance.apiPages case final value?) 'apiPages': value, if (instance.screenshots case final value?) 'screenshots': value, if (instance.topics case final value?) 'topics': value, - if (instance.thirtyDaysDownloadCounts case final value?) - 'thirtyDaysDownloadCounts': value, }; diff --git a/app/lib/scorecard/backend.dart b/app/lib/scorecard/backend.dart index 540ce8fd08..55fb459ed2 100644 --- a/app/lib/scorecard/backend.dart +++ b/app/lib/scorecard/backend.dart @@ -9,7 +9,6 @@ import 'package:gcloud/service_scope.dart' as ss; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; import 'package:pool/pool.dart'; -import 'package:pub_dev/service/download_counts/backend.dart'; import 'package:pub_dev/service/download_counts/computations.dart'; import 'package:pub_dev/shared/exceptions.dart'; import 'package:pub_dev/task/backend.dart'; @@ -97,8 +96,6 @@ class ScoreCardBackend { releases: releases, version: pv, scoreCard: card, - thirtyDaysDownloadCounts: - downloadCountsBackend.lookup30DaysTotalCounts(package), ); }); } diff --git a/app/lib/scorecard/models.dart b/app/lib/scorecard/models.dart index a80e7dde2e..fadaa51a21 100644 --- a/app/lib/scorecard/models.dart +++ b/app/lib/scorecard/models.dart @@ -8,7 +8,6 @@ import 'package:_pub_shared/data/download_counts_data.dart'; import 'package:_pub_shared/search/tags.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:pana/models.dart'; -import 'package:pub_dev/service/download_counts/backend.dart'; import 'package:pub_dev/task/models.dart'; import '../scorecard/backend.dart'; @@ -70,10 +69,6 @@ class ScoreCardData { late final report = panaReport?.report; List? get tags => panaReport?.derivedTags; - - // TODO: refactor code to use downloadCountsBackend directly. - int? get thirtyDaysDownloadCounts => - downloadCountsBackend.lookup30DaysTotalCounts(packageName!); } @JsonSerializable(includeIfNull: false)