From d7900644c43eed468fa8bebf1bca15b48bcb212f Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Thu, 13 Jul 2023 19:59:23 +0000
Subject: [PATCH] feat(#1): Add estimate option for not choosing a number

---
 src/components/AverageEstimate.svelte              |  8 --------
 src/components/Estimates.svelte                    |  4 ++--
 src/routes/estimation/[roomId]/+page.svelte        | 10 +++-------
 src/server/classes/Room.ts                         |  2 +-
 src/server/classes/User.ts                         |  2 +-
 .../classes/messages/SelectEstimateMessage.ts      |  4 ++--
 src/server/websocket.ts                            | 14 +-------------
 7 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 src/components/AverageEstimate.svelte

diff --git a/src/components/AverageEstimate.svelte b/src/components/AverageEstimate.svelte
deleted file mode 100644
index aae6762..0000000
--- a/src/components/AverageEstimate.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script lang="ts">
-	export let average: string | number;
-</script>
-
-<div id="average-estimate">
-	<h2>Average Estimate</h2>
-	<p>{average}</p>
-</div>
diff --git a/src/components/Estimates.svelte b/src/components/Estimates.svelte
index 1e354cd..83d7c4a 100644
--- a/src/components/Estimates.svelte
+++ b/src/components/Estimates.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	export let values: number[] = [1, 2, 3, 5, 8, 13, 21];
-	export let onEstimateClick: (value: number) => void;
+	export let values: Array<number | string> = [1, 2, 3, 5, 8, 13, 21, '?'];
+	export let onEstimateClick: (value: number | string) => void;
 	export let disableEstimates: boolean = false;
 </script>
 
diff --git a/src/routes/estimation/[roomId]/+page.svelte b/src/routes/estimation/[roomId]/+page.svelte
index c829f6f..3dd964a 100644
--- a/src/routes/estimation/[roomId]/+page.svelte
+++ b/src/routes/estimation/[roomId]/+page.svelte
@@ -7,7 +7,6 @@
 	import { onMount } from 'svelte';
 	import UsersList from '../../../components/UsersList.svelte';
 	import EstimateGroupsList from '../../../components/EstimateGroupsList.svelte';
-	import AverageEstimate from '../../../components/AverageEstimate.svelte';
 	import Modal from '../../../components/Modal.svelte';
 	import Estimates from '../../../components/Estimates.svelte';
 
@@ -31,9 +30,9 @@
 		type: string;
 		roomId: string;
 		userId: string;
-		estimate: number;
+		estimate: number | string;
 
-		constructor(roomId: string, userId: string, estimate: number) {
+		constructor(roomId: string, userId: string, estimate: number | string) {
 			this.type = 'select-estimate';
 			this.roomId = roomId;
 			this.userId = userId;
@@ -57,7 +56,6 @@
 	let showModal = true;
 	const userId = generateId();
 	let users: Array<User> = [];
-	let average: number;
 	let estimateGroups: { [key: number]: string[] } = {};
 	let showRestartButton = false;
 	let showEstimates = false;
@@ -85,7 +83,7 @@
 		}
 	}
 
-	function handleEstimateClick(estimate: number) {
+	function handleEstimateClick(estimate: number | string) {
 		sendMessage(socket, new SelectEstimateMessage(data.roomId, userId, estimate));
 	}
 
@@ -122,7 +120,6 @@
 		} else if (message.type === 'user-left') {
 			users = users.filter((user) => user.userId !== message.userId);
 		} else if (message.type === 'estimation-closed') {
-			average = message.average;
 			estimateGroups = message.groupedEstimates;
 			showRestartButton = true;
 			showEstimates = true;
@@ -191,7 +188,6 @@
 
 {#if Object.keys(estimateGroups).length > 0}
 	<EstimateGroupsList {estimateGroups} />
-	<AverageEstimate {average} />
 {/if}
 
 <style>
diff --git a/src/server/classes/Room.ts b/src/server/classes/Room.ts
index cd69d88..b53fa7b 100644
--- a/src/server/classes/Room.ts
+++ b/src/server/classes/Room.ts
@@ -35,7 +35,7 @@ export class Room {
 	}
 
 	getAllEstimates() {
-		const estimates = new Map<string, number>();
+		const estimates = new Map<string, number | string>();
 		this.users.forEach((user) => {
 			if (user.estimate !== null) {
 				estimates.set(user.name, user.estimate);
diff --git a/src/server/classes/User.ts b/src/server/classes/User.ts
index 7fe91b9..c4152ac 100644
--- a/src/server/classes/User.ts
+++ b/src/server/classes/User.ts
@@ -1,7 +1,7 @@
 export class User {
 	userId: string;
 	name: string;
-	estimate: number | null;
+	estimate: number | string | null;
 
 	constructor(userId: string, name: string) {
 		this.userId = userId;
diff --git a/src/server/classes/messages/SelectEstimateMessage.ts b/src/server/classes/messages/SelectEstimateMessage.ts
index d05e7be..1992da1 100644
--- a/src/server/classes/messages/SelectEstimateMessage.ts
+++ b/src/server/classes/messages/SelectEstimateMessage.ts
@@ -2,9 +2,9 @@ export class SelectEstimateMessage {
 	type: string;
 	roomId: string;
 	userId: string;
-	estimate: number;
+	estimate: number | string;
 
-	constructor(roomId: string, userId: string, estimate: number) {
+	constructor(roomId: string, userId: string, estimate: number | string) {
 		this.type = 'select-estimate';
 		this.roomId = roomId;
 		this.userId = userId;
diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index e528e12..2c5f65b 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -17,18 +17,8 @@ function onSocketPostError(e: Error) {
 	console.log(e);
 }
 
-function calculateAverageEstimate(users: Array<User>) {
-	let total = 0;
-	users.forEach((user) => {
-		if (user.estimate !== null) {
-			total += user.estimate;
-		}
-	});
-	return total / users.length;
-}
-
 function groupEstimates(users: Array<User>) {
-	let estimateGroups: { [key: number]: string[] } = {};
+	let estimateGroups: { [key: number | string]: string[] } = {};
 	users.forEach((user) => {
 		if (user.estimate !== null) {
 			if (estimateGroups[user.estimate]) {
@@ -109,10 +99,8 @@ wss.on('connection', (ws: WebSocket, req) => {
 					const allEstimates = room.getAllEstimates();
 					if (allEstimates.size === room.getUsers().length) {
 						const users = room.getUsers();
-						const average = calculateAverageEstimate(users);
 						broadcastToRoom(room.id, {
 							type: 'estimation-closed',
-							average,
 							groupedEstimates: groupEstimates(users)
 						});
 					}