changes

Author: marcoacierno

backend/api/submissions/types.py

@@ -46,6 +46,16 @@ class SubmissionSpeaker:
     id: strawberry.ID
     full_name: str
     gender: str
+    _conference_id: strawberry.Private[str]
+
+    @strawberry.field
+    def participant(self, info: Info) -> Participant | None:
+        participant = (
+            ParticipantModel.objects.for_conference(self._conference_id)
+            .filter(user_id=self.id)
+            .first()
+        )
+        return Participant.from_model(participant) if participant else None
 
 
 @strawberry.type
@@ -128,16 +138,18 @@ def abstract(self, language: str, info: Info) -> str | None:
         return self.abstract.localize(language)
 
     @strawberry.field
-    def speaker(self, info: Info) -> Participant | None:
+    def speaker(self, info: Info) -> SubmissionSpeaker | None:
         if not CanSeeSubmissionRestrictedFields().has_permission(
             self, info, is_speaker_data=True
         ):
             return None
 
-        participant = ParticipantModel.objects.filter(
-            user_id=self.speaker_id, conference_id=self.conference_id
-        ).first()
-        return Participant.from_model(participant) if participant else None
+        return SubmissionSpeaker(
+            id=self.speaker_id,
+            full_name=self.speaker.full_name,
+            gender=self.speaker.gender,
+            _conference_id=self.conference_id,
+        )
 
     @strawberry.field
     def id(self, info) -> strawberry.ID:

backend/custom_admin/src/components/fragments/submission.graphql

@@ -17,6 +17,6 @@ fragment SubmissionFragment on Submission {
   }
   speaker {
     id
-    fullname
+    fullName
   }
 }

backend/custom_admin/src/components/schedule-builder/add-item-modal/proposal-preview.tsx

@@ -20,7 +20,7 @@ export const ProposalPreview = ({ proposal }: Props) => {
         info={[
           { label: "Type", value: proposal.type.name },
           { label: "Duration", value: `${proposal.duration.duration} mins` },
-          { label: "Speaker", value: proposal.speaker.fullname },
+          { label: "Speaker", value: proposal.speaker.fullName },
         ]}
       />
       <AddActions proposal={proposal} />

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

@@ -7,20 +7,11 @@ query AcceptedProposals($code: String!, $language: String!) {
       id
       speaker {
         id
-        fullname
-        photo
-        bio
-        twitterHandle
-        instagramHandle
-        linkedinUrl
-        facebookUrl
-        mastodonHandle
-        website
-      }
-      speaker {
-        id
-        fullname
-        photo
+        fullName
+        participant {
+          photo
+          bio
+        }
       }
     }
   }

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

@@ -26,7 +26,7 @@ export const SpeakersContent = () => {
 
   const submissionsBySpeaker = Object.groupBy(
     submissions.toSorted((a, b) =>
-      a.speaker.fullname.localeCompare(b.speaker.fullname),
+      a.speaker.fullName.localeCompare(b.speaker.fullName),
     ),
     (submission) => submission.speaker.id,
   );
@@ -38,8 +38,8 @@ export const SpeakersContent = () => {
           ([speakerId, submissions]) => (
             <Link noHover href={`/profile/${speakerId}`} key={speakerId}>
               <SpeakerCard
-                speakerName={submissions[0].speaker.fullname}
-                portraitUrl={submissions[0].speaker.photo}
+                speakerName={submissions[0].speaker.fullName}
+                portraitUrl={submissions[0].speaker.participant.photo}
                 sessions={submissions
                   .map((submission) => submission.title)
                   .join(",")}

frontend/src/components/submission/submission.graphql

@@ -30,15 +30,17 @@ query Submission($id: ID!, $language: String!) {
     }
     speaker {
       id
-      fullname
-      photo
-      bio
-      twitterHandle
-      instagramHandle
-      linkedinUrl
-      facebookUrl
-      mastodonHandle
-      website
+      fullName
+      participant {
+        photo
+        bio
+        twitterHandle
+        instagramHandle
+        linkedinUrl
+        facebookUrl
+        mastodonHandle
+        website
+      }
     }
   }
 }

frontend/src/pages/schedule/fragments/submission.graphql

@@ -14,7 +14,7 @@ fragment SubmissionFragment on Submission {
 
   speaker {
     id
-    fullname
+    fullName
   }
 
   type {

frontend/src/pages/submission/[id]/index.tsx

@@ -76,16 +76,7 @@ export const SubmissionPage = () => {
         audienceLevel={submission?.audienceLevel.name}
         startTime={null}
         endTime={null}
-        speakers={
-          submission?.speaker
-            ? [
-                {
-                  fullName: submission.speaker.fullname,
-                  participant: submission.speaker,
-                },
-              ]
-            : null
-        }
+        speakers={submission?.speaker ? [submission.speaker] : null}
         bookable={false}
         spacesLeft={0}
         sidebarExtras={