Skip to content

feat: serving "off"/closed dining periods #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
matt-franklin225 wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

feat: serving "off"/closed dining periods #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a85719
change "off" dining periods to midnight through midnight
matt-franklin225 Mar 13, 2026
9a8bce1
dining restaurantToday start/end times made nullable
matt-franklin225 Mar 13, 2026
5b79b5b
dining restaurantToday start/end times made nullable
matt-franklin225 Mar 13, 2026
8f797d7
letting dining parseOpeningHours time arrays hold null values
matt-franklin225 Mar 13, 2026
317a2f9
fixing dining array nulls error
matt-franklin225 Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/api/src/schema/dining.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ export const restaurantTodayResponseSchema = restaurantSchema.extend({
z.string().openapi({ description: "The ID of a period." }),
z.object({
name: z.string().openapi({ description: "The name of a period", example: "Lunch" }),
startTime: z.iso.time(),
endTime: z.iso.time(),
startTime: z.iso.time().nullable(),
endTime: z.iso.time().nullable(),
stationToDishes: z.record(
z.string().openapi({ description: "The ID of a station." }),
z.string().array().openapi({
Expand Down
68 changes: 21 additions & 47 deletions apps/data-pipeline/dining-scraper/src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export function parseOpeningHours(hoursString: string): [WeekTimes, WeekTimes] {
Sa: 6,
};

const openingTime: string[] = new Array(7).fill("");
const closingTime: string[] = new Array(7).fill("");
const openingTime: (string | null)[] = new Array(7).fill("");
const closingTime: (string | null)[] = new Array(7).fill("");

const timeBlocks = hoursString
.split(";")
Expand All @@ -31,67 +31,41 @@ export function parseOpeningHours(hoursString: string): [WeekTimes, WeekTimes] {
continue;
}

const [dayRangeStr, timeRangeStr] = parts; // "Mo-Fr", "07:15-11:00 OR off"
const [dayRangeStr, timeRangeStr] = parts;
let openTime = null;
let closeTime = null;

if (!dayRangeStr || !timeRangeStr) {
continue;
}

// If the timeRange is off, then we need not do anything (it is not open)
if (timeRangeStr === "off") {
continue;
}

const [openTime, closeTime] = timeRangeStr.split("-"); // "07:15", "11:00"

if (!openTime || !closeTime) {
console.warn(`[parseOpeningHours]: Skipping block with incomplete time range: ${block}`);
continue;
// Only parse the range if it isn't "off"
if (timeRangeStr !== "off") {
const times = timeRangeStr.split("-");
if (times.length < 2) {
console.warn(`[parseOpeningHours]: Incomplete time range: ${block}`);
continue;
}
[openTime, closeTime] = times;
}

const dayIndices: number[] = [];

// Case: Day Range (e.g., "Mo-Fr")
if (dayRangeStr.includes("-")) {
const dayParts = dayRangeStr.split("-");

if (dayParts.length < 2) {
console.warn(
`[parseOpeningHours]: Skipping block with malformed day range: ${dayRangeStr}}`,
);
continue;
}

const startDay = dayParts[0];
const endDay = dayParts[1];

if (!startDay || !endDay) {
continue;
}

const [startDay, endDay] = dayRangeStr.split("-");
const startIndex = DAY_MAP[startDay];
const endIndex = DAY_MAP[endDay];

if (startIndex === undefined || endIndex === undefined) {
console.warn(`Skipping block with unknown day range: ${dayRangeStr}`);
console.warn(`Skipping unknown day range: ${dayRangeStr}`);
continue;
}

// handles if date range wraps around (i.e. Mo-Su)
if (startIndex <= endIndex) {
for (let i = startIndex; i <= endIndex; i++) {
dayIndices.push(i);
}
} else {
for (let i = startIndex; i < 7; i++) {
dayIndices.push(i);
}
for (let i = 0; i <= endIndex; i++) {
dayIndices.push(i);
}
// Logic to handle wrap-around (e.g., Fr-Mo)
let curr = startIndex;
while (curr !== endIndex) {
dayIndices.push(curr);
curr = (curr + 1) % 7;
}
dayIndices.push(endIndex);
} else {
// Case: Single Day (e.g., "Mo")
const singleIndex = DAY_MAP[dayRangeStr];
if (singleIndex !== undefined) {
dayIndices.push(singleIndex);
Expand Down
Loading