From e3a1db286d6e7006b7338eebf71ac2048ac1bf40 Mon Sep 17 00:00:00 2001
From: Kum1ta <eddydhj@gmail.com>
Date: Fri, 30 Aug 2024 16:43:24 +0200
Subject: [PATCH] Django     - Fix live chat resquest

---
 .../server/typeRequests/sendPrivateMessage.py      | 14 ++++++++++----
 .../djangoserver/file/server/test_data.sql         | 12 ++++++++++++
 .../static/javascript/liveChat/showUserList.js     |  2 +-
 .../typeResponse/typeNewPrivateMessage.js          |  3 ++-
 .../javascript/typeResponse/typePrivateListUser.js |  4 ++--
 .../nginx/static/javascript/websocket.js           |  3 ++-
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
index 0acecf0..5484dc8 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/04 13:44:11 by edbernar          #+#    #+#              #
-#    Updated: 2024/08/29 21:33:48 by tomoron          ###   ########.fr        #
+#    Updated: 2024/08/30 15:57:02 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -26,7 +26,7 @@ def sendPrivateMessage(socket, content):
 		dest = User.objects.filter(id=content["to"])
 		if(not dest.exists()):
 			socket.sendError("User not found", 9008)
-			return;
+			return
 		user = User.objects.filter(id=socket.scope["session"]["id"])
 		if(int(content["to"]) == user[0].id):
 			socket.sendError("Invalid message sent", 9009)
@@ -41,8 +41,14 @@ def sendPrivateMessage(socket, content):
 			"content": content["content"],
 			"date": new_msg.date.strftime("%H:%M:%S %d/%m/%Y")
 		}}
-		if(content["to"] in socket.onlinePlayers):
-			socket.onlinePlayers[content["to"]].send(text_data=json.dumps(jsonVar))
 		socket.send(text_data=json.dumps(jsonVar))
+		if(content["to"] in socket.onlinePlayers):
+			jsonVar = {"type": "new_private_message", "content": {
+				"from": new_msg.sender.id,
+				"channel": new_msg.sender.id,
+				"content": content["content"],
+				"date": new_msg.date.strftime("%H:%M:%S %d/%m/%Y")
+			}}
+			socket.onlinePlayers[content["to"]].send(text_data=json.dumps(jsonVar))
 	except Exception as e:
 		socket.sendError("Invalid message sent", 9009, e)
diff --git a/docker-compose/requirements/djangoserver/file/server/test_data.sql b/docker-compose/requirements/djangoserver/file/server/test_data.sql
index fe5f0ae..405b83a 100644
--- a/docker-compose/requirements/djangoserver/file/server/test_data.sql
+++ b/docker-compose/requirements/djangoserver/file/server/test_data.sql
@@ -5,3 +5,15 @@ INSERT INTO "server_user" ("username", "mail", "password", "id42", "pfp") VALUES
 INSERT INTO "server_message" ("date", "sender_id", "to_id", "content") VALUES
 ('2024-08-25 18:10:54.27476+00',	1,	2, 'coucou'),
 ('2024-08-25 18:11:25.987857+00',	2,	1, 'coucou les musulmans moi je mange la glace');
+
+INSERT INTO "server_message" ("date", "sender_id", "to_id", "content") VALUES
+('2024-08-25 18:10:54.27476+00',	3,	2, 'bonsoir'),
+('2024-08-25 18:11:25.987857+00',	2,	3, 'non');
+
+INSERT INTO "server_message" ("date", "sender_id", "to_id", "content") VALUES
+('2024-08-25 18:10:54.27476+00',	1,	3, 'bonsoir3'),
+('2024-08-25 18:11:25.987857+00',	3,	1, 'non3');
+
+INSERT INTO "server_message" ("date", "sender_id", "to_id", "content") VALUES
+('2024-08-25 18:10:54.27476+00',	4,	3, 'bonsoir3'),
+('2024-08-25 18:11:25.987857+00',	3,	4, 'non3');
\ No newline at end of file
diff --git a/docker-compose/requirements/nginx/static/javascript/liveChat/showUserList.js b/docker-compose/requirements/nginx/static/javascript/liveChat/showUserList.js
index 19a38c8..5293e76 100644
--- a/docker-compose/requirements/nginx/static/javascript/liveChat/showUserList.js
+++ b/docker-compose/requirements/nginx/static/javascript/liveChat/showUserList.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/04 19:21:10 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/26 15:57:20 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/30 16:36:37 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeNewPrivateMessage.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeNewPrivateMessage.js
index c0fdcc1..0b6105c 100644
--- a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeNewPrivateMessage.js
+++ b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeNewPrivateMessage.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/04 15:15:49 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/24 23:45:05 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/30 15:47:44 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,6 +16,7 @@ import { userMeInfo } from "/static/javascript/typeResponse/typeLogin.js";
 
 function typeNewPrivateMessage(content)
 {
+	console.log(content);
 	messageList.push(content);
 	if (infoPanel.isOpen && infoPanel.id === content.channel)
 	{
diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typePrivateListUser.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typePrivateListUser.js
index e8e4df1..67cbe58 100644
--- a/docker-compose/requirements/nginx/static/javascript/typeResponse/typePrivateListUser.js
+++ b/docker-compose/requirements/nginx/static/javascript/typeResponse/typePrivateListUser.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/02 01:56:15 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/03 14:36:20 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/30 16:34:29 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,7 +28,7 @@ function typePrivateListUser(list) {
 	userListAvailable = true;
 	if (userListResolve)
 	{
-		userListResolve();
+		userListResolve(userList);
 		userListResolve = null;
 	}
 }
diff --git a/docker-compose/requirements/nginx/static/javascript/websocket.js b/docker-compose/requirements/nginx/static/javascript/websocket.js
index 278a11f..5b514c6 100644
--- a/docker-compose/requirements/nginx/static/javascript/websocket.js
+++ b/docker-compose/requirements/nginx/static/javascript/websocket.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/31 22:17:24 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/26 14:48:48 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/30 15:42:51 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -52,6 +52,7 @@ socket.onmessage = (event) => {
 	}
 	else
 	{
+		console.log(response);
 		try {
 			functionResponse[typeResponse.indexOf(response.type)](response.content);
 		} catch {