move things

Author: marcoacierno

backend/reviews/adapters.py

@@ -1,5 +1,9 @@
 from __future__ import annotations
+from django.core.cache import cache
 
+from pycon.tasks import check_pending_heavy_processing_work
+from reviews.cache_keys import get_cache_key
+from reviews.tasks import compute_recap_analysis
 from django.core.exceptions import PermissionDenied
 from django.http import JsonResponse
 from django.urls import path
@@ -41,6 +45,20 @@
     from users.models import User
 
 
+def get_accepted_submissions(conference):
+    return (
+        Submission.objects.filter(conference=conference)
+        .filter(
+            Q(pending_status=Submission.STATUS.accepted)
+            | Q(pending_status__isnull=True, status=Submission.STATUS.accepted)
+            | Q(pending_status="", status=Submission.STATUS.accepted)
+        )
+        .select_related("speaker", "type", "audience_level")
+        .prefetch_related("languages")
+        .order_by("id")
+    )
+
+
 def get_stats_for_submissions(qs):
     """Get all stats for a queryset of submissions."""
     total = qs.count()
@@ -184,7 +202,7 @@ def get_user_review_create_values(self, review_item_id: int) -> dict[str, Any]:
         ...
 
     def get_recap_context(
-        self, request: HttpRequest, review_session: ReviewSession
+        self, request: HttpRequest, review_session: ReviewSession, admin_site: AdminSite
     ) -> dict[str, Any]:
         """Return template context for the recap view."""
         ...
@@ -443,11 +461,11 @@ def get_next_to_review_item_id(
         return unvoted_item.id if unvoted_item else None
 
     def get_recap_context(
-        self, request: HttpRequest, review_session: ReviewSession
+        self, request: HttpRequest, review_session: ReviewSession, admin_site: AdminSite
     ) -> dict[str, Any]:
         review_session_id = review_session.id
         conference = review_session.conference
-        accepted_submissions = self._get_accepted_submissions(conference)
+        accepted_submissions = get_accepted_submissions(conference)
 
         # Get submission types for this conference
         submission_types = list(
@@ -474,7 +492,7 @@ def get_recap_context(
         ]
 
         return dict(
-            self.admin_site.each_context(request),
+            admin_site.each_context(request),
             title="Recap",
             review_session_id=review_session_id,
             review_session_repr=str(review_session),
@@ -506,16 +524,10 @@ def review_recap_compute_analysis_view(self, request, review_session_id):
             raise PermissionDenied()
 
         conference = review_session.conference
-        accepted_submissions = list(self._get_accepted_submissions(conference))
+        accepted_submissions = list(get_accepted_submissions(conference))
         force_recompute = request.GET.get("recompute") == "1"
         check_only = request.GET.get("check") == "1"
 
-        from django.core.cache import cache
-
-        from pycon.tasks import check_pending_heavy_processing_work
-        from reviews.cache_keys import get_cache_key
-        from reviews.tasks import compute_recap_analysis
-
         combined_cache_key = get_cache_key(
             "recap_analysis", conference.id, accepted_submissions
         )

backend/reviews/admin.py

@@ -3,7 +3,6 @@
 from django import forms
 from django.contrib import admin, messages
 from django.core.exceptions import PermissionDenied
-from django.db.models import Q
 from django.http.request import HttpRequest
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
@@ -12,24 +11,10 @@
 
 from reviews.adapters import get_all_review_adapters_extra_urls, get_review_adapter
 from reviews.models import AvailableScoreOption, ReviewSession, UserReview
-from submissions.models import Submission, SubmissionTag
+from submissions.models import SubmissionTag
 from users.admin_mixins import ConferencePermissionMixin
 
 
-def get_accepted_submissions(conference):
-    return (
-        Submission.objects.filter(conference=conference)
-        .filter(
-            Q(pending_status=Submission.STATUS.accepted)
-            | Q(pending_status__isnull=True, status=Submission.STATUS.accepted)
-            | Q(pending_status="", status=Submission.STATUS.accepted)
-        )
-        .select_related("speaker", "type", "audience_level")
-        .prefetch_related("languages")
-        .order_by("id")
-    )
-
-
 class AvailableScoreOptionInline(admin.TabularInline):
     model = AvailableScoreOption
 
@@ -199,6 +184,9 @@ def go_to_recap_screen(self, obj):
         if not obj.can_see_shortlist_screen:
             return "You cannot see the recap of this session yet."
 
+        if obj.session_type != ReviewSession.SessionType.PROPOSALS:
+            return "Recap is not supported for this session type."
+
         return mark_safe(
             f"""
     <a href="{reverse("admin:reviews-recap", kwargs={"review_session_id": obj.id})}">
@@ -307,9 +295,6 @@ def review_shortlist_view(self, request, review_session_id):
 
         return TemplateResponse(request, adapter.shortlist_template, context)
 
-    def _get_accepted_submissions(self, conference):
-        return get_accepted_submissions(conference)
-
     def review_recap_view(self, request, review_session_id):
         review_session = ReviewSession.objects.get(id=review_session_id)
 
@@ -328,7 +313,7 @@ def review_recap_view(self, request, review_session_id):
             )
 
         adapter = get_review_adapter(review_session)
-        context = adapter.get_recap_context(request, review_session)
+        context = adapter.get_recap_context(request, review_session, self.admin_site)
         return TemplateResponse(request, adapter.recap_template, context)
 
     def review_view(self, request, review_session_id, review_item_id):