MOPC/MOPC-Portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(final-docs): round-scope file query + guard empty-required edge case

Browse Source
This commit is contained in:
Matt
2026-06-09 15:15:22 +02:00
parent b1923cf0e1
commit c53ec23109
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/services/final-documents.ts
View File

@@ -57,7 +57,7 @@ export async function getFinalDocumentStatusForProject(
}) })
const files = await prisma.projectFile.findMany({ const files = await prisma.projectFile.findMany({
where: { projectId, requirementId: { in: requirements.map((r) => r.id) } }, where: { projectId, roundId: round.id, requirementId: { in: requirements.map((r) => r.id) } },
orderBy: { createdAt: 'desc' }, orderBy: { createdAt: 'desc' },
select: { id: true, requirementId: true, fileName: true, mimeType: true, bucket: true, objectKey: true, createdAt: true }, select: { id: true, requirementId: true, fileName: true, mimeType: true, bucket: true, objectKey: true, createdAt: true },
}) })
@@ -73,7 +73,8 @@ export async function getFinalDocumentStatusForProject(
} }
}) })
const allRequiredUploaded = reqStatuses.filter((r) => r.isRequired).every((r) => r.uploaded) const required = reqStatuses.filter((r) => r.isRequired)
const allRequiredUploaded = required.length > 0 && required.every((r) => r.uploaded)
const deadline = round.windowCloseAt ?? null const deadline = round.windowCloseAt ?? null
return { return {
roundId: round.id, roundId: round.id,

21
tests/unit/final-documents.test.ts
View File

@@ -13,7 +13,9 @@ import { getFinalDocumentStatusForProject } from '@/server/services/final-docume
const programIds: string[] = [] const programIds: string[] = []
async function makeFinaleProgram(opts: { roundStatus?: 'ROUND_ACTIVE' | 'ROUND_DRAFT'; closeAt?: Date } = {}) { async function makeFinaleProgram(
opts: { roundStatus?: 'ROUND_ACTIVE' | 'ROUND_DRAFT'; closeAt?: Date; skipRequirements?: boolean } = {},
) {
const program = await createTestProgram() const program = await createTestProgram()
programIds.push(program.id) programIds.push(program.id)
const comp = await createTestCompetition(program.id, { status: 'ACTIVE' }) const comp = await createTestCompetition(program.id, { status: 'ACTIVE' })
@@ -23,6 +25,9 @@ async function makeFinaleProgram(opts: { roundStatus?: 'ROUND_ACTIVE' | 'ROUND_D
sortOrder: 6, sortOrder: 6,
windowCloseAt: opts.closeAt ?? new Date(Date.now() + 86_400_000), windowCloseAt: opts.closeAt ?? new Date(Date.now() + 86_400_000),
}) })
if (opts.skipRequirements) {
return { program, comp, round, reqPlan: undefined, reqVideo: undefined }
}
const reqPlan = await prisma.fileRequirement.create({ const reqPlan = await prisma.fileRequirement.create({
data: { id: uid('req'), roundId: round.id, name: 'Final Business Plan', acceptedMimeTypes: ['application/pdf'], isRequired: true, sortOrder: 1 }, data: { id: uid('req'), roundId: round.id, name: 'Final Business Plan', acceptedMimeTypes: ['application/pdf'], isRequired: true, sortOrder: 1 },
}) })
@@ -61,8 +66,8 @@ describe('getFinalDocumentStatusForProject', () => {
const project = await createTestProject(program.id) const project = await createTestProject(program.id)
await createTestProjectRoundState(project.id, round.id) await createTestProjectRoundState(project.id, round.id)
for (const [req, type, mime] of [ for (const [req, type, mime] of [
[reqPlan, 'BUSINESS_PLAN', 'application/pdf'], [reqPlan!, 'BUSINESS_PLAN', 'application/pdf'],
[reqVideo, 'VIDEO', 'video/mp4'], [reqVideo!, 'VIDEO', 'video/mp4'],
] as const) { ] as const) {
await prisma.projectFile.create({ await prisma.projectFile.create({
data: { data: {
@@ -84,4 +89,14 @@ describe('getFinalDocumentStatusForProject', () => {
const status = await getFinalDocumentStatusForProject(prisma, project.id) const status = await getFinalDocumentStatusForProject(prisma, project.id)
expect(status).toBeNull() expect(status).toBeNull()
}) })
it('reports allRequiredUploaded false when the round has no required requirements', async () => {
const { program, round } = await makeFinaleProgram({ skipRequirements: true })
const project = await createTestProject(program.id)
await createTestProjectRoundState(project.id, round.id)
const status = await getFinalDocumentStatusForProject(prisma, project.id)
expect(status).not.toBeNull()
expect(status!.requirements).toHaveLength(0)
expect(status!.allRequiredUploaded).toBe(false)
})
}) })