From 29e7d13674f4edd5ea19a828d24ef33d58f57933 Mon Sep 17 00:00:00 2001
From: Yuze Fu <i@xfox.me>
Date: Sun, 15 Sep 2024 14:53:07 +0900
Subject: [PATCH] feat: callsign and aircraft type

---
 Net.Vatprc.Uniapi.UI.Event/package.json       |   2 +-
 Net.Vatprc.Uniapi.UI.Event/src/api.d.ts       |   6 +
 .../src/components/datetime.tsx               |   7 +-
 .../src/components/slot-button-book.tsx       |   9 +-
 .../src/components/slot-button-release.tsx    |   9 +-
 .../src/components/slot-detail.tsx            |  18 +
 .../src/components/slot-import.tsx            |  24 +-
 .../src/routes/events/$event_id.tsx           |  21 +-
 .../Controllers/EventSlotController.cs        |  12 +
 ...SlotAddCallsignAndAircraftType.Designer.cs | 546 ++++++++++++++++++
 ...017_EventSlotAddCallsignAndAircraftType.cs |  38 ++
 .../Migrations/VATPRCContextModelSnapshot.cs  |   8 +
 Net.Vatprc.Uniapi/Models/EventSlot.cs         |   3 +
 13 files changed, 690 insertions(+), 13 deletions(-)
 create mode 100644 Net.Vatprc.Uniapi/Migrations/20240915052017_EventSlotAddCallsignAndAircraftType.Designer.cs
 create mode 100644 Net.Vatprc.Uniapi/Migrations/20240915052017_EventSlotAddCallsignAndAircraftType.cs

diff --git a/Net.Vatprc.Uniapi.UI.Event/package.json b/Net.Vatprc.Uniapi.UI.Event/package.json
index d9c29e8..f95f1c6 100644
--- a/Net.Vatprc.Uniapi.UI.Event/package.json
+++ b/Net.Vatprc.Uniapi.UI.Event/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "vite --port 3000",
+    "dev": "vite --port 3000 --open",
     "build": "vite build",
     "serve": "vite preview",
     "lint:eslint": "eslint 'src/**/*.{ts,tsx}'",
