fixed chat zustand bug

apps/dispatch-server/socket-events/connect-dispatch.ts

@@ -1,7 +1,7 @@
 import { pubClient } from "modules/redis";
 import { Server, Socket } from "socket.io";
 
-export const handle =
+export const handleConnectDispatch =
 	(socket: Socket, io: Server) =>
 	async ({
 		logoffTime,
@@ -11,27 +11,40 @@ export const handle =
 		selectedZone: string;
 	}) => {
 		const userId = socket.data.user.id; // User ID aus dem JWT-Token
+		const name = `${socket.data.user.firstname} ${socket.data.user.lastname[0]}. - ${socket.data.user.publicId}`;
 		console.log("User connected to dispatch server");
-		await pubClient.json.set(`dispatchers:${socket.id}`, "$", {
+		await pubClient.json.set(`Dispatcher:${userId}`, "$", {
 			logoffTime,
+			name,
 			loginTime: new Date().toISOString(),
 			lastSeen: new Date().toISOString(),
 			selectedZone,
-			userId,
+			socketId: socket.id,
 		});
 
 		socket.join("dispatchers"); // Dem Dispatcher-Raum beitreten
+		socket.join(`user:${userId}`); // Dem User-Raum beitreten
 
-		const keys = await pubClient.keys("dispatchers:*");
-		const dispatchers = await Promise.all(
+		/* 		const keys = await pubClient.keys("Dispatcher:*");
+		await Promise.all(
 			keys.map(async (key) => {
 				return await pubClient.json.get(key);
 			}),
-		);
-		console.log(dispatchers);
+		); */
 
 		socket.on("disconnect", async () => {
 			console.log("Disconnected from dispatch server");
-			await pubClient.json.del(`dispatchers:${socket.id}`);
+			await pubClient.json.del(`Dispatcher:${userId}`);
+		});
+		socket.on("reconnect", async () => {
+			console.log("Reconnected to dispatch server");
+			await pubClient.json.set(`Dispatcher:${userId}`, "$", {
+				logoffTime,
+				loginTime: new Date().toISOString(),
+				lastSeen: new Date().toISOString(),
+				name,
+				selectedZone,
+				socketId: socket.id,
+			});
 		});
 	};

apps/dispatch-server/socket-events/send-message.ts

@@ -0,0 +1,50 @@
+import { prisma } from "@repo/db";
+import { pubClient } from "modules/redis";
+import { Server, Socket } from "socket.io";
+
+export const handleSendMessage =
+	(socket: Socket, io: Server) =>
+	async (
+		{ userId, message }: { userId: string; message: string },
+		cb: (err: { error?: string }) => void,
+	) => {
+		console.log("send-message", userId, message);
+		const senderId = socket.data.user.id;
+
+		const senderUser = await prisma.user.findUnique({
+			where: { id: senderId },
+		});
+
+		const receiverUser = await prisma.user.findUnique({
+			where: { id: userId },
+		});
+
+		const dbMessage = await prisma.chatMessage.create({
+			data: {
+				text: message,
+				receiverId: userId,
+				senderId,
+				receiverName: `${receiverUser?.firstname} ${receiverUser?.lastname[0]}. - ${receiverUser?.publicId}`,
+				senderName: `${senderUser?.firstname} ${senderUser?.lastname[0]}. - ${senderUser?.publicId}`,
+			},
+		});
+
+		io.to(`user:${dbMessage.receiverId}`).emit("chat-message", {
+			userId: dbMessage.senderId,
+			message: dbMessage,
+		});
+		io.to(`user:${dbMessage.senderId}`).emit("chat-message", {
+			userId: dbMessage.receiverId,
+			message: dbMessage,
+		});
+		const recvSockets = await io.in(`user:${userId}`).fetchSockets();
+		await io.in(`user:${senderId}`).fetchSockets();
+
+		console.log(`Sockets in room user:${userId}:`);
+		if (!recvSockets.length) {
+			cb({ error: "User is not connected" });
+		} else {
+			cb({});
+		}
+		console.log(`${socket.data.user.publicId} sent message to ${userId}`);
+	};