@commonpub/server 2.89.0 → 2.90.0

package/dist/contest/read.js

@@ -0,0 +1,164 @@
+import { eq, ne, and, or, desc, sql, inArray } from 'drizzle-orm';
+import { contests, contestJudges, contestStakeholders } from '@commonpub/schema';
+import { normalizePagination, countRows } from '../query.js';
+import { isContestStakeholder } from './stakeholders.js';
+import { isContestJudge } from './judges.js';
+// Contest read path: listing (visibility-filtered), detail mapping, per-contest
+// view authorization, and the score-reveal decision. Writers live in contest.ts.
+export async function listContests(db, filters = {}, viewer) {
+    const conditions = [];
+    if (filters.status) {
+        conditions.push(eq(contests.status, filters.status));
+    }
+    // Visibility: admins see everything. Everyone else sees `public` contests,
+    // plus — when signed in — the ones they have a relationship to so they're not
+    // hidden in the listing: their own, ones they review (stakeholder), ones they
+    // judge, and private ones whose `visibleToRoles` includes their role. (`unlisted`
+    // stays link-only; mirrors canViewContest so the listing matches per-contest access.)
+    if (viewer?.role !== 'admin') {
+        const visConds = [eq(contests.visibility, 'public')];
+        if (viewer?.userId) {
+            visConds.push(eq(contests.createdById, viewer.userId));
+            visConds.push(inArray(contests.id, db.select({ id: contestStakeholders.contestId }).from(contestStakeholders).where(eq(contestStakeholders.userId, viewer.userId))));
+            visConds.push(inArray(contests.id, db.select({ id: contestJudges.contestId }).from(contestJudges).where(eq(contestJudges.userId, viewer.userId))));
+        }
+        if (viewer?.role) {
+            visConds.push(sql `${contests.visibleToRoles} @> ${JSON.stringify([viewer.role])}::jsonb`);
+        }
+        conditions.push(visConds.length > 1 ? or(...visConds) : visConds[0]);
+        // Drafts never appear in listings except to their own owner (admins, handled
+        // above, see everything). Orthogonal to visibility — a public draft is still hidden.
+        conditions.push(viewer?.userId
+            ? or(ne(contests.status, 'draft'), eq(contests.createdById, viewer.userId))
+            : ne(contests.status, 'draft'));
+    }
+    const where = conditions.length > 0 ? and(...conditions) : undefined;
+    const { limit, offset } = normalizePagination(filters);
+    const [rows, total] = await Promise.all([
+        db
+            .select()
+            .from(contests)
+            .where(where)
+            .orderBy(desc(contests.startDate), desc(contests.id))
+            .limit(limit)
+            .offset(offset),
+        countRows(db, contests, where),
+    ]);
+    const items = rows.map((row) => ({
+        id: row.id,
+        title: row.title,
+        slug: row.slug,
+        subheading: row.subheading,
+        description: row.description,
+        bannerUrl: row.bannerUrl,
+        coverImageUrl: row.coverImageUrl,
+        status: row.status,
+        startDate: row.startDate,
+        endDate: row.endDate,
+        entryCount: row.entryCount,
+        createdAt: row.createdAt,
+    }));
+    return { items, total };
+}
+/** Map a contest row to the API detail shape. Shared by the CRUD writers. */
+export function toContestDetail(row) {
+    return {
+        id: row.id,
+        title: row.title,
+        slug: row.slug,
+        description: row.description,
+        bannerUrl: row.bannerUrl,
+        coverImageUrl: row.coverImageUrl,
+        status: row.status,
+        startDate: row.startDate,
+        endDate: row.endDate,
+        entryCount: row.entryCount,
+        createdAt: row.createdAt,
+        subheading: row.subheading,
+        rules: row.rules,
+        prizesDescription: row.prizesDescription,
+        descriptionFormat: row.descriptionFormat,
+        rulesFormat: row.rulesFormat,
+        prizesDescriptionFormat: row.prizesDescriptionFormat,
+        descriptionBlocks: row.descriptionBlocks ?? null,
+        rulesBlocks: row.rulesBlocks ?? null,
+        prizesBlocks: row.prizesBlocks ?? null,
+        showPrizes: row.showPrizes,
+        stages: row.stages ?? [],
+        currentStageId: row.currentStageId ?? null,
+        prizes: row.prizes ?? null,
+        judgingCriteria: row.judgingCriteria ?? null,
+        judgingVisibility: row.judgingVisibility,
+        judgingEndDate: row.judgingEndDate,
+        communityVotingEnabled: row.communityVotingEnabled,
+        eligibleContentTypes: row.eligibleContentTypes ?? null,
+        maxEntriesPerUser: row.maxEntriesPerUser ?? null,
+        visibility: row.visibility,
+        visibleToRoles: row.visibleToRoles ?? null,
+        createdById: row.createdById,
+    };
+}
+/**
+ * Whether `user` may view this contest. `public`/`unlisted` are viewable by
+ * anyone (unlisted is simply hidden from listings). `private` is restricted to
+ * the owner, admins, stakeholders, panel judges, and users whose role is in
+ * `visibleToRoles`.
+ */
+export async function canViewContest(db, contest, user) {
+    // Drafts are owner-only regardless of the visibility setting — an unlaunched
+    // contest must never be world-readable, even when its visibility is `public`.
+    if (contest.status === 'draft') {
+        if (!user)
+            return false;
+        if (user.id === contest.createdById || user.role === 'admin')
+            return true;
+        if (await isContestStakeholder(db, contest.id, user.id))
+            return true;
+        if (await isContestJudge(db, contest.id, user.id))
+            return true;
+        return false;
+    }
+    if (contest.visibility !== 'private')
+        return true;
+    if (!user)
+        return false;
+    if (user.id === contest.createdById || user.role === 'admin')
+        return true;
+    if (contest.visibleToRoles && contest.visibleToRoles.includes(user.role))
+        return true;
+    if (await isContestStakeholder(db, contest.id, user.id))
+        return true;
+    if (await isContestJudge(db, contest.id, user.id))
+        return true;
+    return false;
+}
+export async function getContestBySlug(db, slug) {
+    const rows = await db
+        .select()
+        .from(contests)
+        .where(eq(contests.slug, slug))
+        .limit(1);
+    if (rows.length === 0)
+        return null;
+    return toContestDetail(rows[0]);
+}
+/**
+ * Decide whether a viewer may see aggregate entry scores, honouring the
+ * contest's `judgingVisibility` setting. Pure + exhaustively testable.
+ *
+ * - Privileged viewers (owner / admin / panel judge) always see scores.
+ * - `public`     → scores visible to everyone (during judging and after).
+ * - `judges-only`→ scores hidden from the public until the contest completes.
+ * - `private`    → aggregate scores never exposed to the public (ranks may
+ *                  still be shown so winners can be announced).
+ */
+export function shouldRevealScores(visibility, status, privileged) {
+    if (privileged)
+        return true;
+    if (visibility === 'public')
+        return true;
+    if (visibility === 'private')
+        return false;
+    return status === 'completed';
+}
+//# sourceMappingURL=read.js.map

