fix(SavedTripScreen): Initialize trip monitored days using itin transit leg svc date.

Author: binh-dam-ibigroup

__tests__/util/itinerary.js

@@ -1,6 +1,14 @@
 /* globals describe, expect, it */
 
-import { itineraryCanBeMonitored } from '../../lib/util/itinerary'
+import {
+  getTransitItineraryDefaultMonitoredDays,
+  itineraryCanBeMonitored
+} from '../../lib/util/itinerary'
+import { WEEKDAYS, WEEKEND_DAYS } from '../../lib/util/monitored-trip'
+
+const walkLeg = {
+  mode: 'WALK'
+}
 
 describe('util > itinerary', () => {
   describe('itineraryCanBeMonitored', () => {
@@ -20,9 +28,6 @@ describe('util > itinerary', () => {
       mode: 'MICROMOBILITY_RENT',
       rentedVehicle: true
     }
-    const walkLeg = {
-      mode: 'WALK'
-    }
     const rideHailLeg = {
       mode: 'CAR_HAIL',
       hailedCar: true
@@ -80,4 +85,53 @@ describe('util > itinerary', () => {
       })
     })
   })
+  describe('getTransitItineraryDefaultMonitoredDays', () => {
+    const transitLegWeekday = {
+      mode: 'BUS',
+      serviceDate: '20210609', // Wendesday
+      transitLeg: true
+    }
+    const transitLegSaturday = {
+      mode: 'BUS',
+      serviceDate: '20210612', // Saturday
+      transitLeg: true
+    }
+    const transitLegSunday = {
+      mode: 'BUS',
+      serviceDate: '20210613', // Sunday
+      transitLeg: true
+    }
+
+    const testCases = [{
+      expected: WEEKDAYS,
+      itinerary: {
+        legs: [walkLeg, transitLegWeekday]
+      },
+      title: 'should be [\'monday\' thru \'friday\'] for an itinerary starting on a weekday.'
+    }, {
+      expected: WEEKEND_DAYS,
+      itinerary: {
+        legs: [walkLeg, transitLegSaturday]
+      },
+      title: 'should be [\'saturday\', \'sunday\'] for an itinerary starting on a Saturday.'
+    }, {
+      expected: WEEKEND_DAYS,
+      itinerary: {
+        legs: [walkLeg, transitLegSunday]
+      },
+      title: 'should be [\'saturday\', \'sunday\'] for an itinerary starting on a Sunday.'
+    }, {
+      expected: null,
+      itinerary: {
+        legs: [walkLeg]
+      },
+      title: 'should be null for an itinerary without transit.'
+    }]
+
+    testCases.forEach(({ expected, itinerary, title }) => {
+      it(title, () => {
+        expect(getTransitItineraryDefaultMonitoredDays(itinerary)).toBe(expected)
+      })
+    })
+  })
 })

lib/components/user/monitored-trip/saved-trip-screen.js

@@ -14,7 +14,8 @@ import TripBasicsPane from './trip-basics-pane'
 import TripNotificationsPane from './trip-notifications-pane'
 import TripSummaryPane from './trip-summary-pane'
 import { TRIPS_PATH } from '../../../util/constants'
-import { ALL_DAYS, arrayToDayFields, WEEKDAYS } from '../../../util/monitored-trip'
+import { getTransitItineraryDefaultMonitoredDays } from '../../../util/itinerary'
+import { ALL_DAYS, arrayToDayFields } from '../../../util/monitored-trip'
 import { getActiveItineraries, getActiveSearch } from '../../../util/state'
 import { RETURN_TO_CURRENT_ROUTE } from '../../../util/ui'
 import withLoggedInUserSupport from '../with-logged-in-user-support'
@@ -60,8 +61,9 @@ class SavedTripScreen extends Component {
    */
   _createMonitoredTrip = () => {
     const { itinerary, loggedInUser, queryParams } = this.props
+    const monitoredDays = getTransitItineraryDefaultMonitoredDays(itinerary)
     return {
-      ...arrayToDayFields(WEEKDAYS),
+      ...arrayToDayFields(monitoredDays),
       arrivalVarianceMinutesThreshold: 5,
       departureVarianceMinutesThreshold: 5,
       excludeFederalHolidays: true,

lib/util/itinerary.js

@@ -1,6 +1,7 @@
 import { latLngBounds } from 'leaflet'
 import moment from 'moment'
 import coreUtils from '@opentripplanner/core-utils'
+import { WEEKDAYS, WEEKEND_DAYS } from './monitored-trip'
 
 export function getLeafletItineraryBounds (itinerary) {
   return latLngBounds(coreUtils.itinerary.getItineraryBounds(itinerary))
@@ -47,3 +48,29 @@ export function itineraryCanBeMonitored (itinerary) {
 export function getMinutesUntilItineraryStart (itinerary) {
   return moment(itinerary.startTime).diff(moment(), 'minutes')
 }
+
+/**
+ * Gets the first transit leg of the given itinerary, or null if none found.
+ */
+function getFirstTransitLeg (itinerary) {
+  return itinerary?.legs?.find(leg => leg.transitLeg)
+}
+
+/**
+ * Returns the set of monitored days that will be initially shown to the user
+ * for the given transit itinerary (itinerary with transit leg).
+ * @param itinerary The itinerary from which the default monitored days are extracted.
+ * @returns ['monday' thru 'friday'] if itinerary happens on a weekday(*),
+ *          ['saturday', 'sunday'] if itinerary happens on a saturday/sunday(*).
+ * (*) The first transit leg will be used to make the determination.
+ */
+export function getTransitItineraryDefaultMonitoredDays (itinerary) {
+  const firstTransitLeg = getFirstTransitLeg(itinerary)
+  // Assume a transit leg exists.
+  if (!firstTransitLeg) return null
+
+  const dayOfWeek = moment(firstTransitLeg.serviceDate, 'YYYYMMDD').day()
+  return (dayOfWeek === 0 || dayOfWeek === 6)
+    ? WEEKEND_DAYS
+    : WEEKDAYS
+}

lib/util/monitored-trip.js

@@ -1,5 +1,6 @@
 export const WEEKDAYS = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday']
-export const ALL_DAYS = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday']
+export const WEEKEND_DAYS = ['saturday', 'sunday']
+export const ALL_DAYS = [...WEEKDAYS, ...WEEKEND_DAYS]
 
 /**
  * Extracts the day of week fields of an object (e.g. a monitoredTrip) to an array.