move parseSparseTrip to lib/util.js

juliuste · Apr 15, 2020 · 18718c5 · 18718c5
1 parent 75f0eed
commit 18718c5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/lib/trip.js b/lib/trip.js
@@ -5,6 +5,7 @@ const {
 	parseOperator,
 	parseStopover,
 	normalizeEmpty,
+	parseSparseTrip,
 } = require('./util')
 const fetch = require('./fetch')
 
@@ -21,18 +22,13 @@ const trip = async (tripId, opt = {}) => {
 	const [trip] = t.trips
 
 	return {
-		id: t.uid,
+		...parseSparseTrip(t.uid, trip),
 		tripType: t.type, // don't conflict with FPTF's `type`
-		direction: trip.line_direction,
-		lineName: trip.line_code,
-		operator: trip.operated_by ? parseOperator(trip.operated_by) : null,
-		cancelled: trip.is_cancelled === true,
 		realtimeDataUpdatedAt: (
 			t.real_time_info && t.real_time_info.status !== 'too_soon'
 			? parseDateTime(t.real_time_info.updated_at)
 			: null
 		),
-		stopovers: trip.stops.map(st => parseStopover(st)),
 		hasTracker: normalizeEmpty(trip.has_tracker),
 		// @todo trip.messages
 	}

diff --git a/lib/util.js b/lib/util.js
@@ -104,6 +104,18 @@ const parseStopover = (st) => {
 	}
 }
 
+const parseSparseTrip = (id, trip) => {
+	return {
+		id,
+		direction: trip.line_direction,
+		// @todo fall back to parsing trip.line_direction?
+		lineName: normalizeEmpty(trip.line_code),
+		operator: trip.operated_by ? parseOperator(trip.operated_by) : null,
+		cancelled: normalizeEmpty(trip.is_cancelled),
+		stopovers: trip.stops ? trip.stops.map(st => parseStopover(st)) : null,
+	}
+}
+
 module.exports = {
 	formatDateTime,
 	parseDateTime,
@@ -113,4 +125,5 @@ module.exports = {
 	parseOperator,
 	parseWhen,
 	parseStopover,
+	parseSparseTrip,
 }