package/dist/contest/read.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"read.js","sourceRoot":"","sources":["../../src/contest/read.ts"],"names":[],"mappings":"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"}

package/dist/contest/stages.d.ts

@@ -0,0 +1,28 @@
+import type { ContestStage } from '@commonpub/schema';
+import type { StageSource } from './types.js';
+/**
+ * The classic Submissions → Judging → Results timeline, synthesized from the
+ * status + date columns for contests that haven't defined explicit stages.
+ * Stable ids let `currentStageId` reference them even for legacy contests.
+ */
+export declare function synthesizeStages(c: StageSource): ContestStage[];
+/**
+ * The contest's stage timeline: its explicit `stages` if any are defined,
+ * otherwise the synthesized classic flow. The standard flow is the zero-config
+ * default — a contest with no `stages` renders identically to pre-B1.
+ */
+export declare function normalizeStages(c: StageSource): ContestStage[];
+/**
+ * The stage that is currently "now": the one `currentStageId` points at (if it
+ * resolves), else derived from the coarse `status`. Null while draft/cancelled
+ * (nothing is running). `status` remains the behavioural source of truth for
+ * gating; this is for DISPLAY (hero pill, sidebar highlight, countdown label).
+ */
+export declare function currentStage(c: StageSource): ContestStage | null;
+/** True when an entry was culled at some review stage (Phase B2 cohort gate). */
+export declare function isEliminated(entry: {
+    stageState?: Array<{
+        status: string;
+    }> | null;
+}): boolean;
+//# sourceMappingURL=stages.d.ts.map

