Merge branch 'main' into 3-fix-aircraftmarkers-missionmarkers

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

@@ -1,3 +1,4 @@
+import { prisma } from "@repo/db";
 import { pubClient } from "modules/redis";
 import { Server, Socket } from "socket.io";
 
@@ -11,15 +12,20 @@ export const handleConnectDispatch =
 		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(`Dispatcher:${userId}`, "$", {
+		const user = await prisma.user.findUnique({
-			logoffTime,
+			where: {
-			name,
+				id: userId,
+			},
+		});
+		const connectedDispatcherEntry = await prisma.connectedDispatcher.create({
+			data: {
+				publicUser: {},
+				esimatedLogoutTime: logoffTime,
+				lastHeartbeat: new Date(),
+				userId: userId,
 				loginTime: new Date().toISOString(),
-			lastSeen: new Date().toISOString(),
+			},
-			selectedZone,
-			socketId: socket.id,
 		});
 
 		socket.join("dispatchers"); // Dem Dispatcher-Raum beitreten
@@ -31,20 +37,21 @@ export const handleConnectDispatch =
 				return await pubClient.json.get(key);
 			}),
 		); */
+		io.to("dispatchers").emit("dispatcher-update");
+		io.to("pilots").emit("dispatcher-update");
 
 		socket.on("disconnect", async () => {
 			console.log("Disconnected from dispatch server");
-			await pubClient.json.del(`Dispatcher:${userId}`);
+			await prisma.connectedDispatcher.update({
+				where: {
+					id: connectedDispatcherEntry.id,
+				},
+				data: {
+					logoutTime: new Date().toISOString(),
+				},
+			});
 		});
 		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/app/_store/leftMenuStore.ts

@@ -21,7 +21,7 @@ interface ChatStore {
 	addMessage: (userId: string, message: ChatMessage) => void;
 }
 
