Prevent rejected projects shipped for clubs to be shipped individually after deadline

Author: ArcaEge

src/routes/dashboard/projects/[id]/ship/+page.server.ts

@@ -1,7 +1,7 @@
 import { db } from '$lib/server/db/index.js';
-import { devlog, project, clubMembership, club } from '$lib/server/db/schema.js';
+import { devlog, project, clubMembership, club, ship } from '$lib/server/db/schema.js';
 import { error, fail, redirect } from '@sveltejs/kit';
-import { eq, and, or, sql } from 'drizzle-orm';
+import { eq, and, or, sql, desc } from 'drizzle-orm';
 import type { Actions } from './$types';
 import { sendSlackDM } from '$lib/server/slack.js';
 import { isValidUrl } from '$lib/utils';
@@ -10,7 +10,6 @@ import { extname } from 'path';
 import { env } from '$env/dynamic/private';
 import { PutObjectCommand } from '@aws-sdk/client-s3';
 import { S3 } from '$lib/server/s3';
-import { ship } from '$lib/server/db/schema.js';
 import { sanitizeUrl } from '@braintree/sanitize-url';
 import { END_DATE } from '$lib/defs';
 
@@ -75,7 +74,8 @@ export async function load({ params, locals }) {
 
 	return {
 		project: queriedProject,
-		clubMembership: membership.length > 0 ? membership[0] : null
+		clubMembership: membership.length > 0 ? membership[0] : null,
+		lastIsClubsShip: await lastIsClubsShip(id)
 	};
 }
 
@@ -282,7 +282,7 @@ export const actions = {
 			}
 		}
 
-		if (END_DATE <= new Date() && queriedProject.status === 'building' && clubIdForShip === null) {
+		if (END_DATE <= new Date() && clubIdForShip === null && (queriedProject.status === 'building' || await lastIsClubsShip(id))) {
 			return error(400, { message: "can't submit individual project past end date" });
 		}
 
@@ -349,3 +349,18 @@ export const actions = {
 		return redirect(303, '/dashboard/projects');
 	}
 } satisfies Actions;
+
+async function lastIsClubsShip(id: number) {
+	const [latestShip] = await db
+		.select({
+			clubId: ship.clubId
+		})
+		.from(ship)
+		.where(eq(ship.projectId, id))
+		.orderBy(desc(ship.timestamp))
+		.limit(1);
+
+	if (latestShip && latestShip.clubId) return true;
+
+	return false;
+}

src/routes/dashboard/projects/[id]/ship/+page.svelte

@@ -18,7 +18,7 @@
 	let editorUploadFile = $state(null);
 	let modelFile = $state(null);
 	let submitAsClub = $state(
-				END_DATE <= new Date() && data.project.status === 'building' && data.clubMembership
+				END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip) && data.clubMembership
 			? true
 			: false
 	);
@@ -190,17 +190,17 @@
 			<div class="themed-box flex flex-col gap-2 p-3">
 				<label
 					class="flex items-center gap-2"
-					class:opacity-50={END_DATE <= new Date() && data.project.status === 'building'}
-					class:cursor-pointer={!(END_DATE <= new Date() && data.project.status === 'building')}
-					class:cursor-not-allowed={END_DATE <= new Date() && data.project.status === 'building'}
+					class:opacity-50={END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip)}
+					class:cursor-pointer={!(END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip))}
+					class:cursor-not-allowed={END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip)}
 				>
 					<input
 						type="radio"
 						name="submission_type"
 						value="individual"
 						checked={!submitAsClub}
 						onchange={() => (submitAsClub = false)}
-						disabled={END_DATE <= new Date() && data.project.status === 'building'}
+						disabled={END_DATE <= new Date() && (data.project.status === 'building' || data.lastIsClubsShip)}
 						class="radio"
 					/>
 					<span>Individual submission</span>