Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KItinerary
Commits
99a20bc6
Commit
99a20bc6
authored
Jan 24, 2020
by
Volker Krause
Browse files
Fix merging of separate train tickets and ticket-less seat reservations
parent
2ddee1c0
Changes
4
Hide whitespace changes
Inline
Side-by-side
autotests/mergedata/train-nrt-res.lhs.json
0 → 100644
View file @
99a20bc6
[
{
"@context"
:
"http://schema.org"
,
"@type"
:
"TrainReservation"
,
"modifiedTime"
:
"2020-01-14T00:00:00Z"
,
"reservationFor"
:
{
"@type"
:
"TrainTrip"
,
"arrivalPlatform"
:
"4 A-C"
,
"arrivalStation"
:
{
"@type"
:
"TrainStation"
,
"name"
:
"Köln Hbf"
},
"arrivalTime"
:
"2019-02-03T10:15:00"
,
"departureDay"
:
"2019-02-03"
,
"departurePlatform"
:
"3"
,
"departureStation"
:
{
"@type"
:
"TrainStation"
,
"name"
:
"Bruxelles"
},
"departureTime"
:
"2019-02-03T08:32:00"
,
"trainNumber"
:
"ICE 13"
},
"reservationNumber"
:
"XXX007"
,
"reservedTicket"
:
{
"@type"
:
"Ticket"
,
"ticketToken"
:
"aztecbin:foo"
,
"ticketedSeat"
:
{
"@type"
:
"Seat"
,
"seatingType"
:
"2"
}
},
"underName"
:
{
"@type"
:
"Person"
,
"familyName"
:
"Konqui"
,
"givenName"
:
"Dragon"
,
"name"
:
"Konqui Dragon"
}
}
]
autotests/mergedata/train-nrt-res.merged.json
0 → 100644
View file @
99a20bc6
[
{
"@context"
:
"http://schema.org"
,
"@type"
:
"TrainReservation"
,
"modifiedTime"
:
"2020-01-14T00:00:00Z"
,
"reservationFor"
:
{
"@type"
:
"TrainTrip"
,
"arrivalPlatform"
:
"4 A-C"
,
"arrivalStation"
:
{
"@type"
:
"TrainStation"
,
"name"
:
"Köln Hbf"
},
"arrivalTime"
:
"2019-02-03T10:15:00"
,
"departureDay"
:
"2019-02-03"
,
"departurePlatform"
:
"3"
,
"departureStation"
:
{
"@type"
:
"TrainStation"
,
"name"
:
"Bruxelles"
},
"departureTime"
:
"2019-02-03T08:32:00"
,
"trainNumber"
:
"ICE 13"
},
"reservationNumber"
:
"XXX007"
,
"reservedTicket"
:
{
"@type"
:
"Ticket"
,
"ticketToken"
:
"aztecbin:foo"
,
"ticketedSeat"
:
{
"@type"
:
"Seat"
,
"seatNumber"
:
"42"
,
"seatSection"
:
"23"
,
"seatingType"
:
"2"
}
},
"underName"
:
{
"@type"
:
"Person"
,
"familyName"
:
"Konqui"
,
"givenName"
:
"Dragon"
,
"name"
:
"Konqui Dragon"
}
}
]
autotests/mergedata/train-nrt-res.rhs.json
0 → 100644
View file @
99a20bc6
[
{
"@context"
:
"http://schema.org"
,
"@type"
:
"TrainReservation"
,
"modifiedTime"
:
"2020-01-14T00:00:00Z"
,
"reservationFor"
:
{
"@type"
:
"TrainTrip"
,
"arrivalPlatform"
:
"4 A-C"
,
"arrivalStation"
:
{
"@type"
:
"TrainStation"
,
"name"
:
"Köln Hbf"
},
"arrivalTime"
:
"2019-02-03T10:15:00"
,
"departureDay"
:
"2019-02-03"
,
"departurePlatform"
:
"3"
,
"departureStation"
:
{
"@type"
:
"TrainStation"
,
"name"
:
"Bruxelles"
},
"departureTime"
:
"2019-02-03T08:32:00"
,
"trainNumber"
:
"ICE 13"
},
"reservedTicket"
:
{
"@type"
:
"Ticket"
,
"ticketedSeat"
:
{
"@type"
:
"Seat"
,
"seatNumber"
:
"42"
,
"seatSection"
:
"23"
,
"seatingType"
:
"2"
}
}
}
]
src/mergeutil.cpp
View file @
99a20bc6
...
...
@@ -126,7 +126,7 @@ bool MergeUtil::isSame(const QVariant& lhs, const QVariant& rhs)
if
(
JsonLd
::
isA
<
TrainReservation
>
(
lhs
))
{
const
auto
lhsRes
=
lhs
.
value
<
TrainReservation
>
();
const
auto
rhsRes
=
rhs
.
value
<
TrainReservation
>
();
if
(
lhsRes
.
reservationNumber
()
!=
rhsRes
.
reservationNumber
())
{
if
(
conflictIfPresent
(
lhsRes
.
reservationNumber
()
,
rhsRes
.
reservationNumber
())
)
{
return
false
;
}
return
isSame
(
lhsRes
.
reservationFor
(),
rhsRes
.
reservationFor
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment