Skip to content

Use minimal copy of TripResult for TRR #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deka91 merged 2 commits into from
Jul 17, 2025
Merged

Use minimal copy of TripResult for TRR #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
269e83a
Use minimal copy of TripResult for TRR
deka91 Jul 16, 2025
1ed782a
Remove trim function from FareClassConverter
deka91 Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sdk/src/main/java/ch/opentransportdata/ojp/data/dto/converter/FareClassConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import com.tickaroo.tikxml.TypeConverter
internal class FareClassConverter : TypeConverter<FareClass> {

override fun read(ojpValue: String): FareClass {
return when (ojpValue.trim()) {
return when (ojpValue) {
"unknown" -> FareClass.UNKNOWN
"firstClass" -> FareClass.FIRST_CLASS
"secondClass" -> FareClass.SECOND_CLASS
"secondClass " -> FareClass.SECOND_CLASS
else -> FareClass.UNKNOWN
}
}
Expand All @@ -22,7 +22,7 @@ internal class FareClassConverter : TypeConverter<FareClass> {
return when (type) {
FareClass.UNKNOWN -> "unknown"
FareClass.FIRST_CLASS -> "firstClass"
FareClass.SECOND_CLASS -> "secondClass"
FareClass.SECOND_CLASS -> "secondClass "
}
}
}
5 changes: 3 additions & 2 deletions sdk/src/main/java/ch/opentransportdata/ojp/data/dto/response/tir/LegDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import ch.opentransportdata.ojp.data.dto.response.tir.leg.AbstractLegType
import ch.opentransportdata.ojp.data.dto.response.tir.leg.ContinuousLegDto
import ch.opentransportdata.ojp.data.dto.response.tir.leg.TimedLegDto
import ch.opentransportdata.ojp.data.dto.response.tir.leg.TransferLegDto
import ch.opentransportdata.ojp.data.dto.response.tir.leg.minimalCopy
import ch.opentransportdata.ojp.data.dto.response.tir.leg.replaceWithParentRef
import com.tickaroo.tikxml.annotation.Element
import com.tickaroo.tikxml.annotation.PropertyElement
Expand Down Expand Up @@ -39,9 +40,9 @@ fun LegDto.minimalCopy(): LegDto {
return LegDto(
id = id,
duration = duration,
timedLeg = timedLeg,
timedLeg = timedLeg?.minimalCopy(),
transferLeg = transferLeg,
continuousLeg = continuousLeg
continuousLeg = continuousLeg?.minimalCopy()
)
}

Expand Down
3 changes: 2 additions & 1 deletion sdk/src/main/java/ch/opentransportdata/ojp/data/remote/trip/RemoteTripDataSourceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import ch.opentransportdata.ojp.data.dto.request.tir.TripVia
import ch.opentransportdata.ojp.data.dto.request.trr.TripRefineParamDto
import ch.opentransportdata.ojp.data.dto.request.trr.TripRefineRequestDto
import ch.opentransportdata.ojp.data.dto.response.tir.TripResultDto
import ch.opentransportdata.ojp.data.dto.response.tir.minimalTripResult
import ch.opentransportdata.ojp.data.remote.OjpService
import ch.opentransportdata.ojp.domain.model.LanguageCode
import ch.opentransportdata.ojp.domain.model.TripParams
Expand Down Expand Up @@ -93,7 +94,7 @@ internal class RemoteTripDataSourceImpl(
tripRefineRequest = TripRefineRequestDto(
requestTimestamp = requestTime,
params = params?.mapToBackendParams(),
result = tripResultDto,
result = tripResultDto.minimalTripResult,
)
)
)
Expand Down
Loading