Fix updated Träwelling API

Too many changes to summarise, basically fix API breakage until I can
successfully check in

Author: dancojocaru2000

src/app/api/dashboard/route.ts

@@ -36,7 +36,7 @@ export async function GET(request: Request) {
 
     transformedData.forEach((status) => {
       status.journey.line.appearance = getAppearanceForLine(
-        identifyLineByMagic(status.journey.hafasTripId, status.journey.line)
+        status.journey.line,
       );
     });
 

src/app/api/stations/[station]/route.ts

@@ -2,7 +2,7 @@ import { identifyLineByMagic } from '@/helpers/identifyLineByMagic';
 import { createLineAppearanceDataset } from '@/helpers/lineAppearance';
 import { authOptions } from '@/pages/api/auth/[...nextauth]';
 import { TraewellingSdk } from '@/traewelling-sdk';
-import { transformHAFASTrip } from '@/traewelling-sdk/transformers';
+import { transformTrwlDeparture } from '@/traewelling-sdk/transformers';
 import { TransportType } from '@/traewelling-sdk/types';
 import { AboardStation, AboardTrip } from '@/types/aboard';
 import createErrorResponse from '@/utils/api/createErrorResponse';
@@ -84,12 +84,12 @@ export async function GET(
         } as AboardStation,
         times: data.meta?.times,
       },
-      trips: data.trips.map(transformHAFASTrip),
+      trips: data.trips.map(transformTrwlDeparture),
     };
 
     transformedData.trips.forEach((trip) => {
       trip.line.appearance = getAppearanceForLine(
-        identifyLineByMagic(trip.hafasId, trip.line)
+        trip.line,
       );
     });
 

src/app/api/trips/route.ts

