From 27bbb6346fb2125e12f4d7c08e115bb7804b6125 Mon Sep 17 00:00:00 2001
From: simplonco <simplonco@simplonco.co>
Date: Fri, 13 Jan 2023 00:08:00 +0100
Subject: [PATCH] invitation is working

---
 README.md                                                 | 3 +--
 .../nestjs/api_back/src/chat/chat.controller.ts           | 4 ++--
 .../requirements/nestjs/api_back/src/chat/chat.service.ts | 8 ++++----
 .../svelte/api_front/src/pieces/chat/Request_rooms.ts     | 2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 36738e75..5b91f68c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 
-
 ### Pour lancer le docker :
 
 - Il faut un fichier .env qu'on ne doit pas push, donc je ne le push pas.
@@ -79,7 +78,7 @@
 - [/] see all my rooms
 - [/] leave room
 - [/] leave direct impossible
-- [ ] invite someone in room
+- [/] invite someone in room
 - [ ] make admin
 - [ ] ban
 - [ ] mute
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 2ab6cd17..447cf073 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
@@ -155,9 +155,9 @@ export class ChatController {
 		console.log("- in inviteUser controller");
 
 		let current_room_name = await this.chatService.getCurrentRoomName(req.user.username);
-		await this.chatService.addUserToRoom(username, current_room_name);
+		let room = await this.chatService.addUserToRoom(username, current_room_name);
 
-		res.status(HttpStatus.OK);
+		res.status(HttpStatus.OK).json({ room: room });
 
 		console.log("- out inviteUser controller");
 	}
diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
index 7bbaa751..776c6a5d 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
@@ -193,7 +193,7 @@ export class ChatService {
 
 		const user_db = await this.getUserByName(username);
 		user_db.currentRoom = room_name;
-		this.userRepository.save(user_db);
+		await this.userRepository.save(user_db);
 
 		console.log("-- out setCurrentRoom service");
 		return `room "${room_name}" is now current room`;
@@ -237,7 +237,7 @@ export class ChatService {
 		// update room with new user
 		room.users.push(username);
 		room.messages.push({ name: "SERVER", message: `${username} joined the room`});
-		this.chatroomRepository.save(room);
+		await this.chatroomRepository.save(room);
 
 		console.log("-- out addUserToRoom service");
 		return this.format_room(room);
@@ -253,7 +253,7 @@ export class ChatService {
 			message: message,
 		};
 		my_room.messages.push(chat_message);
-		this.chatroomRepository.save(my_room);
+		await this.chatroomRepository.save(my_room);
 
 		console.log("-- out addMessageToRoom service");
 	}
@@ -275,7 +275,7 @@ export class ChatService {
 		// delete user from room
 		room.users.push(username);
 		room.users = room.users.filter(name => name !== username);
-		this.chatroomRepository.save(room);
+		await this.chatroomRepository.save(room);
 
 		// set current room to nothing
 		await this.setCurrentRoom(username, "");
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 f32ce648..bd777b16 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
@@ -103,6 +103,8 @@ export async function invite_user(user_name: string)
 		body: JSON.stringify({username: user_name}),
 	});
 	let data = await response.json();
+
+	await get_room_messages();
 }
 
 export async function get_my_rooms()