refactor: 🚨 fixed dependency loop + fixed SVCs with gaps during the day to show "resume" status properly

Author: kagiura

website/src/utils/mobility.ts

@@ -0,0 +1,65 @@
+import isbServicesJSON from '../data/isb-services.json';
+
+const isbServices = isbServicesJSON;
+
+export const timeIsBefore = (a: Date, b: string) => {
+  const parse = (x: string) => parseInt(x, 10);
+  const ta = new Date(0, 0, 0, a.getHours(), a.getMinutes());
+  const tb = new Date(0, 0, 0, ...b.split(':').map(parse));
+  return ta < tb;
+};
+
+export const timeIsAfter = (a: Date, b: string) => !timeIsBefore(a, b);
+
+export const isWithinBlock = (time: Date, block: ScheduleBlock) => {
+  const { from, to } = block;
+  return timeIsBefore(time, to) && timeIsAfter(time, from);
+};
+
+export const getServiceStatus = (period: 'term' | 'vacation' = 'term') => {
+  const time = new Date();
+  // used to debug:
+  // time.setHours(time.getHours() - 2);
+
+  const serviceStatuses: ServiceStatus[] = isbServices.map((service) => {
+    const todaySchedule = service.schedule[period][time.getDay()];
+    const currentBlock = todaySchedule.find((t) => isWithinBlock(time, t));
+    if (currentBlock) {
+      return {
+        id: service.id,
+        running: true,
+        currentBlock,
+      };
+    }
+
+    let nextBlock;
+    let i = -1;
+    while (!nextBlock && i < 7) {
+      i += 1;
+      // if this day has schedule
+      if (service.schedule[period][(time.getDay() + i) % 7].length > 0) {
+        if (i === 0) {
+          // today
+          nextBlock = todaySchedule.find((t) => timeIsBefore(time, t.from));
+        } else [nextBlock] = service.schedule[period][(time.getDay() + i) % 7];
+      }
+    }
+
+    console.log(nextBlock, i, 'service:', service.id);
+    if (nextBlock) {
+      return {
+        id: service.id,
+        running: false,
+        runningThisPeriod: true,
+        nextDay: (time.getDay() + i) % 7,
+        nextTime: nextBlock.from,
+      };
+    }
+    return {
+      id: service.id,
+      running: false,
+      runningThisPeriod: false,
+    };
+  });
+  return serviceStatuses;
+};

website/src/views/mobility/MobilityContainer/MobilityContainer.tsx

@@ -8,7 +8,7 @@ import useScrollToTop from 'views/hooks/useScrollToTop';
 
 import LocationMap from 'views/components/bus-map/LocationMap';
 import NoFooter from 'views/layout/NoFooter';
-import { set } from 'lodash';
+import { getServiceStatus } from 'utils/mobility';
 import styles from './MobilityContainer.scss';
 import ServiceDetails from '../ServiceDetails';
 import ServiceList from '../ServiceList';
@@ -44,64 +44,6 @@ const getRouteSegments = (stops: string[], color: string) => {
   return routes;
 };
 
-const timeIsBefore = (a: Date, b: string) => {
-  const parse = (x: string) => parseInt(x, 10);
-  const ta = new Date(0, 0, 0, a.getHours(), a.getMinutes());
-  const tb = new Date(0, 0, 0, ...b.split(':').map(parse));
-  return ta < tb;
-};
-
-const isWithinBlock = (time: Date, block: ScheduleBlock) => {
-  const { from, to } = block;
-  return timeIsBefore(time, to) && !timeIsBefore(time, from);
-};
-
-export { isWithinBlock };
-
-const getServiceStatus = (period: 'term' | 'vacation' = 'vacation') => {
-  const time = new Date();
-  // +12 hrs
-  // time.setHours(time.getHours() + 8 + 24);
-  const serviceStatuses: ServiceStatus[] = isbServices.map((service) => {
-    const todaySchedule = service.schedule[period][time.getDay()];
-    const currentBlock = todaySchedule.find((t) => isWithinBlock(time, t));
-    if (currentBlock) {
-      return {
-        id: service.id,
-        running: true,
-        currentBlock,
-      };
-    }
-
-    let nextBlock;
-    let i = -1;
-
-    while (!nextBlock && i < 7) {
-      i += 1;
-      // if this day has schedule
-      if (service.schedule[period][(time.getDay() + i) % 7].length > 0) {
-        [nextBlock] = service.schedule[period][(time.getDay() + i) % 7];
-      }
-    }
-
-    if (nextBlock) {
-      return {
-        id: service.id,
-        running: false,
-        runningThisPeriod: true,
-        nextDay: (time.getDay() + i) % 7,
-        nextTime: nextBlock.from,
-      };
-    }
-    return {
-      id: service.id,
-      running: false,
-      runningThisPeriod: false,
-    };
-  });
-  return serviceStatuses;
-};
-
 const MobilityContainer = () => {
   useScrollToTop();
 

website/src/views/mobility/ServiceDetails.tsx

@@ -4,11 +4,11 @@ import classNames from 'classnames';
 import ButtonGroupSelector from 'views/components/ButtonGroupSelector';
 import { useState } from 'react';
 import { ChevronDown, ChevronUp } from 'react-feather';
+import { isWithinBlock } from 'utils/mobility';
 import isbServicesJSON from '../../data/isb-services.json';
 import isbStopsJSON from '../../data/isb-stops.json';
 
 import styles from './ServiceDetails.scss';
-import { isWithinBlock } from './MobilityContainer/MobilityContainer';
 
 const isbServices = isbServicesJSON;
 const isbStops = isbStopsJSON;