feat: remove isOrganizer field from speakers and compute status from conference organizers

Author: Starefossen

__tests__/lib/speaker/sanity.test.ts

@@ -24,7 +24,11 @@ vi.mock('uuid', () => ({
   v4: () => 'mock-uuid-1234',
 }))
 
-import { updateSpeaker, getOrCreateSpeaker } from '@/lib/speaker/sanity'
+import {
+  updateSpeaker,
+  getOrCreateSpeaker,
+  getSpeaker,
+} from '@/lib/speaker/sanity'
 import type { Speaker } from '@/lib/speaker/types'
 import type { Account, User } from 'next-auth'
 
@@ -225,3 +229,86 @@ describe('getOrCreateSpeaker', () => {
     expect(createArg.image).toBeUndefined()
   })
 })
+
+describe('isOrganizer computed from conference.organizers', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should propagate isOrganizer: true from Sanity response through getOrCreateSpeaker', async () => {
+    const organizer = {
+      ...baseSpeaker,
+      isOrganizer: true,
+      providers: ['github:12345'],
+    }
+    mockFetch.mockResolvedValue(organizer)
+
+    const { speaker, err } = await getOrCreateSpeaker(
+      { email: organizer.email, name: organizer.name },
+      { provider: 'github', providerAccountId: '12345', type: 'oauth' },
+    )
+
+    expect(err).toBeNull()
+    expect(speaker.isOrganizer).toBe(true)
+  })
+
+  it('should propagate isOrganizer: false from Sanity response through getOrCreateSpeaker', async () => {
+    const regular = {
+      ...baseSpeaker,
+      isOrganizer: false,
+      providers: ['github:67890'],
+    }
+    mockFetch.mockResolvedValue(regular)
+
+    const { speaker, err } = await getOrCreateSpeaker(
+      { email: regular.email, name: regular.name },
+      { provider: 'github', providerAccountId: '67890', type: 'oauth' },
+    )
+
+    expect(err).toBeNull()
+    expect(speaker.isOrganizer).toBe(false)
+  })
+
+  it('should propagate isOrganizer through getSpeaker', async () => {
+    mockFetch.mockResolvedValue({ ...baseSpeaker, isOrganizer: true })
+
+    const { speaker, err } = await getSpeaker('speaker-1')
+
+    expect(err).toBeNull()
+    expect(speaker.isOrganizer).toBe(true)
+  })
+
+  it('should handle undefined isOrganizer as falsy', async () => {
+    const speakerWithoutFlag = { ...baseSpeaker }
+    delete (speakerWithoutFlag as Record<string, unknown>).isOrganizer
+    mockFetch.mockResolvedValue(speakerWithoutFlag)
+
+    const { speaker, err } = await getSpeaker('speaker-1')
+
+    expect(err).toBeNull()
+    expect(speaker.isOrganizer).toBeFalsy()
+  })
+
+  it('should include isOrganizer in GROQ query for findSpeakerByProvider', async () => {
+    mockFetch.mockResolvedValue(null)
+
+    await getOrCreateSpeaker(
+      { email: 'test@test.com', name: 'Test' },
+      { provider: 'github', providerAccountId: '99', type: 'oauth' },
+    )
+
+    const query = mockFetch.mock.calls[0][0] as string
+    expect(query).toContain('isOrganizer')
+    expect(query).toContain('conference')
+  })
+
+  it('should include isOrganizer in GROQ query for getSpeaker', async () => {
+    mockFetch.mockResolvedValue(baseSpeaker)
+
+    await getSpeaker('speaker-1')
+
+    const query = mockFetch.mock.calls[0][0] as string
+    expect(query).toContain('isOrganizer')
+    expect(query).toContain('conference')
+  })
+})

migrations/036-remove-speaker-is-organizer/index.ts

@@ -0,0 +1,21 @@
+import { defineMigration, at, unset } from 'sanity/migrate'
+
+export default defineMigration({
+  title: 'Remove isOrganizer field from speakers',
+  description:
+    'Removes the isOrganizer boolean field from speaker documents. ' +
+    'Organizer status is now computed from conference.organizers[] references.',
+  documentTypes: ['speaker'],
+
+  migrate: {
+    document(doc) {
+      const d = doc as Record<string, unknown>
+
+      if (d.isOrganizer !== undefined) {
+        return [at('isOrganizer', unset())]
+      }
+
+      return []
+    },
+  },
+})

sanity/schemaTypes/speaker.ts

@@ -107,12 +107,6 @@ export default defineType({
       type: 'text',
       description: 'Speaker biography displayed on the public profile',
     }),
