From f2fab13260cbef2e29741a70bea22da6efc5064a Mon Sep 17 00:00:00 2001
From: David Vicente <davidvicento@gmail.com>
Date: Fri, 29 Mar 2024 21:17:10 +0100
Subject: [PATCH] Question tags in creation menu and model

---
 .../QuestionCreator/ChoiceQuestionCreator.tsx | 22 ++++-------
 .../CompleteQuestionCreator.tsx               | 18 +++------
 .../QuestionCreator/SimpleQuestionCreator.tsx | 15 +++-----
 src/pages/game/GameController.tsx             |  3 +-
 src/pages/game/LobbyPlayers.tsx               |  2 -
 src/services/games-store.ts                   | 21 +++++++++-
 src/services/questions-store.ts               | 38 ++++++++++---------
 src/utils/types.ts                            |  4 +-
 src/utils/utils.ts                            |  5 ++-
 9 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/src/pages/QuestionCreator/ChoiceQuestionCreator.tsx b/src/pages/QuestionCreator/ChoiceQuestionCreator.tsx
index abfc6e1..0dae66b 100644
--- a/src/pages/QuestionCreator/ChoiceQuestionCreator.tsx
+++ b/src/pages/QuestionCreator/ChoiceQuestionCreator.tsx
@@ -6,12 +6,14 @@ export const ChoiceQuestionCreator = () => {
 	const [title, setTitle] = useState("")
 	const [choices, setChoices] = useState("")
 	const [answers, setAnswers] = useState("")
+	const [tags, setTags] = useState("")
 
 	const createQuestionHandler = () => {
 		const question = {
 			title,
-			choices: splitAndTrim(choices, ","),
-			answers: splitAndTrim(answers, ","),
+			choices: splitAndTrim(choices),
+			answers: splitAndTrim(answers),
+			tags: splitAndTrim(tags),
 			...initializeEmptyQuestionFields(),
 		}
 
@@ -20,18 +22,10 @@ export const ChoiceQuestionCreator = () => {
 
 	return (
 		<div>
-			<input
-				placeholder="Question"
-				onChange={(e) => setTitle(e.target.value)}
-			/>
-			<input
-				placeholder="Description"
-				onChange={(e) => setChoices(e.target.value)}
-			/>
-			<input
-				placeholder="Réponses"
-				onChange={(e) => setAnswers(e.target.value)}
-			/>
+			<input placeholder="Question" onChange={(e) => setTitle(e.target.value)} />
+			<input placeholder="Choix" onChange={(e) => setChoices(e.target.value)} />
+			<input placeholder="Réponses" onChange={(e) => setAnswers(e.target.value)} />
+			<input placeholder="Tags" onChange={(e) => setTags(e.target.value)} />
 			<button onClick={createQuestionHandler}>Créer</button>
 		</div>
 	)
diff --git a/src/pages/QuestionCreator/CompleteQuestionCreator.tsx b/src/pages/QuestionCreator/CompleteQuestionCreator.tsx
index 69525b8..cdded32 100644
--- a/src/pages/QuestionCreator/CompleteQuestionCreator.tsx
+++ b/src/pages/QuestionCreator/CompleteQuestionCreator.tsx
@@ -6,12 +6,14 @@ export const CompleteQuestionCreator = () => {
 	const [title, setTitle] = useState("")
 	const [description, setDescription] = useState("")
 	const [answers, setAnswers] = useState("")
+	const [tags, setTags] = useState("")
 
 	const createQuestionHandler = () => {
 		const question = {
 			title,
 			description,
 			answers: splitAndTrim(answers, ","),
+			tags: splitAndTrim(tags),
 			...initializeEmptyQuestionFields(),
 		}
 
@@ -20,18 +22,10 @@ export const CompleteQuestionCreator = () => {
 
 	return (
 		<div>
-			<input
-				placeholder="Question"
-				onChange={(e) => setTitle(e.target.value)}
-			/>
-			<input
-				placeholder="Description"
-				onChange={(e) => setDescription(e.target.value)}
-			/>
-			<input
-				placeholder="Réponses"
-				onChange={(e) => setAnswers(e.target.value)}
-			/>
+			<input placeholder="Question" onChange={(e) => setTitle(e.target.value)} />
+			<input placeholder="Description" onChange={(e) => setDescription(e.target.value)} />
+			<input placeholder="Réponses" onChange={(e) => setAnswers(e.target.value)} />
+			<input placeholder="Tags" onChange={(e) => setTags(e.target.value)} />
 			<button onClick={createQuestionHandler}>Créer</button>
 		</div>
 	)
diff --git a/src/pages/QuestionCreator/SimpleQuestionCreator.tsx b/src/pages/QuestionCreator/SimpleQuestionCreator.tsx
index 9c087c7..74fd156 100644
--- a/src/pages/QuestionCreator/SimpleQuestionCreator.tsx
+++ b/src/pages/QuestionCreator/SimpleQuestionCreator.tsx
@@ -5,11 +5,13 @@ import { initializeEmptyQuestionFields, splitAndTrim } from "../../utils/utils"
 export const SimpleQuestionCreator = () => {
 	const [title, setTitle] = useState("")
 	const [answers, setAnswers] = useState("")
+	const [tags, setTags] = useState("")
 
 	const createQuestionHandler = () => {
 		const question = {
 			title,
-			answers: splitAndTrim(answers, ","),
+			answers: splitAndTrim(answers),
+			tags: splitAndTrim(tags),
 			...initializeEmptyQuestionFields(),
 		}
 
@@ -18,14 +20,9 @@ export const SimpleQuestionCreator = () => {
 
 	return (
 		<div>
-			<input
-				placeholder="Question"
-				onChange={(e) => setTitle(e.target.value)}
-			/>
-			<input
-				placeholder="Réponses"
-				onChange={(e) => setAnswers(e.target.value)}
-			/>
+			<input placeholder="Question" onChange={(e) => setTitle(e.target.value)} />
+			<input placeholder="Réponses" onChange={(e) => setAnswers(e.target.value)} />
+			<input placeholder="Tags" onChange={(e) => setTags(e.target.value)} />
 			<button onClick={createQuestionHandler}>Créer</button>
 		</div>
 	)
diff --git a/src/pages/game/GameController.tsx b/src/pages/game/GameController.tsx
index b7709db..08ae002 100644
--- a/src/pages/game/GameController.tsx
+++ b/src/pages/game/GameController.tsx
@@ -65,6 +65,7 @@ export const GameController = () => {
 				setQuestionIndex(game.questionIndex)
 			}
 		})
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [])
 
 	if (gameId === undefined) {
@@ -82,7 +83,7 @@ export const GameController = () => {
 				<div>
 					<h1>Nouvelle partie</h1>
 					<LobbySettings gameId={gameId} />
-					<LobbyPlayers gameId={gameId} usernames={usernames} />
+					<LobbyPlayers usernames={usernames} />
 				</div>
 			)}
 		</div>
diff --git a/src/pages/game/LobbyPlayers.tsx b/src/pages/game/LobbyPlayers.tsx
index 5968fe9..7925770 100644
--- a/src/pages/game/LobbyPlayers.tsx
+++ b/src/pages/game/LobbyPlayers.tsx
@@ -1,5 +1,4 @@
 type LobbyPlayersProps = {
-	gameId: string
 	usernames: string[]
 }
 
@@ -7,7 +6,6 @@ export const LobbyPlayers = (props: LobbyPlayersProps) => {
 	return (
 		<div>
 			<h2>Joueurs</h2>
-			<div>Game id : {props.gameId}</div>
 			<ul>
 				{props.usernames.map((username) => (
 					<li>{username}</li>
diff --git a/src/services/games-store.ts b/src/services/games-store.ts
index ba11e9c..4c9b2ed 100644
--- a/src/services/games-store.ts
+++ b/src/services/games-store.ts
@@ -45,18 +45,29 @@ export async function createGame() {
 	return gameRef.id
 }
 
+/**
+ * Update data from an existing game
+ * @param id - Game id
+ * @param data - Object on filepath format ["a.b":c]
+ * @returns
+ */
 export async function updateGame(id: string, data: object): Promise<StoreResponse<Game>> {
+	// Verify game existance
 	if (!(await existsGameById(id))) {
 		return getErrorStoreResponse(`Game ${id} does not exist`)
 	}
-
-	// Update data
+	// Update game data
 	console.log(`Update Game : ${id} ${data}`)
 	const gameRef = doc(db, `games/${id}`)
 	await updateDoc(gameRef, data)
 	return getSuccessStoreResponse([])
 }
 
+/**
+ * Verify game existance by fetching from db
+ * @param id
+ * @returns
+ */
 export async function existsGameById(id: string) {
 	const response = await findGameById(id)
 	return response.success
@@ -64,7 +75,13 @@ export async function existsGameById(id: string) {
 
 /* Domain methods */
 
+/**
+ * Starts game by finishing the setup
+ * @param id
+ * @returns
+ */
 export async function startGame(id: string) {
+	// TODO: Add setup logic
 	const response = await updateGame(id, { ["isSetup"]: true })
 	return response
 }
diff --git a/src/services/questions-store.ts b/src/services/questions-store.ts
index 09d0c15..58d62d4 100644
--- a/src/services/questions-store.ts
+++ b/src/services/questions-store.ts
@@ -1,40 +1,44 @@
-import { Query, addDoc, collection, documentId, query, where } from "firebase/firestore"
+import { Query, addDoc, collection, documentId, limit, query, where } from "firebase/firestore"
 import { db } from "../config/firebase"
-import { Question, QuestionSchema } from "../utils/types"
+import { Question, QuestionSchema, StoreResponse } from "../utils/types"
 import { isValideQuestion } from "./validation"
 import { findDataByQuery } from "./store"
+import { getErrorStoreResponse, getSuccessStoreResponse } from "../utils/utils"
 
 // References to the collections
 const questionsRef = collection(db, "questions")
 
 async function findQuestionByQuery(q: Query) {
-	const questions = await findDataByQuery(q, QuestionSchema)
-	return questions
+	const response: StoreResponse<Question> = await findDataByQuery(q, QuestionSchema)
+	return response
 }
 
 export async function findAllQuestions() {
 	const q = query(questionsRef)
-	const data = await findQuestionByQuery(q)
-	return data
+	const response = await findQuestionByQuery(q)
+	return response
 }
 
 export async function findQuestionById(questionId: string) {
 	const q = query(questionsRef, where(documentId(), "==", questionId))
-	const data = await findQuestionByQuery(q)
-	return data
+	const response = await findQuestionByQuery(q)
+	return response
 }
 
-export async function findQuestionByTags(tags: string[]) {
-	const q = query(questionsRef, where("tags", "array-contains-any", tags))
-	const data = await findQuestionByQuery(q)
-	return data
-}
-
-export const createQuestion = async (question: Question) => {
+export async function createQuestion(question: Question) {
 	if (!isValideQuestion(question)) {
-		return
+		return getErrorStoreResponse("Not valide question")
 	}
 
 	const data = await addDoc(questionsRef, question)
-	return data.id
+	return getSuccessStoreResponse([data.id])
+}
+
+/* Domain methods */
+
+export async function findQuestionByTags(tags: string[], nbQuestions: number = 10) {
+	const q = query(questionsRef, where("tags", "array-contains-any", tags), limit(nbQuestions))
+
+	const response = await findQuestionByQuery(q)
+	return response
 }
diff --git a/src/utils/types.ts b/src/utils/types.ts
index ff5185b..4bc7924 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -2,7 +2,7 @@ import { z } from "zod"
 
 // Questions Schemas
 const QuestionBaseSchema = z.object({
-	title: z.string().min(1).max(30),
+	title: z.string().min(1).max(100),
 	rating: z.object({
 		like: z.number(),
 		dislike: z.number(),
@@ -19,7 +19,7 @@ export const SimpleQuestionSchema = QuestionBaseSchema.extend({
 })
 
 export const CompleteQuestionSchema = QuestionBaseSchema.extend({
-	description: z.string().min(1),
+	description: z.string().min(1).max(250),
 	answers: z.array(z.string().trim()).min(1).max(10),
 })
 
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index e3bc528..92b2e97 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -16,7 +16,6 @@ export function initializeEmptyQuestionFields() {
 	return {
 		rating: { like: 0, dislike: 0 },
 		difficulty: { win: 0, lose: 0 },
-		tags: [],
 	}
 }
 
@@ -31,6 +30,8 @@ export function initializeEmptyGameData(): GameData {
 	}
 }
 
+export function initializeEmptyQuestionData() {}
+
 export function getSuccessStoreResponse<DataType>(data: DataType[]): StoreResponse<DataType> {
 	return {
 		success: true,
@@ -51,6 +52,6 @@ export function getErrorStoreResponse<DataType>(error: unknown): StoreResponse<D
  * @param separator
  * @returns
  */
-export function splitAndTrim(str: string, separator: string) {
+export function splitAndTrim(str: string, separator: string = ",") {
 	return str.split(separator).map((item) => item.trim())
 }