wip try to make chatrooms db remember users

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

@@ -14,24 +14,19 @@ export class ChatController {
 	@UseGuards(AuthenticateGuard)
 	@UseGuards(TwoFactorGuard)
 	@Get('rooms')
-	async getRooms()
+	async getRooms(@Req() req, @Res() res)
 	{
-		const rooms = await this.chatService.getRooms();
+		console.log("in getRooms");
-		return { rooms };
+		return await this.chatService.getRooms(req.user, res);
 	}
 
 	@UseGuards(AuthenticateGuard)
 	@UseGuards(TwoFactorGuard)
 	@Post('join')
-	async joinRoom(@Body() joinRoomDto: joinRoomDto, @Req() req)
+	async joinRoom(@Body() joinRoomDto: joinRoomDto, @Req() req, @Res() res)
 	{
 		const user: User = req.user;
-
+		return await this.chatService.addUserToRoom(user, joinRoomDto, res);
-		let room = await this.chatService.addUserToRoom(user, joinRoomDto);
-
-		//return { message: 'Successfully joined room.' };
-		//return res.status(HttpStatus.BAD_REQUEST).json({message : 'You can\'t grant a ticket to another user'});
-		return { room };
 	}
 
 	@UseGuards(AuthenticateGuard)

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

@@ -1,5 +1,6 @@
-import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
+import { HttpException, HttpStatus, Injectable, Res } from '@nestjs/common';
 import { User } from 'src/users/entities/user.entity';
+import { UsersService } from 'src/users/users.service';
 import { Chatroom } from './entities/chatroom.entity';
 import { Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
@@ -9,6 +10,7 @@ import { joinRoomDto } from './dto/joinRoom.dto';
 export class ChatService {
 
 	constructor(
+		private usersService: UsersService,
 		@InjectRepository(User)
 		private readonly userRepository: Repository<User>,
 		@InjectRepository(Chatroom)
@@ -19,17 +21,22 @@ export class ChatService {
 	//	return server.emit('message', message);
 	//}
 
-	async getRooms()
+	async getRooms(user: User, @Res() res)
 	{
+
+		/*
+		const room = await this.chatroomRepository
+			.createQueryBuilder('chatroom')
+			.where(':user_id IN chatroom.users', { user_id: user.fortyTwoId })
+			.getMany();
+		console.log(room);
+		*/
+
+		//return chatrooms;
 	}
 
-	async getUserRooms()
+	async addUserToRoom(user: User, joinRoomDto: joinRoomDto, @Res() res)
 	{
-	}
-
-	async addUserToRoom(user: User, joinRoomDto: joinRoomDto)
-	{
-		//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 })
@@ -38,15 +45,15 @@ export class ChatService {
 		if (room)
 			throw new HttpException(`This room already exist`, HttpStatus.CONFLICT);
 
+		// create chatroom
 		const newChatroom = new Chatroom();
 		newChatroom.name = joinRoomDto.room_name;
 		newChatroom.type = joinRoomDto.room_type;
-		newChatroom.owner = user;
+		newChatroom.owner = user.fortyTwoId;
-		newChatroom.users = [user];
+		newChatroom.users = [user.fortyTwoId];
-		const savedChatroom = await this.chatroomRepository.save(newChatroom);
+		this.chatroomRepository.save(newChatroom);
-		console.log(savedChatroom);
 
-		return "good room";
+		return res.status(HttpStatus.OK).json({ room_name: joinRoomDto.room_name, message: "successfull room creation" });
 	}
 
 	async removeUserFromRoom(user: User, room_name: string)

srcs/requirements/nestjs/api_back/src/chat/entities/chatroom.entity.ts

@@ -19,11 +19,17 @@ export class Chatroom {
   @Column()
   type: string;
 
-  @ManyToOne(type => User, user => user.ownedRooms)
+//  @ManyToOne(type => User, user => user.ownedRooms)
-  owner: User;
+//  owner: User;
+//
+//	@ManyToMany(type => User)
+//	@JoinTable()
+//	users: User[];
 
-	@ManyToMany(type => User)
+  @Column()
-	@JoinTable()
+  owner: string; // fortytwo id
-	users: User[];
+
+  @Column({ type: "simple-array" })
+	users: string[]; // fortytwo id
 }
 

srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts

@@ -54,10 +54,10 @@ export class User {
 	@OneToOne(() => UserStats, { cascade: true })
 	stats: UserStats;
 
-	@OneToMany(type => Chatroom, chatroom => chatroom.owner)
+//	@OneToMany(type => Chatroom, chatroom => chatroom.owner)
-	ownedRooms: Chatroom[];
+//	ownedRooms: Chatroom[];
-
+//
-	@ManyToMany(type => Chatroom)
+//	@ManyToMany(type => Chatroom)
-	@JoinTable()
+//	@JoinTable()
-	userRooms: Chatroom[];
+//	userRooms: Chatroom[];
 }

srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte

@@ -14,6 +14,7 @@
 //	{
 //
 //		await init_socket();
+//		init_socket();
 
 		// pbm: sometimes socket is still undefined here
 		socket.on('connect', function(){

srcs/requirements/svelte/api_front/src/pieces/chat/Layout_create.svelte

@@ -9,7 +9,7 @@
 	let room_type: string;
 	let room_password: string;
 	let response_data: string;
-	let response_status: number = 200;
+	let response_status: number = 0;
 	let response_message: string;
 
 	async function handleSubmit(evt)
@@ -26,20 +26,23 @@
 		};
 		console.log("formData:", formData);
 
-		//const response = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/chat/join`, {
+		// send the new room
 		const response = await fetch('/api/v2/chat/join', {
 			method: 'POST',
 			headers: { 'Content-Type': 'application/json' },
 			body: JSON.stringify(formData),
 		});
+
+		// get response status and message
+		response_status = response.status;
 		response_data = await response.json();
-		console.log(response_data);
-		if (response_data.statusCode)
-			response_status = response_data.statusCode;
-		else
-			response_status = 200;
 		if (response_data.message)
 			response_message = response_data.message;
+		console.log("response:", response_data, "status:", response_status, "message:", response_message);
+
+		// go to room
+		if (response_status === 200 && response_message === "successfull room creation")
+			layout = "room";
 	}
 
 </script>
@@ -64,7 +67,7 @@
 	<!-- panel_create -->
 	<div class="panel panel_create __border_top">
 		<form on:submit|preventDefault={handleSubmit}>
-			{#if response_status !== 200}
+			{#if response_status >= 300}
 				<Warning content={response_message}/>
 			{/if}
 			<!-- name: -->

srcs/requirements/svelte/api_front/src/pieces/chat/Layout_home.svelte

@@ -1,9 +1,29 @@
 
 <script>
 
+	import { onMount } from 'svelte';
 	import Button from './Chat_button.svelte';
 	export let layout;
 
+	let rooms = [
+		{room_name: 'my room'},
+		{room_name: 'better room'},
+		{room_name: 'best room'},
+		{room_name: 'ho room'},
+	];
+
+	// ask for the rooms
+	onMount(() => {
+		console.log("onmount");
+		const get_rooms = fetch('/api/v2/chat/rooms')
+		.then(resp => resp.json())
+		.then(data =>
+		{
+			console.log(data);
+			//rooms = data;
+		});
+	});
+
 </script>
 
 <div class="grid_box">
@@ -30,10 +50,13 @@
 			<div class="__show_if_only_child">
 				<p class="__center">/ you have no chat room yet /</p>
 			</div>
-			<!-- placeholders 
+			{#each rooms as room}
 				<Button bind:layout new_layout="room" my_class="list">
-				a room
+					{room.room_name}
 				</Button>
+			{/each}
+
+			<!-- placeholders 
 			<Button bind:layout new_layout="room" my_class="list">
 				another room
 			</Button>

srcs/requirements/svelte/api_front/src/pieces/chat/Layout_room.svelte

@@ -29,7 +29,7 @@
 		text_area.focus();
 	}
 
-	function send_msg_if(evt)
+	function enter_send_msg(evt)
 	{
 		if (evt.shiftKey && evt.key === "Enter")
 		{
@@ -72,7 +72,7 @@
 			class="text_area"
 			bind:innerHTML={msg}
 			bind:this={text_area}
-			on:keypress={send_msg_if}
+			on:keypress={enter_send_msg}
 			contenteditable="true"
 		></div>
 	</div>

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

@@ -3,6 +3,9 @@ import io from 'socket.io-client';
 export let user;
 export let socket;
 
+export let temp = "foo";
+export function change_temp(){temp = "bar";};
+
 const address = `http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}`;
 
 export function init_socket()
@@ -19,7 +22,7 @@ export function init_socket()
 			{
 				username: user.username,
 			},
-		});
+		})
 	});
 }