-    defineField({
-      name: 'isOrganizer',
-      title: 'Is this a organizer?',
-      type: 'boolean',
-      description: 'Grants access to the admin interface',
-    }),
     defineField({
       title: 'Flags',
       description: 'Meta information about the speaker',

sanity/schemaTypes/sponsorActivity.ts

@@ -74,7 +74,7 @@ export default defineType({
       description:
         'The organizer who performed this action. Omitted for system-generated activities.',
       options: {
-        filter: 'isOrganizer == true',
+        filter: '_id in *[_type == \"conference\"].organizers[]._ref',
       },
     }),
     defineField({

sanity/schemaTypes/sponsorForConference.ts

@@ -204,7 +204,7 @@ export default defineType({
         filter: ({ document }: { document: any }) => {
           if (!document?.conference?._ref) {
             return {
-              filter: 'isOrganizer == true',
+              filter: '_id in *[_type == \"conference\"].organizers[]._ref',
             }
           }
 

src/lib/auth.ts

@@ -57,21 +57,6 @@ const config = {
         return {}
       }
 
-      // Migrate legacy snake_case JWT tokens from before migration 028.
-      // Old tokens stored speaker.is_organizer; new code expects isOrganizer.
-      // This block can be removed once all active sessions have expired.
-      if (
-        !trigger &&
-        token.speaker &&
-        typeof token.speaker === 'object' &&
-        'is_organizer' in token.speaker &&
-        !('isOrganizer' in token.speaker)
-      ) {
-        const sp = token.speaker as Record<string, unknown>
-        sp.isOrganizer = sp.is_organizer
-        delete sp.is_organizer
-      }
-
       if (trigger === 'signIn') {
         if (!token || !token.email || !token.name) {
           console.error('Invalid auth token', token)

src/lib/sanity/speaker.ts

@@ -11,7 +11,7 @@ export async function getSpeakerByEmail(
         _id,
         name,
         email,
-        isOrganizer,
+        "isOrganizer": _id in *[_type == "conference"].organizers[]._ref,
         "image": coalesce(image.asset->url, imageURL),
         "slug": slug.current
       }

src/lib/speaker/sanity.ts

@@ -9,6 +9,10 @@ import { v4 as randomUUID } from 'uuid'
 import { Account, User } from 'next-auth'
 import { ProposalExisting, Status } from '../proposal/types'
 import { cacheLife, cacheTag } from 'next/cache'
+
+// Computed field: speaker is an organizer if referenced in any conference's organizers array
+const IS_ORGANIZER_FIELD =
+  '"isOrganizer": _id in *[_type == "conference"].organizers[]._ref'
 export function providerAccount(
   provider: string,
   providerAccountId: string,
@@ -43,7 +47,8 @@ async function findSpeakerByProvider(
       `*[ _type == "speaker" && $id in providers][0]{
       ...,
       "slug": slug.current,
-      "image": coalesce(image.asset->url, imageURL)
+      "image": coalesce(image.asset->url, imageURL),
+      ${IS_ORGANIZER_FIELD}
     }`,
       { id },
     )
@@ -65,7 +70,8 @@ async function findSpeakerByEmail(
       `*[ _type == "speaker" && email == $email][0]{
       ...,
       "slug": slug.current,
-      "image": coalesce(image.asset->url, imageURL)
+      "image": coalesce(image.asset->url, imageURL),
+      ${IS_ORGANIZER_FIELD}
     }`,
       { email },
     )
@@ -165,7 +171,8 @@ export async function getSpeaker(
       `*[ _type == "speaker" && _id == $speakerId][0]{
       ...,
       "slug": slug.current,
-      "image": coalesce(image.asset->url, imageURL)
+      "image": coalesce(image.asset->url, imageURL),
+      ${IS_ORGANIZER_FIELD}
     }`,
       { speakerId },
       { cache: 'no-store' },
@@ -376,7 +383,7 @@ export async function getOrganizerCount(): Promise<{
   let err = null
 
   try {
-    const query = groq`count(*[_type == "speaker" && isOrganizer == true])`
+    const query = groq`count(*[_type == "conference"].organizers[]._ref)`
     count = await clientRead.fetch(query, {}, { cache: 'no-store' })
   } catch (error) {
     err = error as Error
@@ -393,10 +400,11 @@ export async function getOrganizers(): Promise<{
   let err = null
 
   try {
-    const query = groq`*[_type == "speaker" && isOrganizer == true] {
+    const query = groq`*[_type == "speaker" && _id in *[_type == "conference"].organizers[]._ref] {
       ...,
       "slug": slug.current,
-      "image": coalesce(image.asset->url, imageURL)
+      "image": coalesce(image.asset->url, imageURL),
+      "isOrganizer": true
     } | order(name asc)`
 
     speakers = await clientRead.fetch(query, {}, { cache: 'no-store' })