Refactor dashboard views

Author: ChillarAnand

junction/proposals/dashboard.py

@@ -19,7 +19,6 @@
 from junction.base.constants import (
     ProposalReviewVote,
     ProposalStatus,
-    ProposalVotesFilter,
     ProposalReviewStatus,
 )
 from junction.conferences.models import Conference, ConferenceProposalReviewer
@@ -238,6 +237,7 @@ def reviewer_votes_dashboard(request, conference_slug):
 @require_http_methods(['GET', 'POST'])
 def second_phase_voting(request, conference_slug):
     conference = get_object_or_404(Conference, slug=conference_slug)
+    user = request.user
 
     if not is_conference_moderator(user=request.user, conference=conference):
         raise PermissionDenied
@@ -274,36 +274,7 @@ def second_phase_voting(request, conference_slug):
                        'errors': form.errors})
 
     # Valid form
-    cps = form.cleaned_data['proposal_section']
-    cpt = form.cleaned_data['proposal_type']
-    votes = form.cleaned_data['votes']
-    review_status = form.cleaned_data['review_status']
-    proposal_sections = conference.proposal_sections.all()
-
-    if cps != 'all':
-        proposal_sections = ProposalSection.objects.filter(pk=cps)
-    if cpt != 'all':
-        proposals_qs = proposals_qs.filter(proposal_type__id__in=cpt)
-    if votes != 'all':
-        votes = int(votes)
-    if review_status != 'all':
-        proposals_qs = proposals_qs.filter(review_status=review_status)
-
-    if votes == ProposalVotesFilter.NO_VOTES:
-        proposals_qs = [
-            p for p in proposals_qs if p.get_reviewer_votes_count() == votes]
-    elif votes == ProposalVotesFilter.MIN_ONE_VOTE:
-        proposals_qs = [
-            p for p in proposals_qs if p.get_reviewer_votes_count() >= votes]
-    elif votes == ProposalVotesFilter.SORT:
-        proposals_qs = sorted(
-            proposals_qs, key=lambda x: x.get_reviewer_votes_sum(),
-            reverse=True)
-
-    for section in proposal_sections:
-        section_proposals = [
-            p for p in proposals_qs if p.proposal_section == section]
-        proposals.append(s_items(section, section_proposals))
+    proposals = _sort_proposals_for_dashboard(conference, proposals_qs, user, form)
 
     return render(request, 'proposals/second_phase_voting.html',
                   {'conference': conference,

junction/proposals/utils.py

@@ -74,8 +74,6 @@ def update_reviewer_vote_info(user, psr_vote, vote_value, comment, phase, propos
 
 
 def _sort_proposals_for_dashboard(conference, proposals_qs, user, form):
-    """
-    """
     cps = form.cleaned_data['proposal_section']
     cpt = form.cleaned_data['proposal_type']
     votes = form.cleaned_data['votes']

junction/proposals/votes_views.py

@@ -142,7 +142,7 @@ def proposal_reviewer_vote(request, conference_slug, proposal_slug):
     # Valid Form
     vote_value = form.cleaned_data['vote_value']
     comment = form.cleaned_data['comment']
-    print(comment)
+
     utils.update_reviewer_vote_info(user, psr_vote, vote_value, comment, vote_phase, proposal, conference)
     return HttpResponseRedirect(reverse('proposals-to-review',
                                         args=[conference.slug]))
@@ -189,7 +189,7 @@ def proposal_reviewer_secondary_vote(request, conference_slug, proposal_slug):
     # Valid Form
     vote_value = form.cleaned_data['vote_value']
     comment = form.cleaned_data['comment']
-    print(comment)
+
     utils.update_reviewer_vote_info(user, psr_vote, vote_value, comment, vote_phase, proposal, conference)
     return HttpResponseRedirect(reverse('proposals-to-review',
                                         args=[conference.slug]))