Denkt sich realistische Einsatzszenarien aus, koordiniert deren Ablauf und ist die
zentrale Schnittstelle zwischen Piloten und bodengebundenen Rettungsmitteln. Er trägt
die Verantwortung für einen reibungslosen Ablauf und der erfolgreichen Durchführung der
@@ -43,18 +43,18 @@ const PathsOptions = ({
);
diff --git a/apps/hub/app/api/event/route.ts b/apps/hub/app/api/event/route.ts
index 704842e6..3c3a216c 100644
--- a/apps/hub/app/api/event/route.ts
+++ b/apps/hub/app/api/event/route.ts
@@ -24,15 +24,6 @@ export async function GET(request: Request): Promise {
userId: session.user.id,
},
},
- Appointments: {
- include: {
- Participants: {
- where: {
- appointmentCancelled: false,
- },
- },
- },
- },
},
});
diff --git a/apps/hub/helper/events.ts b/apps/hub/helper/events.ts
index 4bc8827c..9c664c5a 100644
--- a/apps/hub/helper/events.ts
+++ b/apps/hub/helper/events.ts
@@ -1,13 +1,9 @@
-import { Event, EventAppointment, Participant, Prisma } from "@repo/db";
+import { Event, Participant, Prisma } from "@repo/db";
import axios from "axios";
export const getEvents = async (filter: Prisma.EventWhereInput) => {
const { data } = await axios.get<
(Event & {
- Appointments: (EventAppointment & {
- Appointments: EventAppointment[];
- Participants: Participant[];
- })[];
Participants: Participant[];
})[]
>(`/api/event`, {
diff --git a/packages/database/prisma/schema/event.prisma b/packages/database/prisma/schema/event.prisma
index 34872a14..b4c75c9a 100644
--- a/packages/database/prisma/schema/event.prisma
+++ b/packages/database/prisma/schema/event.prisma
@@ -5,33 +5,17 @@ enum EVENT_TYPE {
EVENT
}
-model EventAppointment {
- id Int @id @default(autoincrement())
- eventId Int
- appointmentDate DateTime
- presenterId String
- // relations:
- Users User[] @relation("EventAppointmentUser")
- Participants Participant[]
- Event Event @relation(fields: [eventId], references: [id], onDelete: Cascade)
- Presenter User @relation(fields: [presenterId], references: [id])
-}
-
model Participant {
id Int @id @default(autoincrement())
userId String @map(name: "user_id")
finisherMoodleCurseCompleted Boolean @default(false)
- attended Boolean @default(false)
- appointmentCancelled Boolean @default(false)
- eventAppointmentId Int?
enscriptionDate DateTime @default(now())
- statusLog Json[] @default([])
- eventId Int
+ statusLog Json[] @default([])
+ eventId Int
// relations:
- User User @relation(fields: [userId], references: [id], onDelete: Cascade)
- Event Event @relation(fields: [eventId], references: [id], onDelete: Cascade)
- EventAppointment EventAppointment? @relation(fields: [eventAppointmentId], references: [id])
+ User User @relation(fields: [userId], references: [id], onDelete: Cascade)
+ Event Event @relation(fields: [eventId], references: [id], onDelete: Cascade)
}
model Event {
@@ -41,8 +25,6 @@ model Event {
description String
type EVENT_TYPE @default(EVENT)
discordRoleId String? @default("")
- hasPresenceEvents Boolean @default(false)
- maxParticipants Int? @default(0)
finisherMoodleCourseId String? @default("")
finishedBadges BADGES[] @default([])
requiredBadges BADGES[] @default([])
@@ -51,7 +33,6 @@ model Event {
// relations:
Participants Participant[]
- Appointments EventAppointment[]
}
model File {
diff --git a/packages/database/prisma/schema/migrations/20260117233913_remove_event_appointments/migration.sql b/packages/database/prisma/schema/migrations/20260117233913_remove_event_appointments/migration.sql
new file mode 100644
index 00000000..2f79843d
--- /dev/null
+++ b/packages/database/prisma/schema/migrations/20260117233913_remove_event_appointments/migration.sql
@@ -0,0 +1,35 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `appointmentCancelled` on the `Participant` table. All the data in the column will be lost.
+ - You are about to drop the column `attended` on the `Participant` table. All the data in the column will be lost.
+ - You are about to drop the column `eventAppointmentId` on the `Participant` table. All the data in the column will be lost.
+ - You are about to drop the `EventAppointment` table. If the table is not empty, all the data it contains will be lost.
+ - You are about to drop the `_EventAppointmentUser` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "EventAppointment" DROP CONSTRAINT "EventAppointment_eventId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "EventAppointment" DROP CONSTRAINT "EventAppointment_presenterId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "Participant" DROP CONSTRAINT "Participant_eventAppointmentId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "_EventAppointmentUser" DROP CONSTRAINT "_EventAppointmentUser_A_fkey";
+
+-- DropForeignKey
+ALTER TABLE "_EventAppointmentUser" DROP CONSTRAINT "_EventAppointmentUser_B_fkey";
+
+-- AlterTable
+ALTER TABLE "Participant" DROP COLUMN "appointmentCancelled",
+DROP COLUMN "attended",
+DROP COLUMN "eventAppointmentId";
+
+-- DropTable
+DROP TABLE "EventAppointment";
+
+-- DropTable
+DROP TABLE "_EventAppointmentUser";
diff --git a/packages/database/prisma/schema/migrations/20260117235335_remove_event_appointment/migration.sql b/packages/database/prisma/schema/migrations/20260117235335_remove_event_appointment/migration.sql
new file mode 100644
index 00000000..1f859ff9
--- /dev/null
+++ b/packages/database/prisma/schema/migrations/20260117235335_remove_event_appointment/migration.sql
@@ -0,0 +1,8 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `hasPresenceEvents` on the `Event` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Event" DROP COLUMN "hasPresenceEvents";
diff --git a/packages/database/prisma/schema/migrations/20260117235623_remove_max_permissions/migration.sql b/packages/database/prisma/schema/migrations/20260117235623_remove_max_permissions/migration.sql
new file mode 100644
index 00000000..01a33dec
--- /dev/null
+++ b/packages/database/prisma/schema/migrations/20260117235623_remove_max_permissions/migration.sql
@@ -0,0 +1,8 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `maxParticipants` on the `Event` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Event" DROP COLUMN "maxParticipants";
diff --git a/packages/database/prisma/schema/user.prisma b/packages/database/prisma/schema/user.prisma
index 80b9bc9f..244b0c62 100644
--- a/packages/database/prisma/schema/user.prisma
+++ b/packages/database/prisma/schema/user.prisma
@@ -69,8 +69,6 @@ model User {
// relations:
oauthTokens OAuthToken[]
participants Participant[]
- EventAppointmentUser EventAppointment[] @relation("EventAppointmentUser")
- EventAppointment EventAppointment[]
SentMessages ChatMessage[] @relation("SentMessages")
ReceivedMessages ChatMessage[] @relation("ReceivedMessages")
SentReports Report[] @relation("SentReports")
diff --git a/packages/shared-components/helper/event.ts b/packages/shared-components/helper/event.ts
index ba456620..07d8491a 100644
--- a/packages/shared-components/helper/event.ts
+++ b/packages/shared-components/helper/event.ts
@@ -3,6 +3,5 @@ import { Event, Participant } from "@repo/db";
export const eventCompleted = (event: Event, participant?: Participant) => {
if (!participant) return false;
if (event.finisherMoodleCourseId && !participant.finisherMoodleCurseCompleted) return false;
- if (event.hasPresenceEvents && !participant.attended) return false;
return true;
};