2 files changed, 75 insertions, 15 deletions

diff --git a/controllers/games/gameId.js b/controllers/games/gameId.js
index c87a857..d3363fd 100644
--- a/controllers/games/gameId.js
+++ b/controllers/games/gameId.js
@@ -1,17 +1,24 @@
 import { getGame } from "../../database/games.js";
 
-function makePageData(user, cwdata) {
+function makePageData(user, game) {
 	return {
 		title: "Jouer",
 		user: user,
-		CWDATA: cwdata,
+		data: game,
 	};
 }
 
 export function gameId_get(req, res) {
-	const game = getGame(req.params.gameId);
-	// TODO redirect if null
-	let cwdata = game; // TODO reformat this object
-	console.log(cwdata);
-	return res.render("game", makePageData(req.session.user, cwdata));
+	const game = JSON.parse(getGame(req.params.gameId).data);
+	if (game) {
+		if (game.player1.id === req.session.user.id) {
+			game.letters = game.player1.letters;
+			delete game.player2.letters;
+		} else {
+			game.letters = game.player2.letters;
+			delete game.player1.letters;
+		}
+		return res.render("game", makePageData(req.session.user, game));
+	}
+	return res.redirect("/games");
 }
diff --git a/controllers/games/root.js b/controllers/games/root.js
index ece7b74..7406815 100644
--- a/controllers/games/root.js
+++ b/controllers/games/root.js
@@ -1,13 +1,66 @@
-import { listGames } from "../../database/games.js";
+import { validationResult } from "express-validator";
+
+import { getUserByUsername } from "../../database/users.js";
+import { listGames, newGame } from "../../database/games.js";
+import { emptyBoard, makeLettersBag, pickLetters, } from "../../utils/board.js";
+
+function makePageData(user) {
+	return {
+		title: "Parties",
+		user: user,
+		games: listGames(user.id),
+		formdata: {
+			name: "",
+			username: "",
+		},
+		errors: {},
+	};
+}
 
 export function root_get(req, res) {
-	const data = {
-		title: "Liste des parties",
-		user: req.session.user,
-		games: listGames(req.session.user.id),
+	let page = makePageData(req.session.user);
+	for (let i=0; i<page.games.length; i++) {
+		page.games[i].data = JSON.parse(page.games[i].data);
+	}
+	return res.render("games", page);
+}
+
+function makeNewGameData(name, player1, player2) {
+	let bag = makeLettersBag();
+	return {
+		board: emptyBoard,
+		name: name,
+		player1: {
+			id: player1.id,
+			username: player1.username,
+			score: 0,
+			letters: pickLetters(bag, 7),
+		},
+		player2: {
+			id: player2.id,
+			username: player2.username,
+			score: 0,
+			letters: pickLetters(bag, 7),
+		},
 	};
-	for (let i=0; i<data.games.length; i++) {
-		data.games[i].data = JSON.parse(data.games[i].data);
+}
+
+export function root_post(req, res) {
+	let page = makePageData(req.session.user);
+	page.formdata = req.body;
+	page.errors = validationResult(req).mapped();
+	if (Object.keys(page.errors).length === 0) {
+		const player2 = getUserByUsername(page.formdata.username);
+		if (player2) {
+			const gameId = newGame(req.session.user.id, player2.id, makeNewGameData(page.formdata.name, req.session.user, player2));
+			if (gameId) {
+				return res.redirect(302, `/games/${gameId}`);
+			} else {
+				page.errors.mismatch = "Erreur du serveur: la création de partie a échoué";
+			}
+		} else {
+			page.errors.username = { msg: "L'identifiant n'existe pas." };
+		}
 	}
-	return res.render("games", data);
+	return res.render("games", page);
 }