package/dist/contest/stages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stages.d.ts","sourceRoot":"","sources":["../../src/contest/stages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAO9C;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE,CAM/D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,WAAW,GAAG,YAAY,GAAG,IAAI,CAiBhE;AAED,iFAAiF;AACjF,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAAE,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG,OAAO,CAE9F"}

package/dist/contest/stages.js

@@ -0,0 +1,52 @@
+// --- Phase B1: stage timeline helpers (pure — operate on a contest-like object) ---
+const toIso = (d) => d ? new Date(d).toISOString() : undefined;
+/**
+ * The classic Submissions → Judging → Results timeline, synthesized from the
+ * status + date columns for contests that haven't defined explicit stages.
+ * Stable ids let `currentStageId` reference them even for legacy contests.
+ */
+export function synthesizeStages(c) {
+    return [
+        { id: 'core-submission', name: 'Submissions', kind: 'submission', core: true, startsAt: toIso(c.startDate), endsAt: toIso(c.endDate) },
+        { id: 'core-review', name: 'Judging', kind: 'review', core: true, endsAt: toIso(c.judgingEndDate) ?? toIso(c.endDate) },
+        { id: 'core-results', name: 'Results', kind: 'results', core: true },
+    ];
+}
+/**
+ * The contest's stage timeline: its explicit `stages` if any are defined,
+ * otherwise the synthesized classic flow. The standard flow is the zero-config
+ * default — a contest with no `stages` renders identically to pre-B1.
+ */
+export function normalizeStages(c) {
+    return c.stages && c.stages.length > 0 ? c.stages : synthesizeStages(c);
+}
+/**
+ * The stage that is currently "now": the one `currentStageId` points at (if it
+ * resolves), else derived from the coarse `status`. Null while draft/cancelled
+ * (nothing is running). `status` remains the behavioural source of truth for
+ * gating; this is for DISPLAY (hero pill, sidebar highlight, countdown label).
+ */
+export function currentStage(c) {
+    const stages = normalizeStages(c);
+    if (c.currentStageId) {
+        const found = stages.find((s) => s.id === c.currentStageId);
+        if (found)
+            return found;
+    }
+    switch (c.status) {
+        case 'draft':
+        case 'cancelled':
+            return null;
+        case 'completed':
+            return stages.find((s) => s.kind === 'results') ?? stages[stages.length - 1] ?? null;
+        case 'judging':
+            return stages.find((s) => s.kind === 'review') ?? null;
+        default: // upcoming | active | paused
+            return stages.find((s) => s.kind === 'submission') ?? stages[0] ?? null;
+    }
+}
+/** True when an entry was culled at some review stage (Phase B2 cohort gate). */
+export function isEliminated(entry) {
+    return !!entry.stageState?.some((s) => s.status === 'eliminated');
+}
+//# sourceMappingURL=stages.js.map

package/dist/contest/stages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stages.js","sourceRoot":"","sources":["../../src/contest/stages.ts"],"names":[],"mappings":"AAGA,qFAAqF;AAErF,MAAM,KAAK,GAAG,CAAC,CAAmC,EAAsB,EAAE,CACxE,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAE5C;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,CAAc;IAC7C,OAAO;QACL,EAAE,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE;QACtI,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE;QACvH,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE;KACrE,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,CAAc;IAC5C,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,CAAc;IACzC,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;QACrB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,cAAc,CAAC,CAAC;QAC5D,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;IAC1B,CAAC;IACD,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;QACjB,KAAK,OAAO,CAAC;QACb,KAAK,WAAW;YACd,OAAO,IAAI,CAAC;QACd,KAAK,WAAW;YACd,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;QACvF,KAAK,SAAS;YACZ,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,IAAI,CAAC;QACzD,SAAS,6BAA6B;YACpC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC5E,CAAC;AACH,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,YAAY,CAAC,KAAwD;IACnF,OAAO,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;AACpE,CAAC"}

package/dist/contest/submissions.d.ts

