fix: scope admin ranking dashboard side-sheet stats to current round
The admin dashboard fetches its side-sheet detail from project.getFullDetail (not analytics.getProjectDetail as the audit assumed), and that procedure had the same cross-round contamination bug. Add an optional roundId to its input, filter the SUBMITTED-evaluations query when provided, and pass roundId from the dashboard's useQuery so the Avg Score / Pass Rate / Evaluators card now matches the per-juror list rendered below it. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -304,7 +304,7 @@ export function RankingDashboard({ competitionId: _competitionId, roundId }: Ran
|
|||||||
)
|
)
|
||||||
|
|
||||||
const { data: projectDetail, isLoading: detailLoading } = trpc.project.getFullDetail.useQuery(
|
const { data: projectDetail, isLoading: detailLoading } = trpc.project.getFullDetail.useQuery(
|
||||||
{ id: selectedProjectId! },
|
{ id: selectedProjectId!, roundId },
|
||||||
{ enabled: !!selectedProjectId },
|
{ enabled: !!selectedProjectId },
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1249,7 +1249,7 @@ export const projectRouter = router({
|
|||||||
* Reduces client-side waterfall by combining project.get + assignment.listByProject + evaluation.getProjectStats.
|
* Reduces client-side waterfall by combining project.get + assignment.listByProject + evaluation.getProjectStats.
|
||||||
*/
|
*/
|
||||||
getFullDetail: adminProcedure
|
getFullDetail: adminProcedure
|
||||||
.input(z.object({ id: z.string() }))
|
.input(z.object({ id: z.string(), roundId: z.string().optional() }))
|
||||||
.query(async ({ ctx, input }) => {
|
.query(async ({ ctx, input }) => {
|
||||||
const [projectRaw, projectTags, assignments, submittedEvaluations] = await Promise.all([
|
const [projectRaw, projectTags, assignments, submittedEvaluations] = await Promise.all([
|
||||||
ctx.prisma.project.findUniqueOrThrow({
|
ctx.prisma.project.findUniqueOrThrow({
|
||||||
@@ -1297,7 +1297,10 @@ export const projectRouter = router({
|
|||||||
ctx.prisma.evaluation.findMany({
|
ctx.prisma.evaluation.findMany({
|
||||||
where: {
|
where: {
|
||||||
status: 'SUBMITTED',
|
status: 'SUBMITTED',
|
||||||
assignment: { projectId: input.id },
|
assignment: {
|
||||||
|
projectId: input.id,
|
||||||
|
...(input.roundId ? { roundId: input.roundId } : {}),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
createTestEvaluation, createTestEvaluationForm, cleanupTestData, uid,
|
createTestEvaluation, createTestEvaluationForm, cleanupTestData, uid,
|
||||||
} from '../helpers'
|
} from '../helpers'
|
||||||
import { analyticsRouter } from '../../src/server/routers/analytics'
|
import { analyticsRouter } from '../../src/server/routers/analytics'
|
||||||
|
import { projectRouter } from '../../src/server/routers/project'
|
||||||
|
|
||||||
describe('analytics.getProjectDetail round scoping', () => {
|
describe('analytics.getProjectDetail round scoping', () => {
|
||||||
let programId: string
|
let programId: string
|
||||||
@@ -69,6 +70,15 @@ describe('analytics.getProjectDetail round scoping', () => {
|
|||||||
const result = await caller.getProjectDetail({ id: projectId })
|
const result = await caller.getProjectDetail({ id: projectId })
|
||||||
expect(result.stats!.totalEvaluations).toBe(5)
|
expect(result.stats!.totalEvaluations).toBe(5)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('project.getFullDetail also scopes stats to roundId when provided', async () => {
|
||||||
|
const caller = createCaller(projectRouter, admin)
|
||||||
|
const scoped = await caller.getFullDetail({ id: projectId, roundId: roundBId })
|
||||||
|
expect(scoped.stats!.totalEvaluations).toBe(3)
|
||||||
|
expect(scoped.stats!.averageGlobalScore).toBeCloseTo(8.333, 2)
|
||||||
|
const aggregate = await caller.getFullDetail({ id: projectId })
|
||||||
|
expect(aggregate.stats!.totalEvaluations).toBe(5)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('analytics.getProjectRankings per-round z-context (edition mode)', () => {
|
describe('analytics.getProjectRankings per-round z-context (edition mode)', () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user