move common helper functions into lib/util.js

lib/journeys.js

@@ -10,12 +10,14 @@ const uniq = require('lodash/uniq')
 const sortBy = require('lodash/sortBy')
 const slug = require('slugg')
 
+const {
+	formatDateTime: formatInputDate,
+	parseDateTime: formatOutputDate,
+	normalizeEmpty: m,
+	parseSparseStation: createStation,
+} = require('./util')
 const fetch = require('./fetch')
 
-const m = (a) => ((a === undefined || a === '') ? null : a)
-const formatInputDate = (date) => moment(date).tz('Europe/Berlin').format('DD.MM.YYYY')
-const formatOutputDate = (date) => moment.unix(+date.timestamp).utcOffset(date.tz).format()
-
 const createOperator = (o) => ({
 	type: 'operator',
 	id: o.key,
@@ -24,13 +26,6 @@ const createOperator = (o) => ({
 	address: o.address,
 })
 
-const createStation = (s) => ({
-	type: 'station',
-	id: s.id + '',
-	name: s.name,
-	importance: Number.isInteger(s.importance_order) ? s.importance_order : null,
-})
-
 const extractLegs = (rawOrigin, rawDestination, rawJourney) => {
 	let {
 		departure,

lib/regions.js

@@ -3,8 +3,9 @@
 const fetch = require('./fetch')
 const merge = require('lodash/merge')
 const intoStream = require('into-stream').object
-
-const m = (a) => ((a === undefined || a === '') ? null : a)
+const {
+	normalizeEmpty: m,
+} = require('./util')
 
 const defaults = {
 }

lib/stations.js

@@ -4,33 +4,31 @@ const csv = require('tiny-csv')
 const merge = require('lodash/merge')
 const fetch = require('./fetch')
 const intoStream = require('into-stream').object
-
-const m = (a) => ((a === undefined || a === '') ? null : a)
+const {
+	normalizeEmpty: m,
+	parseStation,
+} = require('./util')
 
 const defaults = {
 }
 
 const formatCountry = (country) => (country ? { name: m(country.name), code: m(country.alpha2_code) } : null)
 
-const createStation = (station) => ({
-	type: 'station',
-	id: station.id + '',
-	name: m(station.name),
-	location: {
-		type: 'location',
-		longitude: m(station.coordinates.longitude),
-		latitude: m(station.coordinates.latitude),
-		address: m(station.full_address),
-		country: formatCountry(station.country),
-		zip: station.zip,
-		street: m(station.address),
-	},
-	slug: m(station.slugs),
-	aliases: (station.aliases ? csv(station.aliases) : null),
-	regions: [m(station.city_id + '')].filter((x) => !!x),
-	connections: m(station.pairs),
-	importance: m(+station.importance_order),
-})
+const createStation = (station) => {
+	const res = parseStation(station)
+	return {
+		...res,
+		location: {
+			...res.location,
+			country: formatCountry(station.country),
+			zip: station.zip,
+		},
+		slug: m(station.slugs),
+		aliases: (station.aliases ? csv(station.aliases) : null),
+		regions: [m(station.city_id + '')].filter((x) => !!x),
+		connections: m(station.pairs),
+	}
+}
 
 const allAsync = async (opt) => {
 	const options = merge({}, defaults, opt)

lib/util.js

@@ -0,0 +1,41 @@
+'use strict'
+
+const moment = require('moment-timezone')
+
+const formatDateTime = (date) => {
+	return moment(date).tz('Europe/Berlin').format('DD.MM.YYYY')
+}
+
+const parseDateTime = (date) => {
+	return moment.unix(+date.timestamp).utcOffset(date.tz).format()
+}
+
+const normalizeEmpty = (val) => {
+	return (val === undefined || val === '') ? null : val
+}
+
+const parseSparseStation = (s) => ({
+	type: 'station',
+	id: s.id + '',
+	name: normalizeEmpty(s.name),
+})
+
+const parseStation = (s) => ({
+	...parseSparseStation(s),
+	location: {
+		type: 'location',
+		longitude: normalizeEmpty(s.coordinates.longitude),
+		latitude: normalizeEmpty(s.coordinates.latitude),
+		address: normalizeEmpty(s.full_address),
+		street: normalizeEmpty(s.address),
+	},
+	importance: Number.isInteger(s.importance_order) ? normalizeEmpty(+s.importance_order) : null,
+})
+
+module.exports = {
+	formatDateTime,
+	parseDateTime,
+	normalizeEmpty,
+	parseSparseStation,
+	parseStation,
+}