fixes

Author: marcoacierno

backend/api/participants/types.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Annotated, Optional
+from typing import TYPE_CHECKING, Annotated
 
 from submissions.models import Submission as SubmissionModel
 from strawberry.scalars import JSON
@@ -25,12 +25,12 @@ class Participant:
     facebook_url: str
     mastodon_handle: str
     fullname: str
-    speaker_availabilities: JSON
 
     _speaker_level: strawberry.Private[str]
     _previous_talk_video: strawberry.Private[str]
     _conference_id: strawberry.Private[int]
     _user_id: strawberry.Private[int]
+    _speaker_availabilities: strawberry.Private[int]
 
     @strawberry.field
     def proposals(
@@ -42,14 +42,21 @@ def proposals(
         )
 
     @strawberry.field
-    def speaker_level(self, info) -> Optional[str]:
+    def speaker_availabilities(self, info) -> JSON | None:
+        if not CanSeeSubmissionPrivateFields().has_permission(self, info):
+            return None
+
+        return self._speaker_availabilities
+
+    @strawberry.field
+    def speaker_level(self, info) -> str | None:
         if not CanSeeSubmissionPrivateFields().has_permission(self, info):
             return None
 
         return self._speaker_level
 
     @strawberry.field
-    def previous_talk_video(self, info) -> Optional[str]:
+    def previous_talk_video(self, info) -> str | None:
         if not CanSeeSubmissionPrivateFields().has_permission(self, info):
             return None
 
@@ -70,7 +77,7 @@ def from_model(cls, instance):
             linkedin_url=instance.linkedin_url,
             facebook_url=instance.facebook_url,
             mastodon_handle=instance.mastodon_handle,
-            speaker_availabilities=instance.speaker_availabilities or {},
+            _speaker_availabilities=instance.speaker_availabilities or {},
             _conference_id=instance.conference_id,
             _user_id=instance.user_id,
             _speaker_level=instance.speaker_level,

backend/api/submissions/tests/test_submissions.py

@@ -1,3 +1,4 @@
+from participants.tests.factories import ParticipantFactory
 from submissions.models import Submission
 from users.tests.factories import UserFactory
 from voting.tests.factories.vote import VoteFactory
@@ -110,6 +111,10 @@ def test_accepted_submissions_are_public(graphql_client):
     SubmissionFactory(
         id=2, conference=submission.conference, status=Submission.STATUS.proposed
     )
+    participant = ParticipantFactory(
+        user_id=submission.speaker_id, conference_id=submission.conference_id
+    )
+    ParticipantFactory(user_id=submission.speaker_id)
 
     query = """query Submissions($code: String!, $page: Int) {
         submissions(code: $code, page: $page, pageSize: 5, onlyAccepted: true) {
@@ -119,6 +124,12 @@ def test_accepted_submissions_are_public(graphql_client):
             }
             items {
                 id
+                speaker {
+                    id
+                    participant {
+                        id
+                    }
+                }
             }
         }
     }"""
@@ -130,6 +141,14 @@ def test_accepted_submissions_are_public(graphql_client):
     assert not resp.get("errors")
     assert len(resp["data"]["submissions"]["items"]) == 1
     assert resp["data"]["submissions"]["items"][0]["id"] == submission.hashid
+    assert (
+        resp["data"]["submissions"]["items"][0]["speaker"]["id"]
+        == submission.speaker_id
+    )
+    assert (
+        resp["data"]["submissions"]["items"][0]["speaker"]["participant"]
+        == participant.hashid
+    )
     assert resp["data"]["submissions"]["pageInfo"] == {"totalPages": 1, "totalItems": 1}
 
 

backend/api/submissions/types.py

@@ -1,5 +1,5 @@
+from typing import Annotated
 from participants.models import Participant as ParticipantModel
-from api.participants.types import Participant
 import strawberry
 from strawberry.types.field import StrawberryField
 from strawberry.types import Info
@@ -11,11 +11,12 @@
 from voting.models import Vote
 
 from .permissions import CanSeeSubmissionPrivateFields, CanSeeSubmissionRestrictedFields
-from typing import TYPE_CHECKING, Annotated
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from api.conferences.types import Conference, Topic, Duration, AudienceLevel
     from api.schedule.types import ScheduleItem
+    from api.participants.types import Participant
 
 
 def private_field() -> StrawberryField:
@@ -49,7 +50,11 @@ class SubmissionSpeaker:
     _conference_id: strawberry.Private[str]
 
     @strawberry.field
-    def participant(self, info: Info) -> Participant | None:
+    def participant(
+        self, info: Info
+    ) -> Annotated["Participant", strawberry.lazy("api.participants.types")] | None:
+        from api.participants.types import Participant
+
         participant = (
             ParticipantModel.objects.for_conference(self._conference_id)
             .filter(user_id=self.id)