Skip to content
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.

Sign up for GitHub

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

Improve performance of review page counts query #822

Merged
merged 1 commit into from
Dec 15, 2023
Merged

Improve performance of review page counts query #822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions isic/ingest/views/review.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,26 @@

from isic.core.permissions import needs_object_permission
from isic.ingest.models import Cohort
from isic.ingest.models.accession import AccessionStatus

from . import make_breadcrumbs

REVIEW_PER_PAGE = 500


def _cohort_review_progress(cohort: Cohort) -> dict:
num_reviewed = cohort.accessions.reviewed().count()
num_reviewable = cohort.accessions.reviewable().count()
ingested_and_publishable = Q(image__isnull=True, status=AccessionStatus.SUCCEEDED)
counts = cohort.accessions.aggregate(
reviewed=Count("id", filter=ingested_and_publishable & ~Q(review=None)),
reviewable=Count("id", filter=ingested_and_publishable),
)

return {
"num_reviewed": num_reviewed,
"num_reviewable": num_reviewable,
"percentage": 0 if num_reviewable == 0 else math.floor(num_reviewed / num_reviewable * 100),
"num_reviewed": counts["reviewed"],
"num_reviewable": counts["reviewable"],
"percentage": 0
if counts["reviewable"] == 0
else math.floor(counts["reviewed"] / counts["reviewable"] * 100),
}


Expand Down
Loading