Skip to content

pkp/pkp-lib#11268 Fix retrieval of preprint statistics and improved p… #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: stable-3_4_0
Choose a base branch
from
Open
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
31 changes: 17 additions & 14 deletions classes/submission/Submission.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
use APP\core\Services;
use APP\facades\Repo;
use APP\publication\Publication;
use APP\services\StatsPublicationService;
use APP\statistics\StatisticsHelper;
use PKP\facades\Locale;
use PKP\galley\Galley;
use PKP\submission\PKPSubmission;

class Submission extends PKPSubmission
Expand Down Expand Up @@ -223,27 +225,28 @@ public function getLocalizedGalleys()
*/
public function getTotalGalleyViews()
{
$fileIds = [];
$publications = $this->getPublishedPublications();
foreach ($publications as $publication) {
foreach ($publication->getData('galleys') as $galley) {
$file = $galley->getFile();
if (!$galley->getRemoteUrl() && $file && !in_array($file->getId(), $fileIds)) {
$fileIds[] = $file->getId();
}
}
$submissionFileIds = collect($this->getPublishedPublications())
->flatMap(fn (Publication $publication) => $publication->getData('galleys')->all())
->map(fn (Galley $galley) => (int) $galley->getData('submissionFileId'))
->unique()
->filter(fn (int $submissionFileId) => (bool) $submissionFileId)
->all();
if (!count($submissionFileIds)) {
return 0;
}

$filters = [
'dateStart' => StatisticsHelper::STATISTICS_EARLIEST_DATE,
'dateEnd' => date('Y-m-d', strtotime('yesterday')),
'contextIds' => [$this->getData('contextId')],
'fileIds' => $fileIds,
'contextIds' => [$this->getData('contextId')]
];
$metrics = Services::get('publicationStats')
/** @var StatsPublicationService $publicationStats */
$publicationStats = Services::get('publicationStats');
return (int) $publicationStats
->getQueryBuilder($filters)
->getSum([])
->filterBySubmissionFiles($submissionFileIds)
->getSum()
->value('metric');
return $metrics ? $metrics : 0;
}

/**
Expand Down