@@ -0,0 +1,90 @@
+import type { ContestStageSubmission } from '@commonpub/schema';
+import type { DB } from '../types.js';
+import type { AgreementAcceptanceInput, ContestTx } from './types.js';
+/**
+ * Persist the PII + agreement halves of a partitioned submission within an open
+ * transaction. PII is upserted (one row per entry, merged with any prior PII so
+ * a later stage's PII doesn't wipe an earlier stage's); agreements are appended
+ * as immutable acceptance rows (terms hash + snapshot). No-op when both empty.
+ */
+export declare function recordPrivateAndAgreements(tx: ContestTx, args: {
+    contestId: string;
+    entryId: string;
+    userId: string;
+    stageId: string;
+    pii: Record<string, string>;
+    agreements: AgreementAcceptanceInput[];
+    ip?: string | null;
+}): Promise<void>;
+/**
+ * Submit (or update) an entrant's per-stage artifact: the filled template
+ * values for one `submission` stage, snapshotted onto the entry's
+ * `stageSubmissions`. Owner-only. The stage must be the contest's CURRENT
+ * stage while the contest is `active` (status stays the gating truth — the
+ * organizer maps a later submission round back to `active` when advancing).
+ * Re-submitting while the stage is open replaces that stage's artifact.
+ * Cohort gate: an entry culled at a prior review stage can no longer submit.
+ */
+export declare function submitStageArtifact(db: DB, entryId: string, stageId: string, fields: Record<string, string>, userId: string, ip?: string | null): Promise<{
+    submitted: boolean;
+    stageSubmissions?: ContestStageSubmission[];
+    error?: string;
+}>;
+export interface SubmitProposalArgs {
+    contestId: string;
+    stageId: string;
+    /** Raw entrant form values (template-key → string). */
+    fields: Record<string, string>;
+    userId: string;
+    /** Best-effort client IP, recorded with any agreement acceptances. */
+    ip?: string | null;
+}
+export type SubmitProposalResult = {
+    ok: true;
+    entryId: string;
+    projectSlug: string;
+    contentId: string;
+    contentType: string;
+} | {
+    ok: false;
+    error: string;
+};
+/**
+ * Form-first proposal submission (Phase 4). For a `submission` stage in
+ * `proposal` mode: validate the form, create a DRAFT placeholder project, link a
+ * contest entry to it (relaxing the published-only gate that `submitContestEntry`
+ * enforces), snapshot the artifact, record agreement acceptances, store PII in
+ * the private table, and bump `entryCount`. The placeholder + the entry +
+ * PII/agreements are written atomically: the placeholder is created first, then
+ * the entry tx; if the entry tx fails the placeholder is removed (compensating
+ * delete) so a failed submit never leaves an orphan draft.
+ *
+ * Flag (`features.contestProposals`) is enforced at the route; this fn enforces
+ * the structural gate that the target stage is current + proposal-mode.
+ */
+export declare function submitContestProposal(db: DB, args: SubmitProposalArgs): Promise<SubmitProposalResult>;
+export interface EntryPrivateData {
+    contestId: string;
+    entryId: string;
+    userId: string;
+    fields: Record<string, string>;
+    updatedAt: Date;
+    agreements: Array<{
+        fieldKey: string;
+        stageId: string;
+        termsHash: string;
+        termsSnapshot: string;
+        acceptedAt: Date;
+        /** Consent-audit IP captured at acceptance. Surfaced so the subject can see
+         *  the data held about them (transparency) and organizers have the audit trail. */
+        ip: string | null;
+    }>;
+}
+/**
+ * Read an entry's PII + agreement acceptances. NEVER reachable through the
+ * normal entries endpoints — the calling route gates this on the `contest.pii`
+ * permission OR the requester being the entrant. Returns null when the entry has
+ * no stored PII and no agreements.
+ */
+export declare function getEntryPrivateData(db: DB, entryId: string): Promise<EntryPrivateData | null>;
+//# sourceMappingURL=submissions.d.ts.map

package/dist/contest/submissions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"submissions.d.ts","sourceRoot":"","sources":["../../src/contest/submissions.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAe,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAKtC,OAAO,KAAK,EAAe,wBAAwB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAInF;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,EAAE,EAAE,SAAS,EACb,IAAI,EAAE;IACJ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,UAAU,EAAE,wBAAwB,EAAE,CAAC;IACvC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB,GACA,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,MAAM,EAAE,MAAM,EACd,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,GACjB,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkF9F;AAOD,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,MAAM,MAAM,oBAAoB,GAI5B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAC1F;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjC;;;;;;;;;;;;GAYG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAiG3G;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,IAAI,CAAC;IAChB,UAAU,EAAE,KAAK,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,IAAI,CAAC;QACjB;2FACmF;QACnF,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;KACnB,CAAC,CAAC;CACJ;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CA6BnG"}

