Skip to content

Change Time/Time' to match new database schema and resolve compilation/type errors#1731

Open
Purplegaze wants to merge 11 commits into
Courseography:y-course-refactorfrom
Purplegaze:y-session-compilation
Open

Change Time/Time' to match new database schema and resolve compilation/type errors#1731
Purplegaze wants to merge 11 commits into
Courseography:y-course-refactorfrom
Purplegaze:y-session-compilation

Conversation

@Purplegaze

@Purplegaze Purplegaze commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Proposed Changes

Changes the Time and Time' datatypes to match the new one-session structure and re-wires them (resolving compilation and type errors) to properly display locations.

Currently, there is no logic implemented for courses with two rooms. Because of this, I have temporarily commented out one test in GetTable.test.js and left a TODO to re-implement it once this functionality is added.

...

Screenshots of your changes (if applicable)

Type of Change

(Write an X or a brief description next to the type or types that best describe your changes.)

Type Applies?
🚨 Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change that adds functionality)
🐛 Bug fix (non-breaking change that fixes an issue)
🎨 User interface change (change to user interface; provide screenshots)
♻️ Refactoring (internal change to codebase, without changing functionality) X
🚦 Test update (change that only adds or modifies tests)
📦 Dependency update (change that updates a dependency)
🔧 Internal (change that only affects developers or continuous integration)

Checklist

(Complete each of the following items for your pull request. Indicate that you have completed an item by changing the [ ] into a [x] in the raw text, or by clicking on the checkbox in the rendered description on GitHub.)

Before opening your pull request:

  • I have performed a self-review of my changes.
    • Check that all changed files included in this pull request are intentional changes.
    • Check that all changes are relevant to the purpose of this pull request, as described above.
  • I have added tests for my changes, if applicable.
    • This is required for all bug fixes and new features.
  • I have updated the project documentation, if applicable.
    • This is required for new features.
  • If this is my first contribution, I have added myself to the list of contributors.
  • I have updated the project Changelog (this is required for all changes).

After opening your pull request:

  • I have verified that the CircleCI checks have passed.
  • I have requested a review from a project maintainer.

Questions and Comments

(Include any questions or comments you have regarding your changes.)

@coveralls

Copy link
Copy Markdown

Coverage Report for CI Build 0

Coverage increased (+0.1%) to 57.459%

Details

  • Coverage increased (+0.1%) from the base build.
  • Patch coverage: 15 uncovered changes across 4 files (13 of 28 lines covered, 46.43%).
  • No coverage regressions found.

Uncovered Changes

File Changed Covered %
js/components/common/react_modal.js.jsx 10 4 40.0%
app/Database/Tables.hs 14 9 64.29%
app/Export/GetImages.hs 2 0 0.0%
app/Models/Meeting.hs 2 0 0.0%

Coverage Regressions

No coverage regressions found.


Coverage Stats

Coverage Status
Relevant Lines: 3934
Covered Lines: 2309
Line Coverage: 58.69%
Relevant Branches: 946
Covered Branches: 495
Branch Coverage: 52.33%
Branches in Coverage %: Yes
Coverage Strength: 163.54 hits per line

💛 - Coveralls

@Purplegaze Purplegaze requested a review from david-yz-liu June 9, 2026 17:08
})
})

/***

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than comment out this test, use jest.skip

getUniqueBuildings = nub . concatMap getMeetBuilding
where
getMeetBuildings (MeetTime _ times') = mapMaybe firstLocation' times' ++ mapMaybe secondLocation' times'
getMeetBuilding (MeetTime _ times') = mapMaybe location' times'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function name should not be changed. Multiple buildings can still be returned.

Comment thread app/Database/Tables.hs

data Time =
Time { weekDay :: Double,
Time { session :: Maybe T.Text,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall I do not want to have session and location reserved for accessor functions for this data type.

Please use the field names timeSession and timeLocation (and timeSession', timeLocation' for Time') and revert the renaming elsewhere.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants