From a605a4a09e451b4b522f808079465c844284b6e2 Mon Sep 17 00:00:00 2001
From: simplonco <simplonco@simplonco.co>
Date: Thu, 12 Jan 2023 13:18:49 +0100
Subject: [PATCH] wip pbm join room return wrong room

---
 Makefile                                      |  4 ++++
 .../api_back/src/chat/chat.controller.ts      |  2 +-
 .../src/pieces/chat/Request_rooms.ts          | 19 ++++++++++---------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 27e3080f..dba718e5 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,10 @@ destroy:
 db:
 	- docker rm -f postgresql
 	- docker rm -f nestjs
+	#- docker rm -f redis
+	#- docker rm -f game_server
+	#- docker rm -f nginx
+	#- docker rm -f svelte
 	- docker volume rm -f srcs_data_nest_postgresql
 	docker compose -f ${DOCKERCOMPOSEPATH} up -d --build
 	@make start
diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
index 00d4bb73..509003f8 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
@@ -139,7 +139,7 @@ export class ChatController {
 	{
 		console.log("- in changeRoom controller");
 
-		const response = await this.chatService.setCurrentRoom(req.user.username, room.name);
+		await this.chatService.setCurrentRoom(req.user.username, room.name);
 		let socket: socketDto = this.chatGateway.sockets.get(req.user.username);
 		await this.chatService.socketChangeRoom(socket, room.name);
 		res.status(HttpStatus.OK).json({ room: room });
diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts b/srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts
index aff3b5ed..b035d8e4 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts
+++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts
@@ -121,19 +121,11 @@ export async function get_room_users()
 
 	const response = await fetch('/api/v2/chat/roomusers');
 	const data = await response.json();
+	console.log("users:", data.users);
 
 	return data.users;
 }
 
-export async function leave_room()
-{
-	console.log("in leave_room");
-
-	const response = await fetch('/api/v2/chat/leave', {
-		method: 'DELETE',
-	});
-}
-
 export async function get_all_users()
 {
 	console.log("in get_all_users");
@@ -145,4 +137,13 @@ export async function get_all_users()
 	return data.users;
 }
 
+export async function leave_room()
+{
+	console.log("in leave_room");
+
+	const response = await fetch('/api/v2/chat/leave', {
+		method: 'DELETE',
+	});
+}
+