wip directs

README.md

@@ -1,4 +1,3 @@
-CONFLICT srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts
 
 
 ### Pour lancer le docker :

srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts

@@ -42,8 +42,8 @@ export class ChatController {
 	{
 		console.log("- in getAllRooms controller");
 		const rooms = await this.chatService.getAllNotMyRooms(req.user.username);
-		const directs = await this.chatService.getAllUsersNotMyRooms(req.user.username);
-		return res.status(HttpStatus.OK).json({ rooms: rooms, directs: directs });
+		const users = await this.chatService.getAllUsersNotMyRooms(req.user.username);
+		return res.status(HttpStatus.OK).json({ rooms: rooms, users: users });
 	}
 
 	@UseGuards(AuthenticateGuard)

srcs/requirements/nestjs/api_back/src/chat/chat.service.ts

@@ -222,8 +222,7 @@ export class ChatService {
 
 		const directs = await this.getMyDirects(username);
 		let usernames = directs.map(room => room.users[0]);
-		if (usernames.length === 0)
-			usernames = [""];
+		usernames.push(username);
 		console.log("usernames:", usernames);
 
 		const users = await this.userRepository

srcs/requirements/svelte/api_front/public/build/bundle.js

@@ -3935,7 +3935,17 @@ var app = (function () {
         console.log("data.rooms:", data.rooms);
         for (let room of data.rooms)
             console.log(room.name);
-        let rooms = data.rooms;
+        let row_rooms = data.rooms.map(room => {
+            return {
+                name: room.name,
+            };
+        });
+        let users = data.users.map(user => {
+            return {
+                name: user.username,
+            };
+        });
+        let rooms = row_rooms.concat(users);
         return rooms;
     }
     async function get_room_users() {

srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts

@@ -108,7 +108,17 @@ export async function get_all_rooms()
 	console.log("data.rooms:", data.rooms);
 	for (let room of data.rooms)
 		console.log(room.name);
-	let rooms = data.rooms;
+	let row_rooms = data.rooms.map(room => {
+		return {
+			name: room.name,
+		}
+	});
+	let users = data.users.map(user => {
+		return {
+			name: user.username,
+		}
+	});
+	let rooms = row_rooms.concat(users);
 
 	return rooms;
 }