@@ -7,9 +7,9 @@ import { getServerSession } from 'next-auth';
 
 export async function GET(request: Request) {
   try {
-    const { hafasTripId, lineName, start } = getSafeURLParams({
+    const { hafasTripId, lineName } = getSafeURLParams({
       url: request.url,
-      requiredParams: ['hafasTripId', 'lineName', 'start'],
+      requiredParams: ['hafasTripId', 'lineName'],
     });
 
     const session = await getServerSession(authOptions);
@@ -23,7 +23,6 @@ export async function GET(request: Request) {
     const data = await TraewellingSdk.trains.trip({
       hafasTripId,
       lineName,
-      start,
     });
 
     return createResponse({

src/app/status/[id]/page.tsx

@@ -31,13 +31,11 @@ async function getStatusData(id: string) {
 async function getTripData(
   hafasTripId: string,
   lineName: string,
-  start: string
 ) {
   try {
     const trip = await TraewellingSdk.trains.trip({
       hafasTripId,
       lineName,
-      start,
     });
 
     if (!('id' in trip)) {
@@ -70,7 +68,6 @@ export default async function Page({ params }: StatusPageProps) {
   const tripData = await getTripData(
     status.journey.hafasTripId,
     status.journey.line.name,
-    status.journey.origin.station.trwlId!.toString()
   );
 
   if ('trwlId' in tripData) {

src/app/traewelling/trips/route.ts

@@ -7,9 +7,9 @@ import { getServerSession } from 'next-auth';
 
 export async function GET(request: Request) {
   try {
-    const { hafasTripId, lineName, start } = getSafeURLParams({
+    const { hafasTripId, lineName } = getSafeURLParams({
       url: request.url,
-      requiredParams: ['hafasTripId', 'lineName', 'start'],
+      requiredParams: ['hafasTripId', 'lineName'],
     });
 
     const session = await getServerSession(authOptions);
@@ -23,7 +23,6 @@ export async function GET(request: Request) {
     const data = await TraewellingSdk.trains.trip({
       hafasTripId,
       lineName,
-      start,
     });
 
     return createResponse({

src/components/CheckIn/CheckIn.tsx

@@ -3,7 +3,7 @@
 import { useCurrentStatus } from '@/hooks/useCurrentStatus/useCurrentStatus';
 import useUmami from '@/hooks/useUmami/useUmami';
 import { CheckinInput } from '@/traewelling-sdk/functions/trains';
-import { Station, Stop } from '@/traewelling-sdk/types';
+import { Station, Stopover } from '@/traewelling-sdk/types';
 import { AboardTrip } from '@/types/aboard';
 import { Session } from 'next-auth';
 import { useSession } from 'next-auth/react';
@@ -49,12 +49,12 @@ const post = async (status: CheckinInput, session?: Session | null) => {
 const CheckIn = () => {
   const { data: session } = useSession();
   const [departureTime, setDepartureTime] = useState<string>();
-  const [destination, setDestination] = useState<Stop>();
+  const [destination, setDestination] = useState<Stopover>();
   const [error, setError] = useState<string>();
   const [isOpen, setIsOpen] = useState(false);
   const [message, setMessage] = useState('');
   const [origin, setOrigin] =
-    useState<Pick<Station, 'id' | 'ibnr' | 'name' | 'rilIdentifier'>>();
+    useState<Station>();
   const [query, setQuery] = useState('');
   const [step, setStep] = useState<CheckInStep>('origin');
   const [travelType, setTravelType] = useState(0);
@@ -73,10 +73,9 @@ const CheckIn = () => {
           body: message,
           business: travelType,
           departure: trip?.departure?.planned!,
-          destination: destination!.evaIdentifier,
-          ibnr: true,
+          destination: destination!.id,
           lineName: trip!.line.name,
-          start: trip?.departureStation?.ibnr!,
+          start: trip?.departureStation?.trwlId ?? -1,
           tripId: trip!.hafasId!,
           visibility: visibility,
         },

src/components/CheckIn/DestinationStep/DestinationStep.tsx

@@ -25,7 +25,7 @@ const DestinationStep = () => {
     trip?.hafasId ?? '',
     trip?.line.name ?? '',
     trip?.departure?.planned ?? '',
-    trip?.departureStation?.evaId?.toString() ?? ''
+    trip?.departureStation?.trwlId ?? -1,
   );
 
   const schedule = parseSchedule({
@@ -101,11 +101,11 @@ const DestinationStep = () => {
                 {stops.map((stop, index) => (
                   <li key={index}>
                     <Stop
-                      arrivalAt={stop.arrival ?? stop.departure}
+                      arrivalAt={stop.arrivalReal ?? stop.arrivalPlanned ?? stop.departureReal ?? stop.departurePlanned}
                       isCancelled={stop.cancelled}
                       isDelayed={
                         stop.isArrivalDelayed ||
-                        (!stop.arrival && stop.isDepartureDelayed)
+                        (!stop.arrivalReal && stop.isDepartureDelayed)
                       }
                       name={stop.name}
                       onClick={() => setDestination(stop)}

src/components/CheckIn/FinalStep/FinalStep.tsx

@@ -17,6 +17,7 @@ import {
   MdOutlineGroups,
   MdOutlineLockOpen,
   MdOutlineLockPerson,
+  MdShield,
   MdSwapCalls,
   MdWorkOutline,
 } from 'react-icons/md';
@@ -61,6 +62,10 @@ const VISIBILITIES = [
     icon: <MdFingerprint size={18} />,
     name: 'Nur angemeldete Personen',
   },
+  {
+    icon: <MdShield size={18} />,
+    name: 'Nur vertrauten Personen',
+  },
 ];
 
 const FinalStep = () => {
@@ -80,7 +85,7 @@ const FinalStep = () => {
   } = useContext(CheckInContext);
 
   const arrivalSchedule = parseSchedule({
-    actual: destination?.arrival,
+    actual: destination?.arrivalReal,
     planned: destination?.arrivalPlanned!,
   });
 

src/components/CheckIn/OriginStep/OriginStep.tsx

@@ -32,12 +32,12 @@ const OriginStep = () => {
                 {stations && stations.length > 0 && (
                   <ul className={styles.stationList}>
                     {stations.map((station) => (
-                      <li key={station.ibnr}>
+                      <li key={station.id}>
                         <Station
                           name={station.name}
                           onClick={() => setOrigin(station)}
                           query={query}
-                          rilIdentifier={station.rilIdentifier}
+                          rilIdentifier={station.identifiers.filter(id => id.type === 'de_db_ril100')[0]?.identifier}
                         />
                       </li>
                     ))}
@@ -71,11 +71,11 @@ const OriginStep = () => {
               {recentStations && recentStations.length > 0 && (
                 <ul className={styles.stationList}>
                   {recentStations.map((station) => (
-                    <li key={station.ibnr}>
+                    <li key={station.id}>
                       <Station
                         name={station.name}
                         onClick={() => setOrigin(station)}
-                        rilIdentifier={station.rilIdentifier}
+                        rilIdentifier={station.identifiers.filter(id => id.type === 'de_db_ril100')[0]?.identifier}
                       />
                     </li>
                   ))}

src/components/CheckIn/Search/Search.tsx

@@ -60,12 +60,7 @@ const Search = () => {
       simpleEvent('nearby_clicked');
 
       const station = (await response.json()) as NearbyResponse;
-      setOrigin({
-        id: station.id,
-        ibnr: station.ibnr,
-        name: station.name,
-        rilIdentifier: station.rilIdentifier,
-      });
+      setOrigin(station);
     });
   };