package/dist/contest/submissions.js

@@ -0,0 +1,275 @@
+import { eq, and, sql } from 'drizzle-orm';
+import { contests, contestEntries, contestAgreementAcceptances, contestEntryPrivateFields, } from '@commonpub/schema';
+import { countRows } from '../query.js';
+import { createContent, deleteContent } from '../content/content.js';
+import { normalizeStages, currentStage, isEliminated } from './stages.js';
+import { validateSubmissionFields, hashTerms } from './validation.js';
+// DB-backed submission writers. Pure validation/partition lives in validation.ts.
+/**
+ * Persist the PII + agreement halves of a partitioned submission within an open
+ * transaction. PII is upserted (one row per entry, merged with any prior PII so
+ * a later stage's PII doesn't wipe an earlier stage's); agreements are appended
+ * as immutable acceptance rows (terms hash + snapshot). No-op when both empty.
+ */
+export async function recordPrivateAndAgreements(tx, args) {
+    const { contestId, entryId, userId, stageId, pii, agreements, ip } = args;
+    if (Object.keys(pii).length > 0) {
+        const [existing] = await tx
+            .select({ fields: contestEntryPrivateFields.fields })
+            .from(contestEntryPrivateFields)
+            .where(eq(contestEntryPrivateFields.entryId, entryId))
+            .for('update');
+        const merged = { ...(existing?.fields ?? {}), ...pii };
+        await tx
+            .insert(contestEntryPrivateFields)
+            .values({ contestId, entryId, userId, fields: merged })
+            .onConflictDoUpdate({
+            target: contestEntryPrivateFields.entryId,
+            set: { fields: merged, updatedAt: new Date() },
+        });
+    }
+    if (agreements.length > 0) {
+        await tx.insert(contestAgreementAcceptances).values(agreements.map((a) => ({
+            contestId,
+            entryId,
+            userId,
+            stageId,
+            fieldKey: a.fieldKey,
+            termsHash: hashTerms(a.terms),
+            termsSnapshot: a.terms,
+            ip: ip ?? null,
+        })));
+    }
+}
+/**
+ * Submit (or update) an entrant's per-stage artifact: the filled template
+ * values for one `submission` stage, snapshotted onto the entry's
+ * `stageSubmissions`. Owner-only. The stage must be the contest's CURRENT
+ * stage while the contest is `active` (status stays the gating truth — the
+ * organizer maps a later submission round back to `active` when advancing).
+ * Re-submitting while the stage is open replaces that stage's artifact.
+ * Cohort gate: an entry culled at a prior review stage can no longer submit.
+ */
+export async function submitStageArtifact(db, entryId, stageId, fields, userId, ip) {
+    const fail = (error) => ({ submitted: false, error });
+    const existing = await db
+        .select({
+        contestId: contestEntries.contestId,
+        entrantId: contestEntries.userId,
+        stageState: contestEntries.stageState,
+        contestStatus: contests.status,
+        stages: contests.stages,
+        currentStageId: contests.currentStageId,
+        startDate: contests.startDate,
+        endDate: contests.endDate,
+        judgingEndDate: contests.judgingEndDate,
+    })
+        .from(contestEntries)
+        .innerJoin(contests, eq(contestEntries.contestId, contests.id))
+        .where(eq(contestEntries.id, entryId))
+        .limit(1);
+    if (existing.length === 0)
+        return fail('Entry not found');
+    const row = existing[0];
+    if (row.entrantId !== userId)
+        return fail('Not the entry owner');
+    if (row.contestStatus !== 'active') {
+        return fail('Stage submissions are only open while the contest is active');
+    }
+    const source = {
+        status: row.contestStatus,
+        startDate: row.startDate,
+        endDate: row.endDate,
+        judgingEndDate: row.judgingEndDate,
+        stages: row.stages,
+        currentStageId: row.currentStageId,
+    };
+    const stages = normalizeStages(source);
+    const stage = stages.find((s) => s.id === stageId);
+    if (!stage)
+        return fail('Unknown stage');
+    if (stage.kind !== 'submission')
+        return fail('This stage does not accept submissions');
+    const template = stage.submissionTemplate ?? [];
+    if (template.length === 0)
+        return fail('This stage has no submission template');
+    const current = currentStage(source);
+    if (current?.id !== stageId)
+        return fail('This stage is not currently open');
+    // Cohort gate: once a review cut culled the field, eliminated entries are
+    // out of every later round (mirrors judgeContestEntry's gate).
+    if (isEliminated({ stageState: row.stageState })) {
+        return fail('This entry was not advanced and can no longer submit');
+    }
+    const validated = validateSubmissionFields(template, fields);
+    if (!validated.ok)
+        return fail(validated.error);
+    const { artifact, pii, agreements } = validated.result;
+    // Atomic read-modify-write: lock the entry row so two concurrent saves of
+    // the same artifact can't clobber each other (same pattern as judgeScores).
+    // PII + agreements (if the template has any) are persisted in the SAME tx so
+    // they can never land in the public stageSubmissions jsonb.
+    return db.transaction(async (tx) => {
+        const [locked] = await tx
+            .select({ stageSubmissions: contestEntries.stageSubmissions })
+            .from(contestEntries)
+            .where(eq(contestEntries.id, entryId))
+            .for('update');
+        const submissions = (locked?.stageSubmissions ?? []);
+        const record = { stageId, fields: artifact, submittedAt: new Date().toISOString() };
+        const idx = submissions.findIndex((s) => s.stageId === stageId);
+        if (idx >= 0)
+            submissions[idx] = record;
+        else
+            submissions.push(record);
+        await tx
+            .update(contestEntries)
+            .set({ stageSubmissions: submissions })
+            .where(eq(contestEntries.id, entryId));
+        await recordPrivateAndAgreements(tx, { contestId: row.contestId, entryId, userId, stageId, pii, agreements, ip });
+        return { submitted: true, stageSubmissions: submissions };
+    });
+}
+// --- Form-first proposal submissions (Phase 4) ---
+/** Content types a placeholder proposal project may be created as. */
+const PLACEHOLDER_TYPES = ['project', 'blog', 'explainer'];
+/**
+ * Form-first proposal submission (Phase 4). For a `submission` stage in
+ * `proposal` mode: validate the form, create a DRAFT placeholder project, link a
+ * contest entry to it (relaxing the published-only gate that `submitContestEntry`
+ * enforces), snapshot the artifact, record agreement acceptances, store PII in
+ * the private table, and bump `entryCount`. The placeholder + the entry +
+ * PII/agreements are written atomically: the placeholder is created first, then
+ * the entry tx; if the entry tx fails the placeholder is removed (compensating
+ * delete) so a failed submit never leaves an orphan draft.
+ *
+ * Flag (`features.contestProposals`) is enforced at the route; this fn enforces
+ * the structural gate that the target stage is current + proposal-mode.
+ */
+export async function submitContestProposal(db, args) {
+    const { contestId, stageId, fields, userId, ip } = args;
+    const fail = (error) => ({ ok: false, error });
+    const [contest] = await db
+        .select({
+        id: contests.id,
+        title: contests.title,
+        status: contests.status,
+        stages: contests.stages,
+        currentStageId: contests.currentStageId,
+        startDate: contests.startDate,
+        endDate: contests.endDate,
+        judgingEndDate: contests.judgingEndDate,
+        maxEntriesPerUser: contests.maxEntriesPerUser,
+        eligibleContentTypes: contests.eligibleContentTypes,
+    })
+        .from(contests)
+        .where(eq(contests.id, contestId))
+        .limit(1);
+    if (!contest)
+        return fail('Contest not found');
+    if (contest.status !== 'active')
+        return fail('Proposals are only open while the contest is active');
+    const source = {
+        status: contest.status,
+        startDate: contest.startDate,
+        endDate: contest.endDate,
+        judgingEndDate: contest.judgingEndDate,
+        stages: contest.stages,
+        currentStageId: contest.currentStageId,
+    };
+    const stage = normalizeStages(source).find((s) => s.id === stageId);
+    if (!stage)
+        return fail('Unknown stage');
+    if (stage.kind !== 'submission')
+        return fail('This stage does not accept submissions');
+    if (stage.submissionMode !== 'proposal')
+        return fail('This stage is not accepting proposals');
+    if (currentStage(source)?.id !== stageId)
+        return fail('This stage is not currently open');
+    const template = stage.submissionTemplate ?? [];
+    const validated = validateSubmissionFields(template, fields);
+    if (!validated.ok)
+        return fail(validated.error);
+    const { artifact, pii, agreements } = validated.result;
+    // Per-user entry cap (mirrors submitContestEntry).
+    if (contest.maxEntriesPerUser != null) {
+        const existing = await countRows(db, contestEntries, and(eq(contestEntries.contestId, contestId), eq(contestEntries.userId, userId)));
+        if (existing >= contest.maxEntriesPerUser)
+            return fail('You have reached the entry limit for this contest');
+    }
+    // Pick the placeholder content type: the contest's first eligible type when
+    // it's one we can create, else a project.
+    const eligible = (contest.eligibleContentTypes ?? []).find((t) => PLACEHOLDER_TYPES.includes(t));
+    const placeholderType = (eligible ?? 'project');
+    const title = artifact.title?.trim() || `${contest.title} proposal`;
+    // 1) Create the DRAFT placeholder (its own writes). The entrant develops it in
+    //    the editor; the proposal text lives in the stage artifact below.
+    const placeholder = await createContent(db, userId, { type: placeholderType, title });
+    // 2) Link the entry + persist artifact/PII/agreements/count atomically. On any
+    //    failure, remove the placeholder so a failed submit leaves nothing behind.
+    try {
+        const entryId = await db.transaction(async (tx) => {
+            const [inserted] = await tx
+                .insert(contestEntries)
+                .values({
+                contestId,
+                contentId: placeholder.id,
+                userId,
+                stageSubmissions: [{ stageId, fields: artifact, submittedAt: new Date().toISOString() }],
+            })
+                .onConflictDoNothing()
+                .returning({ id: contestEntries.id });
+            if (!inserted)
+                throw new Error('entry-conflict');
+            await tx
+                .update(contests)
+                .set({ entryCount: sql `${contests.entryCount} + 1` })
+                .where(eq(contests.id, contestId));
+            await recordPrivateAndAgreements(tx, { contestId, entryId: inserted.id, userId, stageId, pii, agreements, ip });
+            return inserted.id;
+        });
+        return { ok: true, entryId, projectSlug: placeholder.slug, contentId: placeholder.id, contentType: placeholder.type };
+    }
+    catch (err) {
+        await deleteContent(db, placeholder.id, userId).catch(() => { });
+        if (err instanceof Error && err.message === 'entry-conflict') {
+            return fail('You already have an entry for this contest');
+        }
+        throw err;
+    }
+}
+/**
+ * Read an entry's PII + agreement acceptances. NEVER reachable through the
+ * normal entries endpoints — the calling route gates this on the `contest.pii`
+ * permission OR the requester being the entrant. Returns null when the entry has
+ * no stored PII and no agreements.
+ */
+export async function getEntryPrivateData(db, entryId) {
+    const [priv] = await db
+        .select()
+        .from(contestEntryPrivateFields)
+        .where(eq(contestEntryPrivateFields.entryId, entryId))
+        .limit(1);
+    const agreements = await db
+        .select({
+        fieldKey: contestAgreementAcceptances.fieldKey,
+        stageId: contestAgreementAcceptances.stageId,
+        termsHash: contestAgreementAcceptances.termsHash,
+        termsSnapshot: contestAgreementAcceptances.termsSnapshot,
+        acceptedAt: contestAgreementAcceptances.acceptedAt,
+        ip: contestAgreementAcceptances.ip,
+    })
+        .from(contestAgreementAcceptances)
+        .where(eq(contestAgreementAcceptances.entryId, entryId));
+    if (!priv && agreements.length === 0)
+        return null;
+    return {
+        contestId: priv?.contestId ?? '',
+        entryId,
+        userId: priv?.userId ?? '',
+        fields: (priv?.fields ?? {}),
+        updatedAt: priv?.updatedAt ?? new Date(0),
+        agreements,
+    };
+}
+//# sourceMappingURL=submissions.js.map

package/dist/contest/submissions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"submissions.js","sourceRoot":"","sources":["../../src/contest/submissions.ts"],"names":[],"mappings":"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"}