feat: capital grains override #195

cirex-web · 2025-08-22T21:06:07Z

Moves overwrites over to DiningParser constructor (yay dependency injection! This helps with writing cleaner tests as well)
Adds feature to overwrite time strings per location on a per-day basis. Input format for overwrites should be the same as how dining formats it. This also makes it incredibly easy to add overwrites in the future.
- (If you look at this PR's diff, you'll notice that we now parse the Date response header when scraping the Dining website. We do so to get the current year, since that's not included in the HTML itself. And yes, we can find the year locally, but using the response header date means that we know for sure the HTML corresponds to the date. May be a bit overkill now that I'm thinking about it, but it doesn't hurt)
Adds tests for overwrite functionality.

Example of how we can overwrite times:

/**
 * key is in the format of MM/DD/YY (omit the first digit of the month if it's 0. same thing for day. (ex: Miku day is represented as 3/9/25))
 * NOTE: There is no coalescing between the existing time string for that day and the overwritten time string.
 * If you choose to overwrite that day, you must do so completely.
 */
export const timeSlotOverwrites: IAllTimeOverwrites = {
  // capital grains override
  // won't be open until 9/13
  179: {
    "8/22/25": ["CLOSED"],
    "8/23/25": ["CLOSED"],
    "8/24/25": ["CLOSED"],
    "8/25/25": ["CLOSED"],
    "8/26/25": ["CLOSED"],
    "8/27/25": ["CLOSED"],
    "8/28/25": ["CLOSED"],
    "8/29/25": ["CLOSED"],
    "8/30/25": ["CLOSED"],
    "8/31/25": ["CLOSED"],
    "9/1/25": ["CLOSED"],
    "9/2/25": ["CLOSED"],
    "9/3/25": ["CLOSED"],
    "9/4/25": ["CLOSED"],
    "9/5/25": ["CLOSED"],
    "9/6/25": ["CLOSED"],
    "9/7/25": ["CLOSED"],
    "9/8/25": ["CLOSED"],
    "9/9/25": ["CLOSED"],
    "9/10/25": ["CLOSED"],
    "9/11/25": ["CLOSED"],
    "9/12/25": ["CLOSED"],
  },
};

#190) * fix: coalesce intervals if gap is 1 min, and do wrap-around coalescing * fix: unparseable tokens should be ignored * chore: remove extraneous comment * fix: redo the merging algo

…to feat/time-overwrites

cirex-web · 2025-08-23T02:00:04Z

don't mind the commits... I made this branch off of main instead of staging. my bad

at least the diff is fine.

cirex-web · 2025-08-23T02:34:10Z

I pushed a temp commit to main for now

…me slot overrides

laasyaaki

Thanks for the PR Eric! Looks good to me for now. We can convert this to SQL once the admin dashboard is further along

GhostOf0days · 2025-09-05T18:23:01Z

src/containers/timeBuilder.ts

-  const timeInfo: ITimeRowAttributes = {};
-
-  for (const token of tokens) {
+  for (const token of timeSlotStrings) {


Maybe rename token to a more intuitive name.

Change tokens to be clearer.

GhostOf0days · 2025-09-05T18:23:25Z

src/containers/timeBuilder.ts

      }
    } catch (err: any) {
      notifySlack(
-        `<!channel> Failed to parse token \`${token}\` from list of tokens \`${tokens}\`\n${err.stack}`
+        `<!channel> Failed to parse token \`${token}\` from time slot \`${timeSlotStrings.join(


GhostOf0days · 2025-09-05T18:35:41Z

src/utils/requestUtils.ts

@@ -20,7 +22,20 @@ export async function getHTMLResponse(
        url: url.toString(),
      });

-    return response.data;
+    const attemptedParsedDate = DateTime.fromRFC2822(


Is there a particular reason for this over ISO 8601 or RFC 3339?

last time I checked, the date field in the response header should be in RFC2822 format. wikipedia says it's RFC9110. maybe it's the same thing?

JackHurew

I'd wait for Jaisal's approval.

JackHurew · 2025-09-07T16:26:47Z

src/containers/timeBuilder.ts

-  const timeInfo: ITimeRowAttributes = {};
-
-  for (const token of tokens) {
+  for (const token of timeSlotStrings) {


Change tokens to be clearer.

JackHurew · 2025-09-07T16:27:35Z

src/overwrites/timeOverwrites.ts

+    "8/30/2025": ["CLOSED"],
+    "8/31/2025": ["CLOSED"],
+    "9/1/2025": ["CLOSED"],
+    "9/2/2025": ["CLOSED"],


There has got to be a more concise way to do this.

lol usually you would override a single day, I think

JackHurew · 2025-09-07T16:29:12Z

src/utils/slack.ts

+  if (env.IN_TEST_MODE) {
+    console.log("would've notified slack with message", message);
+    return;
+  }


Do you clarify anywhere that this exists (test mode/this effect)? Maybe in readme?

IN_TEST_MODE is set when tests are run (see package.json)

Oh I figured it could also be used to allow us to stop spamming slack bot playground channel too.

laasyaaki and others added 11 commits August 18, 2025 22:53

Manually added locations

857ab8a

cleaned up a bit

a149074

latest

3d8674e

seperated locations

10fe297

Revert "Manually added off campus flex only locations"

37f72e7

fix: coalesce intervals if gap is 1 min, and do wrap-around coalescing (

46332cd

#190) * fix: coalesce intervals if gap is 1 min, and do wrap-around coalescing * fix: unparseable tokens should be ignored * chore: remove extraneous comment * fix: redo the merging algo

feat: capital grains override

e9ff386

chore: remove console.log

1e4c2d0

fix: fix existing tests

9ad006d

tests: add tests for overwrites

54fd9b2

fix: notify when response date header becomes unparseable

56b33b7

cirex-web requested review from GhostOf0days, laasyaaki and JackHurew August 23, 2025 01:56

cirex-web changed the base branch from main to staging August 23, 2025 01:56

Merge branch 'staging' of https://github.com/ScottyLabs/dining-api in…

ee2dafb

…to feat/time-overwrites

cirex-web added 2 commits September 4, 2025 20:00

refactor: rework the entire parsing algorithm to better accomodate ti…

e2e18ec

…me slot overrides

chore: update time slot overwrite description

b1ea9a9

laasyaaki approved these changes Sep 5, 2025

View reviewed changes

GhostOf0days requested changes Sep 5, 2025

View reviewed changes

JackHurew reviewed Sep 7, 2025

View reviewed changes

feat: capital grains override #195

Are you sure you want to change the base?

feat: capital grains override #195

Uh oh!

Conversation

cirex-web commented Aug 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cirex-web commented Aug 23, 2025

Uh oh!

cirex-web commented Aug 23, 2025

Uh oh!

laasyaaki left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JackHurew Sep 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JackHurew left a comment

Choose a reason for hiding this comment

Uh oh!

JackHurew Sep 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cirex-web commented Aug 22, 2025 •

edited

Loading

JackHurew Sep 7, 2025 •

edited

Loading

JackHurew Sep 7, 2025 •

edited

Loading