feat: Add confirmation for final result

Author: oSumAtrIX

migrations/0006_confirm-session-result.sql

@@ -0,0 +1 @@
+ALTER TABLE participants ADD COLUMN confirmed BOOLEAN DEFAULT FALSE;

src/lib/database.ts

@@ -62,7 +62,7 @@ export class DatabaseService {
 	async getParticipants(sessionId: number): Promise<Participant[]> {
 		const { results } = await this.db
 			.prepare(
-				'SELECT id, name, description, role_weight as roleWeight, ppp_weight as pppWeight FROM participants WHERE session_id = ?'
+				'SELECT id, name, description, role_weight as roleWeight, ppp_weight as pppWeight, confirmed FROM participants WHERE session_id = ?'
 			)
 			.bind(sessionId)
 			.all<Participant>();
@@ -101,14 +101,17 @@ export class DatabaseService {
 		return count > 0;
 	}
 
-	async setParticipantDescription(
-		participantId: number,
-		description: string
-	): Promise<boolean> {
+	async updateParticipant(participant: Participant): Promise<boolean> {
 		try {
 			const { success } = await this.db
-				.prepare('UPDATE participants SET description = ? WHERE id = ?')
-				.bind(description, participantId)
+				.prepare(
+					`
+					UPDATE participants 
+					SET description = ?, confirmed = ?
+					WHERE id = ?
+					`
+				)
+				.bind(participant.description, participant.confirmed, participant.id)
 				.run();
 			return success;
 		} catch (error) {

src/lib/types.ts

@@ -12,6 +12,7 @@ export interface Participant {
 	description: string;
 	roleWeight: number;
 	pppWeight: number;
+	confirmed: boolean;
 }
 
 export interface CreateSessionRequest {
@@ -33,18 +34,3 @@ export interface SubmitVoteRequest {
 		reason: string;
 	}>;
 }
-
-export interface PatchDescriptionRequest {
-	participantId: number;
-	description: string;
-}
-
-export interface SessionResponse {
-	topic: string;
-	description: string;
-	stake: number;
-	participants: Array<{
-		name: string;
-		share: number;
-	}>;
-}

src/routes/+page.svelte

@@ -21,6 +21,7 @@
 		topic: string;
 		description: string;
 		stake: number;
+		confirmed: boolean;
 		participants: {
 			id: number;
 			name: string;
@@ -39,6 +40,7 @@
 	let currentParticipant: {
 		id: number;
 		description?: string;
+		confirmed: boolean;
 	} | null = null;
 
 	let stakeDistributed = false;
@@ -69,7 +71,11 @@
 	function selectParticipant(participant) {
 		currentParticipant = participant;
 
-		if (!adminToken && allDescriptionsSubmitted) {
+		if (
+			participant.reasons?.length == 0 &&
+			!adminToken &&
+			allDescriptionsSubmitted
+		) {
 			currentSession.participants = currentSession.participants.filter(
 				(p) => p.id !== currentParticipant.id
 			);
@@ -82,12 +88,7 @@
 		}
 	}
 
-	function submitCurrentParticipantDescription() {
-		if (!(adminToken || currentParticipant.description)) {
-			showMessage('Description cannot be empty', 'error');
-			return;
-		}
-
+	function updateCurrentParticipant() {
 		const headers = {
 			'Content-Type': 'application/json'
 		};
@@ -99,15 +100,15 @@
 			method: 'PATCH',
 			headers,
 			body: JSON.stringify({
-				participantId: currentParticipant.id,
+				...currentParticipant,
 				description: currentParticipant.description
 					? currentParticipant.description
 					: null
 			})
 		})
 			.then(async (response) => {
 				if (response.ok) {
-					showMessage('Description submitted successfully!', 'success');
+					showMessage('Updated participant successfully!', 'success');
 					currentParticipant = null;
 					await viewSession();
 				} else {
@@ -389,7 +390,10 @@
 					<strong>Stake:</strong>
 					{currentSession.stake - totalAllocatedShares}
 				</p>
-
+				<p>
+					<strong>Status:</strong>
+					{currentSession.confirmed ? 'Ended' : 'Ongoing'}
+				</p>
 				<h3>Participants</h3>
 				{#each currentSession.participants as participant}
 					<div class="section">
@@ -405,7 +409,7 @@
 							</p>
 						{/if}
 
-						{#if adminToken || participant.share}
+						{#if adminToken || participant.reasons}
 							<p><strong>Share:</strong> {participant.share || 0}</p>
 							{#if participant.reasons.length > 0}
 								<strong>Reasons:</strong>
@@ -415,7 +419,14 @@
 									{/each}
 								</ul>
 							{/if}
-						{:else if allDescriptionsSubmitted}
+							{#if currentParticipant}
+								<button
+									on:click={() =>
+										(currentParticipant.confirmed = true) &&
+										updateCurrentParticipant()}>Confirm share</button
+								>
+							{/if}
+						{:else if allDescriptionsSubmitted && currentParticipant}
 							<input
 								bind:value={participant.share}
 								on:input={() => {
@@ -431,7 +442,7 @@
 							<textarea bind:value={participant.reason} placeholder="Reason"
 							></textarea>
 						{/if}
-						{#if (!currentParticipant && adminToken) || !(currentParticipant || participant.description)}
+						{#if !currentSession.confirmed && !currentParticipant && ((participant.share && !currentSession.confirmed) || !participant.description || adminToken || allDescriptionsSubmitted)}
 							<button on:click={() => selectParticipant(participant)}>
 								This is me
 							</button>
@@ -442,8 +453,7 @@
 								placeholder="Description"
 								class="input"
 							></textarea>
-							<button on:click={() => submitCurrentParticipantDescription()}
-								>Submit</button
+							<button on:click={() => updateCurrentParticipant()}>Submit</button
 							>
 						{/if}
 					</div>

src/routes/api/[sessionKey]/+server.ts

@@ -2,7 +2,7 @@ import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { DatabaseService } from '$lib/database';
 import { badRequestError, notFoundError, unauthorizedError } from '$lib/utils';
-import type { PatchDescriptionRequest, SubmitVoteRequest } from '$lib/types';
+import type { Participant, SubmitVoteRequest } from '$lib/types';
 
 export const GET: RequestHandler = async ({ params, request, platform }) => {
 	try {
@@ -99,10 +99,13 @@ export const GET: RequestHandler = async ({ params, request, platform }) => {
 			reasons: p.reasons
 		}));
 
+		const allConfirmed = participants.every((p) => p.confirmed);
+
 		return json({
 			topic: session.topic,
 			description: session.description,
 			stake: session.stake,
+			confirmed: allConfirmed,
 			participants: weightedParticipants
 		});
 	} catch (err) {
@@ -210,42 +213,56 @@ export const PATCH: RequestHandler = async ({ params, request, platform }) => {
 			badRequestError('Session key is required');
 		}
 
-		const body: PatchDescriptionRequest = await request.json();
-		if (!body.participantId || !(token || body.description)) {
-			badRequestError('Participant ID and description are required');
+		const updateParticipant = (await request.json()) as Partial<Participant> & {
+			id: number;
+		};
+		if (!updateParticipant.id) {
+			badRequestError('Participant ID required');
 		}
+
 		const db = new DatabaseService(platform.env.DB);
 		const session = await db.getSession(sessionKey);
 		if (!session) {
 			notFoundError();
 		}
 
 		const participants = await db.getParticipants(session.id);
-		const participant = participants.find((p) => p.id === body.participantId);
-		if (!participant) {
+		const existing = participants.find((p) => p.id === updateParticipant.id);
+		if (!existing) {
 			badRequestError('Participant does not exist in this session');
 		}
 
-		if (!token && participant.description) {
-			badRequestError('Description has already been set and cannot be changed');
+		const updatedParticipant: Participant = { ...existing };
+
+		if (updateParticipant.description !== undefined) {
+			if (!token && existing.description != existing.description) {
+				unauthorizedError();
+			}
+
+			updatedParticipant.description = updateParticipant.description;
 		}
 
-		const success = await db.setParticipantDescription(
-			body.participantId,
-			body.description
-		);
+		if (updateParticipant.confirmed !== undefined) {
+			if (!token && updateParticipant.confirmed == false) {
+				unauthorizedError();
+			}
+
+			updatedParticipant.confirmed = updateParticipant.confirmed;
+		}
+
+		const success = await db.updateParticipant(updatedParticipant);
 		if (!success) {
-			badRequestError('Failed to update participant description');
+			badRequestError('Failed to update participant');
 		}
+
 		return json({ success: true });
 	} catch (err) {
 		console.error('Error updating participant description:', err);
 		if (err instanceof Response) {
 			throw err;
 		}
-
 		badRequestError(
-			'Failed to update participant description: ' + err.body.message
+			'Failed to update participant description: ' + (err as any).body?.message
 		);
 	}
 };