diff --git a/Net.Vatprc.Uniapi.UI.Event/src/api.d.ts b/Net.Vatprc.Uniapi.UI.Event/src/api.d.ts
index 5be3b8e..4392f36 100644
--- a/Net.Vatprc.Uniapi.UI.Event/src/api.d.ts
+++ b/Net.Vatprc.Uniapi.UI.Event/src/api.d.ts
@@ -313,6 +313,8 @@ export interface components {
       enter_at: string;
       /** Format: date-time */
       leave_at?: string | null;
+      callsign?: string | null;
+      aircraft_type_icao?: string | null;
     };
     ErrorProdResponse: {
       error_code: string;
@@ -370,6 +372,8 @@ export interface components {
       /** Format: date-time */
       updated_at: string;
       booking?: components["schemas"]["EventBookingDto"];
+      callsign?: string | null;
+      aircraft_type_icao?: string | null;
     };
     LoginResDto: {
       access_token: string;
@@ -423,6 +427,8 @@ export interface components {
       enter_at: string;
       /** Format: date-time */
       leave_at?: string | null;
+      callsign?: string | null;
+      aircraft_type_icao?: string | null;
     };
     UserDto: {
       id: string;
diff --git a/Net.Vatprc.Uniapi.UI.Event/src/components/datetime.tsx b/Net.Vatprc.Uniapi.UI.Event/src/components/datetime.tsx
index 9ecd826..4fc0f47 100644
--- a/Net.Vatprc.Uniapi.UI.Event/src/components/datetime.tsx
+++ b/Net.Vatprc.Uniapi.UI.Event/src/components/datetime.tsx
@@ -19,7 +19,12 @@ export const DateTime = ({
   return (
     <>
       <Tooltip label={format(time, "yyyy-MM-dd HH:mm zzzz")} position={position}>
-        <Text component="span">{formatInTimeZone(time, "UTC", noDate ? "HH:mm" : "yyyy-MM-dd HH:mm")}Z</Text>
+        <Text component="span">
+          {formatInTimeZone(time, "UTC", noDate ? "HHmm" : "yyyy-MM-dd HH:mm")}
+          <Text component="span" c="gray" fz="sm">
+            Z
+          </Text>
+        </Text>
       </Tooltip>
       {!noDistance && (
         <Text component="span" ml={4}>
diff --git a/Net.Vatprc.Uniapi.UI.Event/src/components/slot-button-book.tsx b/Net.Vatprc.Uniapi.UI.Event/src/components/slot-button-book.tsx
index 71fb1ce..75a779c 100644
--- a/Net.Vatprc.Uniapi.UI.Event/src/components/slot-button-book.tsx
+++ b/Net.Vatprc.Uniapi.UI.Event/src/components/slot-button-book.tsx
@@ -1,3 +1,4 @@
+import { DateTime } from "./datetime";
 import { paths } from "@/api";
 import { invalidatePath, useApi, useApiPut } from "@/client";
 import { useUser } from "@/services/auth";
@@ -54,7 +55,13 @@ export const SlotBookButton = ({
       </Popover.Target>
       <Popover.Dropdown>
         <Stack>
-          <Text>Do you want to book this slot?</Text>
+          <Text>
+            Do you want to book the slot for {slot?.airspace?.name} at{" "}
+            <DateTime noDate noDistance>
+              {slot.enter_at}
+            </DateTime>
+            ?
+          </Text>
           <Group>
             <Button variant="outline" onClick={toggle}>
               Cancel
diff --git a/Net.Vatprc.Uniapi.UI.Event/src/components/slot-button-release.tsx b/Net.Vatprc.Uniapi.UI.Event/src/components/slot-button-release.tsx
index f9605b9..f79377e 100644
--- a/Net.Vatprc.Uniapi.UI.Event/src/components/slot-button-release.tsx
+++ b/Net.Vatprc.Uniapi.UI.Event/src/components/slot-button-release.tsx
@@ -1,3 +1,4 @@
+import { DateTime } from "./datetime";
 import { paths } from "@/api";
 import { invalidatePath, useApi, useApiDelete } from "@/client";
 import { useUser } from "@/services/auth";
@@ -53,7 +54,13 @@ export const SlotReleaseButton = ({
       </Popover.Target>
       <Popover.Dropdown>
         <Stack>
-          <Text>Do you want to release this slot?</Text>
+          <Text>
+            Do you want to release the slot for {slot?.airspace?.name} at{" "}
+            <DateTime noDate noDistance>
+              {slot.enter_at}
+            </DateTime>
+            ?
+          </Text>
           <Group>
             <Button variant="outline" onClick={toggle}>
               Cancel
diff --git a/Net.Vatprc.Uniapi.UI.Event/src/components/slot-detail.tsx b/Net.Vatprc.Uniapi.UI.Event/src/components/slot-detail.tsx
index 9ac671e..3d9dfb0 100644
--- a/Net.Vatprc.Uniapi.UI.Event/src/components/slot-detail.tsx
+++ b/Net.Vatprc.Uniapi.UI.Event/src/components/slot-detail.tsx
@@ -55,6 +55,22 @@ export const SlotDetail = ({ eventId, slotId }: { eventId: string; slotId: strin
             </Text>
             {slot?.airspace?.name}
           </Text>
+          {slot?.callsign && (
+            <Text>
+              <Text component="span" fw={700} mr="xs">
+                Callsign:
+              </Text>
+              {slot?.callsign}
+            </Text>
+          )}
+          {slot?.aircraft_type_icao && (
+            <Text>
+              <Text component="span" fw={700} mr="xs">
+                Aircraft Type:
+              </Text>
+              {slot?.aircraft_type_icao}
+            </Text>
+          )}
           <Group gap={0}>
             <Text component="span" fw={700} mr="xs">
               Times:
@@ -101,8 +117,10 @@ export const SlotDetail = ({ eventId, slotId }: { eventId: string; slotId: strin
             )}
           </Timeline>
           <Title order={3}>Event briefing</Title>
+          {!event?.description && <Text>No briefing available.</Text>}
           <Markdown>{event?.description}</Markdown>
           <Title order={3}>Area briefing</Title>
+          {!slot?.airspace.description && <Text>No briefing available.</Text>}
           <Markdown>{slot?.airspace.description}</Markdown>
         </Stack>
       </Modal>
diff --git a/Net.Vatprc.Uniapi.UI.Event/src/components/slot-import.tsx b/Net.Vatprc.Uniapi.UI.Event/src/components/slot-import.tsx
index 4574c4e..3723a62 100644
--- a/Net.Vatprc.Uniapi.UI.Event/src/components/slot-import.tsx
+++ b/Net.Vatprc.Uniapi.UI.Event/src/components/slot-import.tsx
@@ -17,6 +17,8 @@ interface Slot {
   icao_codes: string[];
   enter_at: Date;
   leave_at?: Date;
+  callsign?: string;
+  aircraft_type_icao?: string;
 }
 
 export const ImportSlot = ({ eventId }: { eventId: string }) => {
@@ -33,13 +35,15 @@ export const ImportSlot = ({ eventId }: { eventId: string }) => {
       data
         .split("\n")
         .map((line) => {
-          const [dep, dep_time, arr, arr_time] = line.split(",");
+          const [dep, dep_time, arr, arr_time, callsign, aircraft_type_icao] = line.split(",");
           if (!dep || !dep_time || !arr) return;
           return {
             airspace: `${dep} - ${arr}`,
             icao_codes: [dep, arr],
-            enter_at: fromZonedTime(parse(dep_time ?? "", "yyyy/MM/dd HH:mm:ss", Date.now()), "UTC"),
-            leave_at: arr_time ? fromZonedTime(parse(arr_time, "yyyy/MM/dd HH:mm:ss", Date.now()), "UTC") : undefined,
+            enter_at: fromZonedTime(parse(dep_time ?? "", "yyyy-MM-dd HH:mm", Date.now()), "UTC"),
+            leave_at: arr_time ? fromZonedTime(parse(arr_time, "yyyy-MM-dd HH:mm", Date.now()), "UTC") : undefined,
+            callsign: callsign,
+            aircraft_type_icao: aircraft_type_icao,
           };
         })
         .filter((x) => !!x),
@@ -65,6 +69,8 @@ export const ImportSlot = ({ eventId }: { eventId: string }) => {
               airspace_id: airspaces.find((a) => a.data?.name === slot.airspace)?.data?.id ?? "",
               enter_at: slot.enter_at.toISOString(),
               leave_at: slot.leave_at?.toISOString(),
+              callsign: slot.callsign,
+              aircraft_type_icao: slot.aircraft_type_icao,
             },
           }),
         ),
@@ -87,6 +93,10 @@ export const ImportSlot = ({ eventId }: { eventId: string }) => {
       </ActionIcon>
       <Modal opened={opened} onClose={close} title="Import slots" size="xl">
         <Stack>
+          <Text>
+            File format: CSV with dep, dep_time (yyyy-MM-dd HH:mm), arr, arr_time (yyyy-MM-dd HH:mm), callsign,
+            aircraft_type_icao
+          </Text>
           <Dropzone onDrop={(f) => wrapPromiseWithToast(onDrop(f))}>
             <Group justify="center" gap="xl" style={{ pointerEvents: "none" }}>
               <Dropzone.Accept>
@@ -112,6 +122,8 @@ export const ImportSlot = ({ eventId }: { eventId: string }) => {
               <Table.Tr>
                 <Table.Th>Area</Table.Th>
                 <Table.Th>Enter at</Table.Th>
+                <Table.Th>Callsign</Table.Th>
+                <Table.Th>Aircraft Type</Table.Th>
               </Table.Tr>
             </Table.Thead>
             <Table.Tbody>
@@ -122,14 +134,16 @@ export const ImportSlot = ({ eventId }: { eventId: string }) => {
                     <Stack>
                       <Text>
                         <Pill mr="xs">CTOT</Pill>
-                        <DateTime>{slot.enter_at}</DateTime>
+                        <DateTime noDate>{slot.enter_at}</DateTime>
                       </Text>
                       <Text>
                         <Pill mr="xs">TTA</Pill>
-                        <DateTime>{slot.enter_at}</DateTime>
+                        <DateTime noDate>{slot.enter_at}</DateTime>
                       </Text>
                     </Stack>
                   </Table.Td>
+                  <Table.Td>{slot.callsign}</Table.Td>
+                  <Table.Td>{slot.aircraft_type_icao}</Table.Td>
                 </Table.Tr>
               ))}
             </Table.Tbody>
diff --git a/Net.Vatprc.Uniapi.UI.Event/src/routes/events/$event_id.tsx b/Net.Vatprc.Uniapi.UI.Event/src/routes/events/$event_id.tsx
index bb675ae..33619b7 100644
--- a/Net.Vatprc.Uniapi.UI.Event/src/routes/events/$event_id.tsx
+++ b/Net.Vatprc.Uniapi.UI.Event/src/routes/events/$event_id.tsx
@@ -31,19 +31,31 @@ const EventComponent = () => {
     <Table.Tr key={slot.id} bg={slot?.booking?.user_id === user.id ? "green.0" : undefined}>
       <Table.Td>{slot.airspace.name}</Table.Td>
       <Table.Td>
-        <Stack gap="xs">
+        <Group gap="xs">
           <Text>
             <Pill mr="xs">CTOT</Pill>
-            <DateTime>{slot.enter_at}</DateTime>
+            <DateTime noDistance noDate>
+              {slot.enter_at}
+            </DateTime>
           </Text>
           {slot.leave_at && (
             <Text>
               <Pill mr="xs">TTA</Pill>
-              <DateTime>{slot.leave_at}</DateTime>
+              <DateTime noDistance noDate>
+                {slot.leave_at}
+              </DateTime>
             </Text>
           )}
-        </Stack>
+        </Group>
       </Table.Td>
+      {!!slot.callsign || !!slot.aircraft_type_icao ? (
+        <Table.Td>
+          {slot.callsign}
+          {slot.aircraft_type_icao && ` with ${slot.aircraft_type_icao}`}
+        </Table.Td>
+      ) : (
+        <Table.Td>Not designated</Table.Td>
+      )}
       <Table.Td>
         <Group>
           <SlotDetail eventId={event_id} slotId={slot.id} />
@@ -83,6 +95,7 @@ const EventComponent = () => {
             <Table.Tr>
               <Table.Th>Area</Table.Th>
               <Table.Th>Time</Table.Th>
+              <Table.Th>Callsign & Aircraft</Table.Th>
               <Table.Th></Table.Th>
             </Table.Tr>
           </Table.Thead>
diff --git a/Net.Vatprc.Uniapi/Controllers/EventSlotController.cs b/Net.Vatprc.Uniapi/Controllers/EventSlotController.cs
index f8e92cc..004df95 100644
--- a/Net.Vatprc.Uniapi/Controllers/EventSlotController.cs
+++ b/Net.Vatprc.Uniapi/Controllers/EventSlotController.cs
@@ -33,6 +33,8 @@ public record EventSlotDto
         public DateTimeOffset CreatedAt { get; set; }
         public DateTimeOffset UpdatedAt { get; set; }
         public EventSlotBookingController.EventBookingDto? Booking { get; set; }
+        public string? Callsign { get; set; }
+        public string? AircraftTypeIcao { get; set; }
 
         public EventSlotDto(EventSlot slot)
         {
@@ -45,6 +47,8 @@ public EventSlotDto(EventSlot slot)
             UpdatedAt = slot.UpdatedAt;
             LeaveAt = slot.LeaveAt;
             if (slot.Booking != null) Booking = new(slot.Booking);
+            Callsign = slot.Callsign;
+            AircraftTypeIcao = slot.AircraftTypeIcao;
         }
     }
 
@@ -91,6 +95,8 @@ public record CreateEventSlotDto
         public required Ulid AirspaceId { get; set; }
         public required DateTimeOffset EnterAt { get; set; }
         public DateTimeOffset? LeaveAt { get; set; }
+        public string? Callsign { get; set; }
+        public string? AircraftTypeIcao { get; set; }
     }
 
     [HttpPost]
@@ -104,6 +110,8 @@ public async Task<EventSlotDto> Create(Ulid eid, CreateEventSlotDto dto)
             EventAirspace = airspace,
             EnterAt = dto.EnterAt.ToUniversalTime(),
             LeaveAt = dto.LeaveAt?.ToUniversalTime(),
+            Callsign = dto.Callsign,
+            AircraftTypeIcao = dto.AircraftTypeIcao,
         };
         DbContext.EventSlot.Add(slot);
         await DbContext.SaveChangesAsync();
@@ -114,6 +122,8 @@ public record UpdateEventSlotDto
     {
         public required DateTimeOffset EnterAt { get; set; }
         public DateTimeOffset? LeaveAt { get; set; }
+        public string? Callsign { get; set; }
+        public string? AircraftTypeIcao { get; set; }
     }
 
     [HttpPut("{sid}")]
@@ -123,6 +133,8 @@ public async Task<EventSlotDto> Update(Ulid eid, Ulid sid, UpdateEventSlotDto dt
         var slot = await LoadAsync(eid, sid);
         slot.EnterAt = dto.EnterAt;
         slot.LeaveAt = dto.LeaveAt;
+        slot.Callsign = dto.Callsign;
+        slot.AircraftTypeIcao = dto.AircraftTypeIcao;
         await DbContext.SaveChangesAsync();
         return new(slot);
     }
diff --git a/Net.Vatprc.Uniapi/Migrations/20240915052017_EventSlotAddCallsignAndAircraftType.Designer.cs b/Net.Vatprc.Uniapi/Migrations/20240915052017_EventSlotAddCallsignAndAircraftType.Designer.cs
new file mode 100644
index 0000000..428d55b
--- /dev/null
+++ b/Net.Vatprc.Uniapi/Migrations/20240915052017_EventSlotAddCallsignAndAircraftType.Designer.cs
@@ -0,0 +1,546 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Net.Vatprc.Uniapi;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Net.Vatprc.Uniapi.Migrations
+{
+    [DbContext(typeof(VATPRCContext))]
+    [Migration("20240915052017_EventSlotAddCallsignAndAircraftType")]
+    partial class EventSlotAddCallsignAndAircraftType
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.2")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.Event", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<DateTimeOffset>("EndAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("end_at");
+
+                    b.Property<DateTimeOffset>("EndBookingAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("end_booking_at");
+
+                    b.Property<string>("ImageUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("image_url");
+
+                    b.Property<DateTimeOffset>("StartAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_at");
+
+                    b.Property<DateTimeOffset>("StartBookingAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_booking_at");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.HasKey("Id")
+                        .HasName("pk_event");
+
+                    b.ToTable("event", (string)null);
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.EventAirspace", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<Guid>("EventId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("event_id");
+
+                    b.Property<string[]>("IcaoCodes")
+                        .IsRequired()
+                        .HasColumnType("text[]")
+                        .HasColumnName("icao_codes");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.HasKey("Id")
+                        .HasName("pk_event_airspace");
+
+                    b.HasIndex("EventId")
+                        .HasDatabaseName("ix_event_airspace_event_id");
+
+                    b.ToTable("event_airspace", (string)null);
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.EventBooking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.Property<Guid>("EventSlotId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("event_slot_id");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_event_booking");
+
+                    b.HasIndex("EventSlotId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_event_booking_event_slot_id");
+
+                    b.HasIndex("UserId")
+                        .HasDatabaseName("ix_event_booking_user_id");
+
+                    b.ToTable("event_booking", (string)null);
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.EventSlot", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AircraftTypeIcao")
+                        .HasColumnType("text")
+                        .HasColumnName("aircraft_type_icao");
+
+                    b.Property<string>("Callsign")
+                        .HasColumnType("text")
+                        .HasColumnName("callsign");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.Property<DateTimeOffset>("EnterAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("enter_at");
+
+                    b.Property<Guid>("EventAirspaceId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("event_airspace_id");
+
+                    b.Property<DateTimeOffset?>("LeaveAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("leave_at");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.HasKey("Id")
+                        .HasName("pk_event_slot");
+
+                    b.HasIndex("EventAirspaceId")
+                        .HasDatabaseName("ix_event_slot_event_airspace_id");
+
+                    b.ToTable("event_slot", (string)null);
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.Notam", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<DateTimeOffset>("EffectiveFrom")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("effective_from");
+
+                    b.Property<DateTimeOffset>("ExpireAfter")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expire_after");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notam");
+
+                    b.ToTable("notam", (string)null);
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.NotamBinding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(34)
+                        .HasColumnType("character varying(34)")
+                        .HasColumnName("discriminator");
+
+                    b.Property<Guid>("NotamId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("notam_id");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notam_binding");
+
+                    b.HasIndex("NotamId")
+                        .HasDatabaseName("ix_notam_binding_notam_id");
+
+                    b.ToTable("notam_binding", (string)null);
+
+                    b.HasDiscriminator<string>("Discriminator").HasValue("NotamBinding");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.Session", b =>
+                {
+                    b.Property<Guid>("Token")
+                        .HasColumnType("uuid")
+                        .HasColumnName("token");
+
+                    b.Property<Guid?>("Code")
+                        .HasColumnType("uuid")
+                        .HasColumnName("code");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.Property<DateTimeOffset>("ExpiresIn")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expires_in");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<DateTimeOffset>("UserUpdatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("user_updated_at");
+
+                    b.HasKey("Token")
+                        .HasName("pk_session");
+
+                    b.HasIndex("UserId")
+                        .HasDatabaseName("ix_session_user_id");
+
+                    b.ToTable("session", (string)null);
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Cid")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("cid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("full_name");
+
+                    b.Property<string[]>("Roles")
+                        .IsRequired()
+                        .HasColumnType("text[]")
+                        .HasColumnName("roles");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated_at")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP");
+
+                    b.HasKey("Id")
+                        .HasName("pk_user");
+
+                    b.HasIndex("Cid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_user_cid");
+
+                    b.ToTable("user", (string)null);
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.NotamBindingEvent", b =>
+                {
+                    b.HasBaseType("Net.Vatprc.Uniapi.Models.NotamBinding");
+
+                    b.Property<Guid>("EventId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("event_id");
+
+                    b.HasIndex("EventId")
+                        .HasDatabaseName("ix_notam_binding_event_id");
+
+                    b.ToTable("notam_binding", (string)null);
+
+                    b.HasDiscriminator().HasValue("NotamBindingEvent");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.NotamBindingEventAirspace", b =>
+                {
+                    b.HasBaseType("Net.Vatprc.Uniapi.Models.NotamBinding");
+
+                    b.Property<Guid>("EventAirspaceId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("event_airspace_id");
+
+                    b.HasIndex("EventAirspaceId")
+                        .HasDatabaseName("ix_notam_binding_event_airspace_id");
+
+                    b.ToTable("notam_binding", (string)null);
+
+                    b.HasDiscriminator().HasValue("NotamBindingEventAirspace");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.NotamBindingIcaoCode", b =>
+                {
+                    b.HasBaseType("Net.Vatprc.Uniapi.Models.NotamBinding");
+
+                    b.Property<string>("IcaoCode")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("icao_code");
+
+                    b.HasIndex("IcaoCode")
+                        .HasDatabaseName("ix_notam_binding_icao_code");
+
+                    b.ToTable("notam_binding", (string)null);
+
+                    b.HasDiscriminator().HasValue("NotamBindingIcaoCode");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.EventAirspace", b =>
+                {
+                    b.HasOne("Net.Vatprc.Uniapi.Models.Event", "Event")
+                        .WithMany("Airspaces")
+                        .HasForeignKey("EventId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_event_airspace_event_event_id");
+
+                    b.Navigation("Event");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.EventBooking", b =>
+                {
+                    b.HasOne("Net.Vatprc.Uniapi.Models.EventSlot", "EventSlot")
+                        .WithOne("Booking")
+                        .HasForeignKey("Net.Vatprc.Uniapi.Models.EventBooking", "EventSlotId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_event_booking_event_slot_event_slot_id");
+
+                    b.HasOne("Net.Vatprc.Uniapi.Models.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_event_booking_user_user_id");
+
+                    b.Navigation("EventSlot");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.EventSlot", b =>
+                {
+                    b.HasOne("Net.Vatprc.Uniapi.Models.EventAirspace", "EventAirspace")
+                        .WithMany("Slots")
+                        .HasForeignKey("EventAirspaceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_event_slot_event_airspace_event_airspace_id");
+
+                    b.Navigation("EventAirspace");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.NotamBinding", b =>
+                {
+                    b.HasOne("Net.Vatprc.Uniapi.Models.Notam", "Notam")
+                        .WithMany("Bindings")
+                        .HasForeignKey("NotamId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_notam_binding_notam_notam_id");
+
+                    b.Navigation("Notam");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.Session", b =>
+                {
+                    b.HasOne("Net.Vatprc.Uniapi.Models.User", "User")
+                        .WithMany("Sessions")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_session_user_user_id");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.NotamBindingEvent", b =>
+                {
+                    b.HasOne("Net.Vatprc.Uniapi.Models.Event", "Event")
+                        .WithMany()
+                        .HasForeignKey("EventId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_notam_binding_event_event_id");
+
+                    b.Navigation("Event");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.NotamBindingEventAirspace", b =>
+                {
+                    b.HasOne("Net.Vatprc.Uniapi.Models.EventAirspace", "EventAirspace")
+                        .WithMany()
+                        .HasForeignKey("EventAirspaceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_notam_binding_event_airspace_event_airspace_id");
+
+                    b.Navigation("EventAirspace");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.Event", b =>
+                {
+                    b.Navigation("Airspaces");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.EventAirspace", b =>
+                {
+                    b.Navigation("Slots");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.EventSlot", b =>
+                {
+                    b.Navigation("Booking");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.Notam", b =>
+                {
+                    b.Navigation("Bindings");
+                });
+
+            modelBuilder.Entity("Net.Vatprc.Uniapi.Models.User", b =>
+                {
+                    b.Navigation("Sessions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Net.Vatprc.Uniapi/Migrations/20240915052017_EventSlotAddCallsignAndAircraftType.cs b/Net.Vatprc.Uniapi/Migrations/20240915052017_EventSlotAddCallsignAndAircraftType.cs
new file mode 100644
index 0000000..7bc28a7
--- /dev/null
+++ b/Net.Vatprc.Uniapi/Migrations/20240915052017_EventSlotAddCallsignAndAircraftType.cs
@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Net.Vatprc.Uniapi.Migrations
+{
+    /// <inheritdoc />
+    public partial class EventSlotAddCallsignAndAircraftType : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "aircraft_type_icao",
+                table: "event_slot",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "callsign",
+                table: "event_slot",
+                type: "text",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "aircraft_type_icao",
+                table: "event_slot");
+
+            migrationBuilder.DropColumn(
+                name: "callsign",
+                table: "event_slot");
+        }
+    }
+}
diff --git a/Net.Vatprc.Uniapi/Migrations/VATPRCContextModelSnapshot.cs b/Net.Vatprc.Uniapi/Migrations/VATPRCContextModelSnapshot.cs
index 5bbdff6..accaaee 100644
--- a/Net.Vatprc.Uniapi/Migrations/VATPRCContextModelSnapshot.cs
+++ b/Net.Vatprc.Uniapi/Migrations/VATPRCContextModelSnapshot.cs
@@ -167,6 +167,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("id");
 
+                    b.Property<string>("AircraftTypeIcao")
+                        .HasColumnType("text")
+                        .HasColumnName("aircraft_type_icao");
+
+                    b.Property<string>("Callsign")
+                        .HasColumnType("text")
+                        .HasColumnName("callsign");
+
                     b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
diff --git a/Net.Vatprc.Uniapi/Models/EventSlot.cs b/Net.Vatprc.Uniapi/Models/EventSlot.cs
index c3103e0..94562ce 100644
--- a/Net.Vatprc.Uniapi/Models/EventSlot.cs
+++ b/Net.Vatprc.Uniapi/Models/EventSlot.cs
@@ -19,6 +19,9 @@ public class EventSlot
 
     public EventBooking? Booking { get; set; }
 
+    public string? Callsign { get; set; }
+    public string? AircraftTypeIcao { get; set; }
+
     public class EventSlotConfiguration : IEntityTypeConfiguration<EventSlot>
     {
         public void Configure(EntityTypeBuilder<EventSlot> builder)