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 a4002922..fd4a94cc 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts
@@ -82,22 +82,7 @@ null
 	async getAllRooms(@Req() req, @Res() res): Promise<void>
 	{
 		console.log("- in getAllRooms controller");
-		const all_rooms = await this.chatService.getAllNotMyRooms(req.user.username);
-		const all_users = await this.chatService.getAllUsersNotMyRooms(req.user.username);
-
-		let row_rooms = all_rooms.map(room => {
-			return {
-				room_name: room.name,
-				room_type: "direct",
-			}
-		});
-		let users = all_users.map(user => {
-			return {
-				room_name: user.username,
-				room_type: "direct",
-			}
-		});
-		let rooms: roomDto[] = row_rooms.concat(users);
+		const rooms = await this.chatService.getAllOtherRoomsAndUsers(req.user.username)
 
 		res.status(HttpStatus.OK).json({ rooms: rooms });
 		console.log("- out getAllRooms 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 24708804..1e6153f5 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
@@ -78,6 +78,36 @@ export class ChatService {
 		return rooms;
 	}
 
+	//async getAllOtherRoomsAndUsers(username: string): Promise<roomDto[]>
+	async getAllOtherRoomsAndUsers(username: string): Promise<roomDto>
+	{
+		console.log("-- in getAllOtherRoomsAndUsers service");
+		const all_rooms = await this.getAllNotMyRooms(username);
+		const all_users = await this.getAllUsersNotMyRooms(username);
+
+	//	let row_rooms = all_rooms.map(room => {
+	//		return {
+	//			room_name: room.name,
+	//			room_type: "",
+	//		};
+	//	});
+	//	let users = all_users.map(user => {
+	//		return {
+	//			room_name: user.username,
+	//			room_type: "",
+	//		};
+	//	});
+	//	let rooms = row_rooms.concat(users);
+
+		let rooms: roomDto = {
+			room_name: "room.name",
+			room_type: "",
+		};
+
+		console.log("-- in getAllOtherRoomsAndUsers service");
+		return rooms;
+	}
+
 	async getMessagesFromCurrentRoom(username: string): Promise<messagesDto[]>
 	{
 		console.log("-- in getMessagesFromCurrentRoom service");
diff --git a/srcs/requirements/nestjs/api_back/src/chat/dto/room.dto.ts b/srcs/requirements/nestjs/api_back/src/chat/dto/room.dto.ts
index a25d3dd5..7430777b 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/dto/room.dto.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/dto/room.dto.ts
@@ -9,9 +9,9 @@ export class roomDto
 	room_name: string;
 
 	@Expose()
-	@IsString()
+	//@IsString()
 	@IsNotEmpty()
-	@IsIn(["public", "protected", "private", "direct", "user"])
+	//@IsIn(["public", "protected", "private", "direct", "user"])
 	room_type: string;
 }