Make voting submissions more random (#4307)

Author: marcoacierno

backend/api/submissions/schema.py

@@ -57,25 +57,22 @@ def submissions(
             raise ValueError("Page must be greater than 0")
 
         request = info.context.request
+        user = request.user
         conference = ConferenceModel.objects.filter(code=code).first()
 
         if not conference or not CanSeeSubmissions().has_permission(conference, info):
             raise PermissionError("You need to have a ticket to see submissions")
 
         info.context._user_can_vote = True
 
-        qs = (
-            conference.submissions.prefetch_related(
-                "type",
-                "duration",
-                "schedule_items",
-                "languages",
-                "audience_level",
-                "tags",
-            )
-            .order_by("id")
-            .filter(status=SubmissionModel.STATUS.proposed)
-        )
+        qs = conference.submissions.prefetch_related(
+            "type",
+            "duration",
+            "schedule_items",
+            "languages",
+            "audience_level",
+            "tags",
+        ).filter(status=SubmissionModel.STATUS.proposed)
 
         if languages:
             qs = qs.filter(languages__code__in=languages)
@@ -84,32 +81,27 @@ def submissions(
             qs = qs.filter(tags__id__in=tags)
 
         if voted:
-            qs = qs.filter(votes__user_id=request.user.id)
+            qs = qs.filter(votes__user_id=user.id)
         elif voted is not None:
-            qs = qs.exclude(
-                id__in=[s.id for s in qs.filter(votes__user_id=request.user.id)]
-            )
+            qs = qs.exclude(id__in=[s.id for s in qs.filter(votes__user_id=user.id)])
 
         if types:
             qs = qs.filter(type__id__in=types)
 
         if audience_levels:
             qs = qs.filter(audience_level__id__in=audience_levels)
 
-        qs = qs.distinct()
-        total_items = qs.count()
+        qs = qs.order_by("id").distinct()
 
-        # Randomize the order of the submissions
-        user = info.context.request.user
+        all_submissions = list(qs)
+        random.Random(user.id).shuffle(all_submissions)
 
-        submissions = list(qs[(page - 1) * page_size : page * page_size])
-        random.Random(user.id).shuffle(submissions)
+        total_items = len(all_submissions)
+        submissions = list(all_submissions[(page - 1) * page_size : page * page_size])
 
         info.context._my_votes = {
             vote.submission_id: vote
-            for vote in Vote.objects.filter(
-                user_id=request.user.id, submission__in=submissions
-            )
+            for vote in Vote.objects.filter(user_id=user.id, submission__in=submissions)
         }
 
         return Paginated.paginate_list(

backend/api/submissions/tests/test_submissions.py

@@ -1,3 +1,5 @@
+from submissions.models import Submission
+from users.tests.factories import UserFactory
 from voting.tests.factories.vote import VoteFactory
 from conferences.tests.factories import ConferenceFactory
 from submissions.tests.factories import SubmissionFactory
@@ -6,6 +8,62 @@
 pytestmark = pytest.mark.django_db
 
 
+def test_submissions_are_random_by_user(graphql_client, mock_has_ticket):
+    user_1 = UserFactory(id=100)
+    user_2 = UserFactory(id=103)
+    user_3 = UserFactory(id=104)
+
+    graphql_client.force_login(user_1)
+
+    submission = SubmissionFactory(id=1)
+    submission_2 = SubmissionFactory(id=2, conference=submission.conference)
+    submission_3 = SubmissionFactory(id=3, conference=submission.conference)
+
+    mock_has_ticket(submission.conference)
+
+    query = """query Submissions($code: String!, $page: Int) {
+        submissions(code: $code, page: $page, pageSize: 1) {
+            pageInfo {
+                totalPages
+                totalItems
+            }
+            items {
+                id
+            }
+        }
+    }"""
+
+    data_proposals = {
+        user_1: [
+            {"id": submission_3.hashid},
+            {"id": submission_2.hashid},
+            {"id": submission.hashid},
+        ],
+        user_2: [
+            {"id": submission.hashid},
+            {"id": submission_2.hashid},
+            {"id": submission_3.hashid},
+        ],
+        user_3: [
+            {"id": submission_2.hashid},
+            {"id": submission_3.hashid},
+            {"id": submission.hashid},
+        ],
+    }
+
+    for user in [user_1, user_2, user_3]:
+        graphql_client.force_login(user)
+
+        for page in range(3):
+            resp = graphql_client.query(
+                query,
+                variables={"code": submission.conference.code, "page": page + 1},
+            )
+
+            assert not resp.get("errors")
+            assert resp["data"]["submissions"]["items"] == [data_proposals[user][page]]
+
+
 def test_returns_submissions_paginated(graphql_client, user):
     graphql_client.force_login(user)
 
@@ -29,14 +87,44 @@ def test_returns_submissions_paginated(graphql_client, user):
     )
 
     assert not resp.get("errors")
-    assert resp["data"]["submissions"]["items"] == [{"id": submission.hashid}]
+    assert resp["data"]["submissions"]["items"] == [{"id": submission_2.hashid}]
     assert resp["data"]["submissions"]["pageInfo"] == {"totalPages": 2, "totalItems": 2}
 
     resp_2 = graphql_client.query(
         query,
         variables={"code": submission.conference.code, "page": 2},
     )
-    assert resp_2["data"]["submissions"]["items"] == [{"id": submission_2.hashid}]
+    assert resp_2["data"]["submissions"]["items"] == [{"id": submission.hashid}]
+
+
+def test_canceled_submissions_are_excluded(graphql_client, user, mock_has_ticket):
+    graphql_client.force_login(user)
+
+    submission = SubmissionFactory()
+    SubmissionFactory(
+        status=Submission.STATUS.cancelled, conference=submission.conference
+    )
+    mock_has_ticket(submission.conference)
+
+    query = """query Submissions($code: String!, $page: Int) {
+        submissions(code: $code, page: $page, pageSize: 10) {
+            pageInfo {
+                totalPages
+                totalItems
+            }
+            items {
+                id
+            }
+        }
+    }"""
+    resp = graphql_client.query(
+        query,
+        variables={"code": submission.conference.code},
+    )
+
+    assert not resp.get("errors")
+    assert resp["data"]["submissions"]["items"] == [{"id": submission.hashid}]
+    assert resp["data"]["submissions"]["pageInfo"] == {"totalPages": 1, "totalItems": 1}
 
 
 def test_page_size_cannot_be_less_than_1(graphql_client, user):