From 3cbbc3c4da6c9a9422069c6d38558eaa0730f26e Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 28 Apr 2022 22:59:19 +0200
Subject: [PATCH] =?UTF-8?q?refreshJourney:=20return=20journey=20as=20field?=
 =?UTF-8?q?=20=F0=9F=92=A5=E2=9C=85=F0=9F=93=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/refresh-journey.md         | 6 ++++--
 index.js                        | 2 +-
 test/e2e/lib/refresh-journey.js | 5 +++--
 test/e2e/lib/validators.js      | 4 +++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/refresh-journey.md b/docs/refresh-journey.md
index f9e0d777..b8ed6bdb 100644
--- a/docs/refresh-journey.md
+++ b/docs/refresh-journey.md
@@ -30,8 +30,10 @@ const client = createClient(vbbProfile)
 const {journeys} = await client.journeys('900000003201', '900000100008', {results: 1})
 
 // later, fetch up-to-date info on the journey
-const journey = await client.refreshJourney(journeys[0].refreshToken, {stopovers: true, remarks: true})
-const {realtimeDataUpdatedAt} = journey
+const {
+	journey,
+	realtimeDataUpdatedAt,
+} = await client.refreshJourney(journeys[0].refreshToken, {stopovers: true, remarks: true})
 ```
 
 `journey` is a *single* [*Friendly Public Transport Format* v2 draft](https://github.com/public-transport/friendly-public-transport-format/blob/3bd36faa721e85d9f5ca58fb0f38cdbedb87bbca/spec/readme.md) `journey`, in the same format as returned by [`journeys()`](journeys.md).
diff --git a/index.js b/index.js
index a695c14d..010cbaad 100644
--- a/index.js
+++ b/index.js
@@ -262,10 +262,10 @@ const createClient = (profile, userAgent, opt = {}) => {
 		const ctx = {profile, opt, common, res}
 
 		return {
+			journey: profile.parseJourney(ctx, res.outConL[0]),
 			realtimeDataUpdatedAt: res.planrtTS && res.planrtTS !== '0'
 				? parseInt(res.planrtTS)
 				: null,
-			...profile.parseJourney(ctx, res.outConL[0])
 		}
 	}
 
diff --git a/test/e2e/lib/refresh-journey.js b/test/e2e/lib/refresh-journey.js
index f75827e8..e2238041 100644
--- a/test/e2e/lib/refresh-journey.js
+++ b/test/e2e/lib/refresh-journey.js
@@ -32,10 +32,11 @@ const testRefreshJourney = async (cfg) => {
 	t.equal(typeof model.refreshToken, 'string')
 	t.ok(model.refreshToken)
 
-	const refreshed = await refreshJourney(model.refreshToken, {
+	const refreshedRes = await refreshJourney(model.refreshToken, {
 		stopovers: false
 	})
-	validate(t, refreshed, 'refreshJourneyResult', 'refreshed')
+	validate(t, refreshedRes, 'refreshJourneyResult', 'refreshedRes')
+	const refreshed = refreshedRes.journey
 
 	t.same(simplify(refreshed), simplify(model))
 }
diff --git a/test/e2e/lib/validators.js b/test/e2e/lib/validators.js
index 04afb443..a5f8ff1f 100644
--- a/test/e2e/lib/validators.js
+++ b/test/e2e/lib/validators.js
@@ -433,9 +433,11 @@ const validateJourneysResult = (val, res, name = 'journeysResult') => {
 }
 
 const validateRefreshJourneyResult = (val, res, name = 'refreshJourneyResult') => {
-	val.journey(val, res, name + '.journey')
+	a.ok(isObj(res), name + ' must be an object')
 
 	val.realtimeDataUpdatedAt(val, res.realtimeDataUpdatedAt, name + '.realtimeDataUpdatedAt')
+
+	val.journey(val, res.journey, name + '.journey')
 }
 
 const validateTrip = (val, trip, name = 'trip') => {