Optional join of EmailAddress list

hasgeek · Oct 6, 2023 · f8624fa · f8624fa
1 parent 17c1369
commit f8624fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/funnel/models/sync_ticket.py b/funnel/models/sync_ticket.py
@@ -376,7 +376,7 @@ def checkin_list(cls, ticket_event: TicketEvent) -> list:  # TODO: List type?
                 TicketEventParticipant,
                 TicketParticipant.id == TicketEventParticipant.ticket_participant_id,
             )
-            .join(EmailAddress, EmailAddress.id == TicketParticipant.email_address_id)
+            .outerjoin(EmailAddress, EmailAddress.id == TicketParticipant.email_address_id)
             .outerjoin(
                 SyncTicket, TicketParticipant.id == SyncTicket.ticket_participant_id
             )

diff --git a/funnel/views/ticket_participant.py b/funnel/views/ticket_participant.py
@@ -96,7 +96,7 @@ def ticket_participant_checkin_data(ticket_participant, project, ticket_event):
         'puuid_b58': puuid_b58,
         'fullname': ticket_participant.fullname,
         'company': ticket_participant.company,
-        'email': mask_email(ticket_participant.email),
+        'email': mask_email(ticket_participant.email) if ticket_participant.email else None,
         'badge_printed': ticket_participant.badge_printed,
         'checked_in': ticket_participant.checked_in,
         'ticket_type_titles': ticket_participant.ticket_type_titles,