parseHours: Handle dayOfYear wraparound

I really don't know if this is anywhere near correct, but it seems to
resolve the Jest failures we're getting.

Previously, `m`'s dayOfYear was applied to both `open` and `close`, but
if `m` was in the next year, then its `dayOfYear` would be low, and
 `open` and `close` would be freely wrapped around to the beginning of
the year.

Now, `parseHours` checks if `open` or `close` are six months prior to
`m`, and if so, adds `1` year.  `m` is used only to provide context to
"10am" and such kinds of strings, so I think this is a safe bet.

Signed-off-by: Kristofer Rye <[email protected]>
Tested-by: Kristofer Rye <[email protected]>

Author: rye

source/views/building-hours/lib/parse-hours.js

@@ -6,6 +6,8 @@ import {TIME_FORMAT, CENTRAL_TZ} from './constants'
 
 type HourPairType = {open: moment, close: moment}
 
+// TODO: Do "dayOfYear" handling better so that we don't need to handle wrapping at
+// the 6 month mark. (See #3375 for why this function changed.)
 export function parseHours(
 	{from: fromTime, to: toTime}: SingleBuildingScheduleType,
 	m: moment,
@@ -20,9 +22,19 @@ export function parseHours(
 	let open = moment.tz(fromTime, TIME_FORMAT, true, CENTRAL_TZ)
 	open.dayOfYear(dayOfYear)
 
+	let sixMonthsAgo = moment(m).subtract(6, 'months')
+
+	if (open.isBefore(sixMonthsAgo)) {
+		open.add(1, 'year')
+	}
+
 	let close = moment.tz(toTime, TIME_FORMAT, true, CENTRAL_TZ)
 	close.dayOfYear(dayOfYear)
 
+	if (close.isBefore(sixMonthsAgo)) {
+		close.add(1, 'year')
+	}
+
 	if (close.isBefore(open)) {
 		close.add(1, 'day')
 	}