Fix: draft proposals counted toward max submissions limit (#359)

Author: Copilot

__tests__/lib/proposal/utils.test.ts

@@ -2,6 +2,7 @@ import {
   extractSpeakersFromProposal,
   extractSpeakerIds,
   calculateReviewScore,
+  countActiveProposals,
 } from '@/lib/proposal/utils'
 import { Status, Language, Format, Level, Audience } from '@/lib/proposal/types'
 import type { ProposalExisting } from '@/lib/proposal/types'
@@ -203,3 +204,79 @@ describe('calculateReviewScore', () => {
     expect(calculateReviewScore(reviews, 'speaker')).toBe(0)
   })
 })
+
+describe('countActiveProposals', () => {
+  it('returns 0 for null', () => {
+    expect(countActiveProposals(null)).toBe(0)
+  })
+
+  it('returns 0 for undefined', () => {
+    expect(countActiveProposals(undefined)).toBe(0)
+  })
+
+  it('returns 0 for empty array', () => {
+    expect(countActiveProposals([])).toBe(0)
+  })
+
+  it('counts submitted proposals', () => {
+    const proposals = [
+      makeProposal({ status: Status.submitted }),
+      makeProposal({ status: Status.submitted }),
+    ]
+    expect(countActiveProposals(proposals)).toBe(2)
+  })
+
+  it('excludes draft proposals from count', () => {
+    const proposals = [
+      makeProposal({ status: Status.submitted }),
+      makeProposal({ status: Status.draft }),
+    ]
+    expect(countActiveProposals(proposals)).toBe(1)
+  })
+
+  it('excludes deleted proposals from count', () => {
+    const proposals = [
+      makeProposal({ status: Status.submitted }),
+      makeProposal({ status: Status.deleted }),
+    ]
+    expect(countActiveProposals(proposals)).toBe(1)
+  })
+
+  it('returns 0 when all proposals are drafts or deleted', () => {
+    const proposals = [
+      makeProposal({ status: Status.draft }),
+      makeProposal({ status: Status.draft }),
+      makeProposal({ status: Status.deleted }),
+    ]
+    expect(countActiveProposals(proposals)).toBe(0)
+  })
+
+  it('counts accepted, confirmed, and waitlisted proposals', () => {
+    const proposals = [
+      makeProposal({ status: Status.accepted }),
+      makeProposal({ status: Status.confirmed }),
+      makeProposal({ status: Status.waitlisted }),
+    ]
+    expect(countActiveProposals(proposals)).toBe(3)
+  })
+
+  it('3 drafts do not trigger the cap, allowing a new submission', () => {
+    const proposals = [
+      makeProposal({ status: Status.draft }),
+      makeProposal({ status: Status.draft }),
+      makeProposal({ status: Status.draft }),
+    ]
+    expect(countActiveProposals(proposals)).toBe(0)
+    expect(countActiveProposals(proposals) < 3).toBe(true)
+  })
+
+  it('3 submitted proposals trigger the cap', () => {
+    const proposals = [
+      makeProposal({ status: Status.submitted }),
+      makeProposal({ status: Status.submitted }),
+      makeProposal({ status: Status.submitted }),
+    ]
+    expect(countActiveProposals(proposals)).toBe(3)
+    expect(countActiveProposals(proposals) >= 3).toBe(true)
+  })
+})

src/app/(cfp)/cfp/proposal/[[...id]]/page.tsx

@@ -9,6 +9,7 @@ import {
   ProposalExisting,
 } from '@/lib/proposal/types'
 import { getProposalSanity } from '@/lib/proposal/server'
+import { countActiveProposals } from '@/lib/proposal/utils'
 import { Speaker } from '@/lib/speaker/types'
 import { ProposalForm } from '@/components/cfp/ProposalForm'
 import { ProposalGuidanceSidebar } from '@/components/cfp/ProposalGuidanceSidebar'
@@ -102,16 +103,13 @@ export default async function ProposalPage({
 
       if (!proposalId && conference && !loadingError) {
         const { getProposals } = await import('@/lib/proposal/data/sanity')
-        const { Status } = await import('@/lib/proposal/types')
         const { proposals: existingProposals } = await getProposals({
           speakerId: session.speaker._id,
           conferenceId: conference._id,
           returnAll: false,
         })
 
-        const proposalCount = (existingProposals || []).filter(
-          (p) => p.status !== Status.deleted,
-        ).length
+        const proposalCount = countActiveProposals(existingProposals)
 
         if (proposalCount >= 3) {
           loadingError = {

src/lib/proposal/utils.ts

@@ -1,7 +1,15 @@
-import { ProposalExisting } from './types'
+import { ProposalExisting, Status } from './types'
 import { SpeakerWithReviewInfo } from '@/lib/speaker/types'
 import { Reference } from 'sanity'
 
+export function countActiveProposals(
+  proposals: ProposalExisting[] | null | undefined,
+): number {
+  return (proposals || []).filter(
+    (p) => p.status !== Status.deleted && p.status !== Status.draft,
+  ).length
+}
+
 export function extractSpeakersFromProposal(
   proposal: ProposalExisting,
 ): SpeakerWithReviewInfo[] {

src/server/routers/proposal.ts

@@ -37,6 +37,7 @@ import { createReference } from '@/lib/sanity/helpers'
 import type { ProposalInput } from '@/lib/proposal/types'
 import { Status } from '@/lib/proposal/types'
 import { actionStateMachine } from '@/lib/proposal'
+import { countActiveProposals } from '@/lib/proposal/utils'
 import { Speaker } from '@/lib/speaker/types'
 import { eventBus } from '@/lib/events/bus'
 import { ProposalStatusChangeEvent } from '@/lib/events/types'
@@ -253,9 +254,7 @@ export const proposalRouter = router({
           returnAll: false,
         })
 
-        const proposalCount = (existingProposals || []).filter(
-          (p) => p.status !== Status.deleted,
-        ).length
+        const proposalCount = countActiveProposals(existingProposals)
 
         if (proposalCount >= 3) {
           throw new TRPCError({
@@ -453,6 +452,27 @@ export const proposalRouter = router({
           })
         }
 
+        // Enforce cap when submitting a draft (draft → submitted transition)
+        if (
+          proposal.status === Status.draft &&
+          status === Status.submitted &&
+          !ctx.speaker.isOrganizer
+        ) {
+          const { proposals: existingProposals } = await getProposals({
+            speakerId: ctx.speaker._id,
+            conferenceId: conference._id,
+            returnAll: false,
+          })
+
+          if (countActiveProposals(existingProposals) >= 3) {
+            throw new TRPCError({
+              code: 'FORBIDDEN',
+              message:
+                'You have reached the maximum of 3 proposals per conference. Please edit or withdraw an existing proposal if you need to submit a new one.',
+            })
+          }
+        }
+
         // Handle deletion separately
         if (status === Status.deleted) {
           const { err: deleteError } = await deleteProposal(id)