-export const useChatStore = create<ChatStore>((set, get) => ({
+export const useLeftMenuStore = create<ChatStore>((set, get) => ({
 	reportTabOpen: false,
 	setReportTabOpen: (open: boolean) => set({ reportTabOpen: open }),
 	ownId: null,
@@ -99,7 +99,7 @@ export const useChatStore = create<ChatStore>((set, get) => ({
 socket.on(
 	"chat-message",
 	({ userId, message }: { userId: string; message: ChatMessage }) => {
-		const store = useChatStore.getState();
+		const store = useLeftMenuStore.getState();
 		console.log("chat-message", userId, message);
 		// Update the chat store with the new message
 		store.addMessage(userId, message);

apps/dispatch/app/api/mission/route.ts

@@ -1,24 +0,0 @@
-import { Prisma, prisma } from "@repo/db";
-import { NextRequest, NextResponse } from "next/server";
-
-export const POST = async (req: NextRequest) => {
-	console.log(req.body);
-	const body = await req.json();
-	console.log(body);
-
-	const missions = await prisma.mission.findMany({
-		where: (body.filter as Prisma.MissionWhereInput) || {},
-	});
-
-	return NextResponse.json(missions);
-};
-
-export const PUT = async (req: NextRequest) => {
-	const body = await req.json();
-
-	const newMission = await prisma.mission.create({
-		data: body,
-	});
-
-	return NextResponse.json(newMission);
-};

apps/dispatch/app/dispatch/_components/left/Chat.tsx

@@ -1,22 +1,15 @@
 "use client";
 import { ChatBubbleIcon, PaperPlaneIcon } from "@radix-ui/react-icons";
-import { useChatStore } from "_store/chatStore";
+import { useLeftMenuStore } from "_store/leftMenuStore";
 import { useSession } from "next-auth/react";
 import { Fragment, useEffect, useRef, useState } from "react";
 import { Dispatcher } from "dispatch/_components/navbar/_components/action";
 import { cn } from "helpers/cn";
-
+import { getDispatcher } from "pilot/_components/navbar/action";
-export const getDispatcher = async () => {
-	const res = await fetch(`
-		${process.env.NEXT_PUBLIC_DISPATCH_SERVER_URL}/dispatcher`);
-	const data = await res.json();
-	return data as Dispatcher[];
-};
 
 export const Chat = () => {
 	const {
 		setReportTabOpen,
-		reportTabOpen,
 		chatOpen,
 		setChatOpen,
 		sendMessage,
@@ -26,7 +19,7 @@ export const Chat = () => {
 		selectedChat,
 		setSelectedChat,
 		setChatNotification,
-	} = useChatStore();
+	} = useLeftMenuStore();
 	const [sending, setSending] = useState(false);
 	const session = useSession();
 	const [addTabValue, setAddTabValue] = useState<string>("");
@@ -37,7 +30,7 @@ export const Chat = () => {
 	useEffect(() => {
 		if (!session.data?.user.id) return;
 		setOwnId(session.data.user.id);
-	}, [session]);
+	}, [session, setOwnId]);
 
 	useEffect(() => {
 		const fetchDispatcher = async () => {
@@ -56,7 +49,7 @@ export const Chat = () => {
 
 		timeout.current = setInterval(() => {
 			fetchDispatcher();
-		}, 1000000);
+		}, 1000);
 		fetchDispatcher();
 
 		return () => {
@@ -93,6 +86,9 @@ export const Chat = () => {
 					className="dropdown-content card bg-base-200 w-150 shadow-md z-[1100] ml-2 border-1 border-primary"
 				>
 					<div className="card-body">
+						<h2 className="inline-flex items-center gap-2 text-lg font-bold mb-2">
+							<ChatBubbleIcon /> Chat
+						</h2>
 						<div className="join">
 							<select
 								className="select select-sm w-full"
@@ -207,7 +203,7 @@ export const Chat = () => {
 								}}
 								disabled={sending}
 								role="button"
-								onSubmit={(e) => false}
+								onSubmit={() => false} // prevent submit event for react hook form
 							>
 								{sending ? (
 									<span className="loading loading-spinner loading-sm"></span>

apps/dispatch/app/dispatch/_components/left/Report.tsx

@@ -5,7 +5,9 @@ import { useEffect, useRef, useState } from "react";
 import { Dispatcher } from "dispatch/_components/navbar/_components/action";
 import { cn } from "helpers/cn";
 import { useChatStore } from "_store/chatStore";
-import { getDispatcher } from "dispatch/_components/left/Chat";
+import {} from "dispatch/_components/left/Chat";
+import { serverApi } from "helpers/axios";
+import { getDispatcher } from "pilot/_components/navbar/action";
 
 export const Report = () => {
 	const { setChatOpen, setReportTabOpen, reportTabOpen, setOwnId } =
@@ -43,10 +45,9 @@ export const Report = () => {
 			if (timeout.current) {
 				clearInterval(timeout.current);
 				timeout.current = null;
-				console.log("cleared");
 			}
 		};
-	}, [selectedPlayer]);
+	}, [selectedPlayer, session.data?.user.id]);
 
 	return (
 		<div
@@ -72,6 +73,9 @@ export const Report = () => {
 					className="dropdown-content card bg-base-200 w-150 shadow-md z-[1100] ml-2 border-1 border-error"
 				>
 					<div className="card-body">
+						<h2 className="inline-flex items-center gap-2 text-lg font-bold mb-2">
+							<ExclamationTriangleIcon /> Report senden
+						</h2>
 						<div className="join">
 							<select
 								className="select select-sm w-full"
@@ -107,15 +111,12 @@ export const Report = () => {
 									e.preventDefault();
 									if (message.length < 1 || !selectedPlayer) return;
 									setSending(true);
-									fetch("/api/dispatch/report", {
+									serverApi("/report", {
 										method: "POST",
-										headers: {
+										data: {
-											"Content-Type": "application/json",
+											message,
+											to: selectedPlayer,
 										},
-										body: JSON.stringify({
-											userId: selectedPlayer,
-											message: message,
-										}),
 									})
 										.then(() => {
 											setMessage("");

apps/dispatch/app/pilot/_components/navbar/Chat.tsx

@@ -1,6 +1,6 @@
 "use client";
 import { ChatBubbleIcon, PaperPlaneIcon } from "@radix-ui/react-icons";
-import { useChatStore } from "_store/chatStore";
+import { leftMenuStore } from "_store/leftMenuStore";
 import { useSession } from "next-auth/react";
 import { Fragment, useEffect, useRef, useState } from "react";
 import {
@@ -20,7 +20,7 @@ export const Chat = () => {
 		selectedChat,
 		setSelectedChat,
 		setChatNotification,
-	} = useChatStore();
+	} = leftMenuStore();
 	const [sending, setSending] = useState(false);
 	const session = useSession();
 	const [addTabValue, setAddTabValue] = useState<string>("");

apps/hub-server/routes/mail.ts

@@ -5,7 +5,6 @@ import { sendPasswordChanged, sendCourseCompletedEmail } from "modules/mail";
 const router = Router();
 
 router.post("/send", async (req, res) => {
-	console.log(req.body);
 	const { to, subject, html } = req.body;
 
 	try {

apps/hub/app/(app)/admin/report/actions.ts

@@ -2,7 +2,7 @@
 import { prisma } from "@repo/db";
 
 export const markAsResolved = async (id: number) => {
-	await prisma.reportMessage.update({
+	await prisma.report.update({
 		where: { id: id },
 		data: { erledigt: true },
 	});
@@ -20,7 +20,7 @@ export const handleMarkAsResolved = async (id: number) => {
 };
 
 export const getReports = async () => {
-	return prisma.reportMessage.findMany({
+	return prisma.report.findMany({
 		include: {
 			sender: true,
 			reported: true,
@@ -29,7 +29,7 @@ export const getReports = async () => {
 };
 
 export const fetchReportDetails = async (id: number) => {
-	return prisma.reportMessage.findUnique({
+	return prisma.report.findUnique({
 		where: { id },
 		include: { sender: true, reported: true },
 	});

packages/database/prisma/schema/connectedDispatcher.prisma

@@ -1,4 +1,4 @@
-model ConnectedDispatch {
+model ConnectedDispatcher {
     id                 Int       @id @default(autoincrement())
     userId             String
     publicUser         Json

packages/database/prisma/schema/report.prisma

@@ -0,0 +1,14 @@
+model Report {
+    id             Int      @id @default(autoincrement())
+    text           String
+    senderUserId   String
+    reportedUserId String
+    timestamp      DateTime @default(now())
+    reviewed       Boolean  @default(false)
+    reviewerUserId String?
+
+    //    relations:
+    sender   User  @relation("SentReports", fields: [senderUserId], references: [id])
+    reported User  @relation("ReceivedReports", fields: [reportedUserId], references: [id])
+    reviewer User? @relation("ReviewedReports", fields: [reviewerUserId], references: [id])
+}

packages/database/prisma/schema/reportMessage.prisma

@@ -1,12 +0,0 @@
-model ReportMessage {
-    id         Int      @id @default(autoincrement())
-    text       String
-    senderId   String
-    reportedId String
-    timestamp  DateTime @default(now())
-    erledigt   Boolean  @default(false)
-
-    //    relations:
-    sender   User @relation("SentReports", fields: [senderId], references: [id])
-    reported User @relation("ReceivedReports", fields: [reportedId], references: [id])
-}

packages/database/prisma/schema/user.prisma

@@ -43,14 +43,12 @@ model User {
     EventAppointment      EventAppointment[]
     SentMessages          ChatMessage[]           @relation("SentMessages")
     ReceivedMessages      ChatMessage[]           @relation("ReceivedMessages")
-    SentReports           ReportMessage[]         @relation("SentReports")
+    SentReports           Report[]                @relation("SentReports")
-    ReceivedReports       ReportMessage[]         @relation("ReceivedReports")
+    ReceivedReports       Report[]                @relation("ReceivedReports")
-    /**
+    ReviewedReports       Report[]                @relation("ReviewedReports")
-     * Missions             Mission[]
-     */
     Mission               Mission[]
     MissionOnStationUsers MissionOnStationUsers[]
-    ConnectedDispatch     ConnectedDispatch[]
+    ConnectedDispatcher   ConnectedDispatcher[]
     connectedAircraft     connectedAircraft[]
     PositionLog           PositionLog[]