changes

Author: marcoacierno

backend/api/conferences/types.py

@@ -221,21 +221,13 @@ def proposal_tags(self, info: Info) -> list[SubmissionTag]:
         return self.proposal_tags.all()
 
     @strawberry.field(permission_classes=[CanSeeSubmissions])
-    def submissions(
-        self, info: Info, only_accepted: bool = False
-    ) -> list[Submission] | None:
-        qs = self.submissions
-        if only_accepted:
-            qs = qs.filter(status=SubmissionModel.STATUS.accepted)
-        else:
-            qs = qs.filter(
-                status__in=(
-                    SubmissionModel.STATUS.proposed,
-                    SubmissionModel.STATUS.accepted,
-                )
+    def submissions(self, info: Info) -> list[Submission] | None:
+        return self.submissions.filter(
+            status__in=(
+                SubmissionModel.STATUS.proposed,
+                SubmissionModel.STATUS.accepted,
             )
-
-        return qs.select_related("audience_level", "duration", "type", "topic")
+        ).select_related("audience_level", "duration", "type", "topic")
 
     @strawberry.field
     def events(self, info: Info) -> list[Event]:

backend/api/permissions.py

@@ -47,6 +47,9 @@ def has_permission(self, conference, info, *args, **kwargs):
         if not user.is_authenticated:
             return False
 
+        if info.context._user_can_vote is not None:
+            return info.context._user_can_vote
+
         return check_if_user_can_vote(user, conference)
 
 

backend/api/submissions/schema.py

@@ -2,6 +2,7 @@
 from api.context import Info
 from api.submissions.permissions import CanSeeSubmissionRestrictedFields
 
+from voting.helpers import check_if_user_can_vote
 import strawberry
 
 from api.permissions import CanSeeSubmissions, IsAuthenticated
@@ -34,7 +35,7 @@ def submission(self, info: Info, id: strawberry.ID) -> Submission | None:
 
         return submission
 
-    @strawberry.field(permission_classes=[IsAuthenticated])
+    @strawberry.field()
     def submissions(
         self,
         info: Info,
@@ -46,9 +47,10 @@ def submissions(
         audience_levels: list[str] | None = None,
         page: int | None = 1,
         page_size: int | None = 50,
+        only_accepted: bool = False,
     ) -> Paginated[Submission] | None:
-        if page_size > 150:
-            raise ValueError("Page size cannot be greater than 150")
+        if page_size > 300:
+            raise ValueError("Page size cannot be greater than 300")
 
         if page_size < 1:
             raise ValueError("Page size must be greater than 0")
@@ -60,10 +62,17 @@ def submissions(
         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")
+        if not only_accepted and not IsAuthenticated().has_permission(conference, info):
+            raise PermissionError("You need to be authenticated to see submissions")
 
-        info.context._user_can_vote = True
+        info.context._user_can_vote = (
+            check_if_user_can_vote(user, conference) if user.is_authenticated else False
+        )
+
+        if not conference or not CanSeeSubmissions().has_permission(
+            conference, info, only_accepted=only_accepted
+        ):
+            raise PermissionError("You need to have a ticket to see submissions")
 
         qs = conference.submissions.prefetch_related(
             "type",
@@ -72,7 +81,12 @@ def submissions(
             "languages",
             "audience_level",
             "tags",
-        ).filter(status=SubmissionModel.STATUS.proposed)
+        )
+
+        if only_accepted:
+            qs = qs.filter(status=SubmissionModel.STATUS.accepted)
+        else:
+            qs = qs.filter(status=SubmissionModel.STATUS.proposed)
 
         if languages:
             qs = qs.filter(languages__code__in=languages)

frontend/src/components/blocks/dynamic-content-display-section/accepted-proposals-content.tsx

@@ -15,7 +15,7 @@ export const AcceptedProposalsContent = () => {
   const language = useCurrentLanguage();
   const {
     data: {
-      conference: { submissions },
+      submissions: { items: submissions },
     },
   } = useAcceptedProposalsQuery({
     variables: {

frontend/src/components/blocks/dynamic-content-display-section/accepted-proposals.graphql

@@ -1,12 +1,10 @@
 #import "../../fragments/submission-accordion.graphql"
 
 query AcceptedProposals($code: String!, $language: String!) {
-  conference(code: $code) {
-    id
-    submissions(onlyAccepted: true) {
+  submissions(code: $code, onlyAccepted: true, pageSize: 300) {
+    items {
       ...submissionAccordion
       id
-      title(language: $language)
       speaker {
         id
         fullname

frontend/src/components/blocks/dynamic-content-display-section/speakers-content.tsx

@@ -12,7 +12,7 @@ export const SpeakersContent = () => {
   const language = useCurrentLanguage();
   const {
     data: {
-      conference: { submissions },
+      submissions: { items: submissions },
     },
   } = useAcceptedProposalsQuery({
     variables: {