Commit 05209d8f authored by Volker Krause's avatar Volker Krause
Browse files

Add Reservation::reservationStatus

This is needed to model cancellations, a currently unfortunately widely
needed feature. This requires a few changes to our enum (de)serialization
to be compliant with JSON-LD. And due to this having a default value it
causes quite some changes in the test files, adding the new property.

This does not actually make use of the property yet, besides from parsing
both the new and legacy forms from JSON-LD.
parent 372f0843
......@@ -22,6 +22,7 @@
"flightNumber": "8724"
},
"reservationNumber": "ABCDEFG",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M1DOE/JOHN EABCDEFGMRSLGWEZY8724 99 3C 506 10Axxxxxxxxxx"
......
......@@ -22,6 +22,7 @@
"flightNumber": "834"
},
"reservationNumber": "ABC123",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M1DESMARAIS/LUC EABC123 YULFRAAC 0834 326J001A0025 100"
......
......@@ -22,6 +22,7 @@
"flightNumber": "834"
},
"reservationNumber": "AB12C3",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M1DESMARAIS/LUC EAB12C3 YULFRAAC 0834 326J003A0027 167>5321WW1325BAC 0014123456002001412346700100141234789012A0141234567890 1AC AC 1234567890123 4PCYLX58Z^108ABCDEFGH"
......
......@@ -22,6 +22,7 @@
"flightNumber": "123"
},
"reservationNumber": "ABC123",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M1GRANDMAIRE/MELANIE EABC123 GVACDGAF 0123 339C002F0025 130>5002A0571234567890 AF AF 1234567890123456 Y^18ABCDEFGH"
......
......@@ -22,6 +22,7 @@
"flightNumber": "834"
},
"reservationNumber": "AB12C3",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M2DESMARAIS/LUC EAB12C3 YULFRAAC 0834 326J003A0027 167>5321WW1325BAC 0014123456002001412346700100141234789012A0141234567890 1AC AC 1234567890123 4PCYLX58ZDEF456 FRAGVALH 3664 327C012C0002 12E2A0140987654321 1AC AC 1234567890123 3PCNWQ^108ABCDEFGH"
......@@ -55,6 +56,7 @@
"flightNumber": "3664"
},
"reservationNumber": "DEF456",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M2DESMARAIS/LUC EAB12C3 YULFRAAC 0834 326J003A0027 167>5321WW1325BAC 0014123456002001412346700100141234789012A0141234567890 1AC AC 1234567890123 4PCYLX58ZDEF456 FRAGVALH 3664 327C012C0002 12E2A0140987654321 1AC AC 1234567890123 3PCNWQ^108ABCDEFGH"
......
......@@ -22,6 +22,7 @@
"flightNumber": "123"
},
"reservationNumber": "ABC123",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M2GRANDMAIRE/MELANIE EABC123 GVACDGAF 0123 339C002F0025 130>5002A0571234567890 AF AF 1234567890123456 YDEF456 CDGDTWNW 0049 339F001A0002 12C2A012098765432101 2PC ^18ABCDEFGH"
......@@ -55,6 +56,7 @@
"flightNumber": "49"
},
"reservationNumber": "DEF456",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M2GRANDMAIRE/MELANIE EABC123 GVACDGAF 0123 339C002F0025 130>5002A0571234567890 AF AF 1234567890123456 YDEF456 CDGDTWNW 0049 339F001A0002 12C2A012098765432101 2PC ^18ABCDEFGH"
......
......@@ -22,6 +22,7 @@
"flightNumber": "2588"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M1DOE/JOHN EXXX007 TXLBRUSN 2588 034Y023D0999 35D>5181WM7034BSN 2A08200000000000 SN LH 123456789012345 *30600000K0902 "
......
......@@ -20,6 +20,7 @@
"flightNumber": "2592"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M1DOE/JOHN EXXX007 TXLBRUSN 2592 110Y"
......
......@@ -20,6 +20,7 @@
"flightNumber": "2592"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M1DOE/JOHN EXXX007 TXLBRUSN 2592 110"
......
......@@ -22,6 +22,7 @@
"flightNumber": "8103"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M1DOE/JOHN XXX007 BRUTXLEW 8103 035Y012C0030 147>1181W 8033BEW 0000000000000291040000000000 0 LH 123456789012345 "
......
......@@ -22,6 +22,7 @@
"flightNumber": "1080"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketToken": "aztecCode:M1DOE/JOHN EXXX007 LISLCGTP 1080 204Y002D0003 35C>2180 B1A 2904712345678900 *306 09 BRND"
......
......@@ -14,7 +14,7 @@ X-KDE-KITINERARY-RESERVATION:[{"@context":"http://schema.org"\,"@type":
"20126"\,"streetAddress":"Piazza dell'Ateneo Nuovo\, 1"}\,"name":
"University of Milano-Bicocca"}\,"name":"Akademy 2019"\,"startDate":
{"@type":"QDateTime"\,"@value":"2019-09-07T09:30:00+02:00"\,"timezone":
"Europe/Rome"}}\,"reservationNumber":"42"\,"underName":{"@type":
"Europe/Rome"}}\,"reservationNumber":"42"\,"reservationStatus":"http://schema.org/ReservationConfirmed","underName":{"@type":
"Person"\,"name":"Dr Konqui"}}\,{"@context":"http://schema.org"\,"@type":
"EventReservation"\,"reservationFor":{"@type":"Event"\,"endDate":{"@type":
"QDateTime"\,"@value":"2019-07-13T16:30:00+02:00"\,"timezone":
......@@ -24,7 +24,7 @@ X-KDE-KITINERARY-RESERVATION:[{"@context":"http://schema.org"\,"@type":
"20126"\,"streetAddress":"Piazza dell'Ateneo Nuovo\, 1"}\,"name":
"University of Milano-Bicocca"}\,"name":"Akademy 2019"\,"startDate":
{"@type":"QDateTime"\,"@value":"2019-09-07T09:30:00+02:00"\,"timezone":
"Europe/Rome"}}\,"reservationNumber":"42"\,"underName":{"@type":
"Europe/Rome"}}\,"reservationNumber":"42"\,"reservationStatus":"http://schema.org/ReservationConfirmed","underName":{"@type":
"Person"\,"name":"Katie Dragon"}}]
CREATED:20171227T111649Z
UID:KIT-1234567890-1b22236a-21ff-4885-8c99-b3b2bbca062c
......
......@@ -33,7 +33,7 @@ X-KDE-KITINERARY-RESERVATION:[{"@context":"http://schema.org"\,"@type":
"2017-09-20"\,"departureGate":"16"\,"departureTime":{"@type":
"QDateTime"\,"@value":"2017-09-20T15:05:00+03:00"\,"timezone":
"Europe/Helsinki"}\,"flightNumber":"8075"}\,"reservationNumber":
"XXX007"\,"reservedTicket":{"@type":"Ticket"\,"ticketToken":"https://checkin.airberlin.com/app/barcode.fly?pnr=XXX007&ln=DOE&cpid=12345678&fn=JOHN"}\,"underName":{"@type":"Person"\,"name":"JOHN DOE"}}]
"XXX007"\,"reservationStatus":"http://schema.org/ReservationConfirmed","reservedTicket":{"@type":"Ticket"\,"ticketToken":"https://checkin.airberlin.com/app/barcode.fly?pnr=XXX007&ln=DOE&cpid=12345678&fn=JOHN"}\,"underName":{"@type":"Person"\,"name":"JOHN DOE"}}]
BEGIN:VALARM
DESCRIPTION:Boarding for flight AB 8075 at gate 16
ACTION:DISPLAY
......
......@@ -20,7 +20,7 @@ X-KDE-KITINERARY-RESERVATION:[{"@context":"http://schema.org"\,"@type":
"PostalAddress"\,"addressCountry":"FI"\,"addressLocality":
"Espoo"\,"addressRegion":""\,"postalCode":"02600"\,"streetAddress":
"Leppävaarankatu 1"}\,"name":"Glo Hotel Sello"\,"telephone":
"+358101234567"\,"url":"https://www.booking.com/hotel/fi/palace-sello.html?aid=123456&label=postbooking_confemail"}\,"reservationNumber":"1234567890"\,"underName":{"@type":
"+358101234567"\,"url":"https://www.booking.com/hotel/fi/palace-sello.html?aid=123456&label=postbooking_confemail"}\,"reservationNumber":"1234567890"\,"reservationStatus":"http://schema.org/ReservationConfirmed","underName":{"@type":
"Person"\,"email":"john.doe@email.com"\,"name":"John Doe"}\,"url":"https://secure.booking.com/mybooking.en-gb.html?aid=123456\;auth_key=magic&&source=conf_metadata&pbsource=conf_email_modify"}]
END:VEVENT
END:VCALENDAR
......@@ -24,7 +24,7 @@ X-KDE-KITINERARY-RESERVATION:[{"@context":"http://schema.org"\,"@type":
"TrainStation"\,"geo":{"@type":"GeoCoordinates"\,"latitude":
43.83229064941406\,"longitude":4.365845203399658}\,"name":"Nîmes Gare"}\,"departureTime":"2017-09-29T18:26:00+02:00"\,"provider":{"@type":
"Organization"\,"name":"SNCF"}\,"trainName":"TGV"\,"trainNumber":
"5186"}\,"reservationNumber":"XXX007"\,"reservedTicket":{"@type":
"5186"}\,"reservationNumber":"XXX007"\,"reservationStatus":"http://schema.org/ReservationConfirmed","reservedTicket":{"@type":
"Ticket"\,"ticketToken":"aztecCode:somerandomdata DOE JOHN111110 00000"\,"ticketedSeat":{"@type":
"Seat"\,"seatNumber":"62"\,"seatSection":"17","seatingType":"Economy"}}\,"underName":{"@type":
"Person"\,"name":"John Doe"}\,"url":"https://www.trainline.fr/tickets"}]
......
......@@ -50,7 +50,8 @@
},
"flightNumber": "9520"
},
"reservationNumber": "123456"
"reservationNumber": "123456",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -104,7 +105,8 @@
},
"flightNumber": "139"
},
"reservationNumber": "123456"
"reservationNumber": "123456",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -159,7 +161,8 @@
},
"flightNumber": "8573"
},
"reservationNumber": "123456"
"reservationNumber": "123456",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -213,6 +216,7 @@
},
"flightNumber": "8680"
},
"reservationNumber": "123456"
"reservationNumber": "123456",
"reservationStatus": "http://schema.org/ReservationConfirmed"
}
]
......@@ -31,6 +31,7 @@
"telephone": "+43 1 602 1234 5678"
},
"reservationNumber": "AOI-XX-1234567",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "John Doe"
......
......@@ -50,7 +50,8 @@
},
"flightNumber": "2588"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -103,6 +104,7 @@
},
"flightNumber": "2591"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
}
]
......@@ -17,6 +17,7 @@
"departureTime": "2019-08-06T17:50:00",
"trainNumber": "EC 283"
},
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......@@ -44,6 +45,7 @@
"departureTime": "2019-08-06T19:03:00",
"trainNumber": "R 1262"
},
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......@@ -70,6 +72,7 @@
},
"departureTime": "2019-08-06T19:33:00",
"trainNumber": "Bus 501262"
}
},
"reservationStatus": "http://schema.org/ReservationConfirmed"
}
]
......@@ -17,6 +17,7 @@
"departureTime": "2017-01-01T16:55:00",
"trainNumber": "Os 9424"
},
"reservationNumber": "VM5MZ3"
"reservationNumber": "VM5MZ3",
"reservationStatus": "http://schema.org/ReservationConfirmed"
}
]
......@@ -17,6 +17,7 @@
"departureTime": "2017-12-31T13:51:00",
"trainNumber": "EC 173"
},
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......@@ -44,6 +45,7 @@
"departureTime": "2018-01-01T10:38:00",
"trainNumber": "rj 72"
},
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......
......@@ -18,6 +18,7 @@
"trainNumber": "RJ 76"
},
"reservationNumber": "FXI305",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......
......@@ -18,6 +18,7 @@
"trainNumber": "R 945"
},
"reservationNumber": "Z39230",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......@@ -45,6 +46,7 @@
"departureTime": "2017-08-09T11:02:00",
"trainNumber": "Sp 1786"
},
"reservationNumber": "Z39230"
"reservationNumber": "Z39230",
"reservationStatus": "http://schema.org/ReservationConfirmed"
}
]
......@@ -20,6 +20,7 @@
"trainNumber": "EC 171"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......@@ -50,6 +51,7 @@
"trainNumber": "EC 170"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......
......@@ -19,7 +19,8 @@
"departureTime": "2027-02-10T08:37:00",
"trainNumber": "IC 148"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -41,6 +42,7 @@
"departureTime": "2027-02-12T16:08:00",
"trainNumber": "IC 147"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
}
]
......@@ -20,6 +20,7 @@
"trainNumber": "EC 170"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......
......@@ -20,6 +20,7 @@
"trainNumber": "ICE 954"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......@@ -49,7 +50,8 @@
"departureTime": "2027-11-03T12:17:00",
"trainNumber": "S0"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -71,7 +73,8 @@
"departureTime": "2027-11-04T14:06:00",
"trainNumber": "S0"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -94,6 +97,7 @@
"trainNumber": "ICE 641"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......
......@@ -19,7 +19,8 @@
"departureTime": "2026-12-28T15:06:00",
"trainNumber": "S0"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -42,6 +43,7 @@
"trainNumber": "ICE 943"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......
......@@ -50,7 +50,8 @@
},
"flightNumber": "8462"
},
"reservationNumber": "ABC123"
"reservationNumber": "ABC123",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -103,6 +104,7 @@
},
"flightNumber": "8465"
},
"reservationNumber": "ABC123"
"reservationNumber": "ABC123",
"reservationStatus": "http://schema.org/ReservationConfirmed"
}
]
......@@ -51,6 +51,7 @@
"flightNumber": "212"
},
"reservationNumber": "ABCDEF",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "John Doe"
......@@ -108,6 +109,7 @@
"flightNumber": "211"
},
"reservationNumber": "ABCDEF",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "John Doe"
......
......@@ -51,6 +51,7 @@
"flightNumber": "6439"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "Jane Doe"
......@@ -108,6 +109,7 @@
"flightNumber": "6439"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "John Doe"
......@@ -165,6 +167,7 @@
"flightNumber": "7392"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "Jane Doe"
......@@ -222,6 +225,7 @@
"flightNumber": "7392"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "John Doe"
......@@ -279,6 +283,7 @@
"flightNumber": "086"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "Jane Doe"
......@@ -336,6 +341,7 @@
"flightNumber": "086"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "John Doe"
......@@ -393,6 +399,7 @@
"flightNumber": "7421"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "Jane Doe"
......@@ -450,6 +457,7 @@
"flightNumber": "7421"
},
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "John Doe"
......
......@@ -51,7 +51,8 @@
},
"flightNumber": "3677"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -105,7 +106,8 @@
},
"flightNumber": "8588"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -159,7 +161,8 @@
},
"flightNumber": "8603"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
},
{
"@context": "http://schema.org",
......@@ -212,6 +215,7 @@
},
"flightNumber": "3186"
},
"reservationNumber": "XXX007"
"reservationNumber": "XXX007",
"reservationStatus": "http://schema.org/ReservationConfirmed"
}
]
......@@ -30,6 +30,7 @@
}
},
"reservationNumber": "42",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "Dr Konqui"
......@@ -66,6 +67,7 @@
}
},
"reservationNumber": "42",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"underName": {
"@type": "Person",
"name": "Katie Dragon"
......
......@@ -42,6 +42,7 @@
"trainNumber": "12138"
},
"reservationNumber": "2438941616",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {
"@type": "Ticket",
"ticketedSeat": {
......
......@@ -24,6 +24,7 @@
"departureTime": "2012-08-11T09:30:00"
},
"reservationNumber": "0123456789",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"reservedTicket": {