From 41dbee1cc0a09e152e9eaaf518d2c113603c4087 Mon Sep 17 00:00:00 2001
From: hugogogo <hulamy@e3r2p8.clusters.42paris.fr>
Date: Fri, 6 Jan 2023 19:47:47 +0100
Subject: [PATCH] creation of table room is ok

---
 .../nestjs/api_back/src/chat/chat.service.ts        |  7 ++++++-
 .../api_back/src/chat/entities/chatroom.entity.ts   | 13 +++++++++----
 .../api_back/src/friendship/friendship.service.ts   |  7 ++++++-
 .../api_back/src/users/entities/user.entity.ts      | 10 +++++++---
 4 files changed, 28 insertions(+), 9 deletions(-)

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 ae0c1f08..82c18ae8 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
@@ -29,7 +29,11 @@ export class ChatService {
 
 	async addUserToRoom(user: User, joinRoomDto: joinRoomDto)
 	{
-		const room = await this.chatroomRepository.findOneBy({ name : joinRoomDto.room_name })
+		//const room = await this.chatroomRepository.findOneBy({ name : joinRoomDto.room_name });
+		const room = await this.chatroomRepository
+			.createQueryBuilder('chatroom')
+			.where('chatroom.name = :name', { name: joinRoomDto.room_name })
+			.getOne();
 		console.log(room);
 		if (room)
 			throw new HttpException(`This room already exist`, HttpStatus.CONFLICT);
@@ -38,6 +42,7 @@ export class ChatService {
 		newChatroom.name = joinRoomDto.room_name;
 		newChatroom.type = joinRoomDto.room_type;
 		newChatroom.owner = user;
+		newChatroom.users = [user];
 		const savedChatroom = await this.chatroomRepository.save(newChatroom);
 		console.log(savedChatroom);
 
diff --git a/srcs/requirements/nestjs/api_back/src/chat/entities/chatroom.entity.ts b/srcs/requirements/nestjs/api_back/src/chat/entities/chatroom.entity.ts
index bcdf0a74..d8185eb6 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/entities/chatroom.entity.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/entities/chatroom.entity.ts
@@ -2,6 +2,8 @@ import {
 	Entity,
 	Column,
 	ManyToOne,
+	ManyToMany,
+	JoinTable,
 	PrimaryGeneratedColumn
 } from "typeorm";
 import { User } from 'src/users/entities/user.entity';
@@ -14,11 +16,14 @@ export class Chatroom {
 	@Column()
 	name: string;
 
-	@Column()
-	type: 'public' | 'private' | 'direct';
+  @Column()
+  type: string;
 
-	@ManyToOne(type => User, user => user.ownedRoom)
-	owner: User;
+  @ManyToOne(type => User, user => user.ownedRooms)
+  owner: User;
 
+	@ManyToMany(type => User)
+	@JoinTable()
+	users: User[];
 }
 
diff --git a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts
index cee750cd..40fc4230 100644
--- a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts
+++ b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts
@@ -92,7 +92,12 @@ export class FriendshipService {
 			throw new HttpException(`The addressee does not exist.`, HttpStatus.NOT_FOUND);
 		if (createFriendshipDto.status !== FriendshipStatus.REQUESTED && createFriendshipDto.status !== FriendshipStatus.BLOCKED)
 			throw new HttpException(`The status is not valid.`, HttpStatus.NOT_FOUND);
-		const friendship = await this.friendshipRepository.findOneBy({ sender: creator, receiver: receiver });
+		//const friendship = await this.friendshipRepository.findOneBy({ sender: creator, receiver: receiver });
+		const friendship = await this.friendshipRepository
+			.createQueryBuilder('friendship')
+			.where('friendship.sender = :sender', { sender: creator })
+			.andWhere('friendship.receiver = :receiver', { receiver: receiver })
+			.getOne();
 		if (friendship) {
 			if (friendship.status && friendship.status === FriendshipStatus.ACCEPTED)
 				throw new HttpException(`The friendship request has already been accepted.`, HttpStatus.OK);
diff --git a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts
index 160af9b2..639c50f8 100644
--- a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts
+++ b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts
@@ -50,10 +50,14 @@ export class User {
 	@OneToMany(type => Friendship , (friendship) => friendship.receiver)
 	receivedFriendRequest: Friendship[];
 
-	@OneToMany(type => Chatroom, chatroom => chatroom.owner)
-	ownedRoom: Chatroom[];
-
 	@JoinColumn()
 	@OneToOne(() => UserStats, { cascade: true })
 	stats: UserStats;
+
+	@OneToMany(type => Chatroom, chatroom => chatroom.owner)
+	ownedRooms: Chatroom[];
+
+	@ManyToMany(type => Chatroom)
+	@JoinTable()
+	userRooms: Chatroom[];
 }