Skip to content
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.

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

planner: Fix 'nOf' prereq check with module code wildcards #3758

Merged
merged 7 commits into from
Aug 17, 2024

Conversation

Wxy2003-xy
Copy link
Contributor

@Wxy2003-xy Wxy2003-xy commented Jul 31, 2024

Context

#3740 prerequisite check logic for nOf wildcard case not working as intended

Separately, we now also disambiguate conflict texts involving 'and', 'or', and 'nOf' prereq fragments.

Implementation

handle wildcard case in nOf cases separately from normal course code

Other Information

Copy link

vercel bot commented Jul 31, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
nusmods-export ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 17, 2024 8:10am
nusmods-website ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 17, 2024 8:10am

Copy link

vercel bot commented Jul 31, 2024

@Wxy2003-xy is attempting to deploy a commit to the modsbot's projects Team on Vercel.

A member of the Team first needs to authorize it.

Copy link

codecov bot commented Aug 17, 2024

Codecov Report

Attention: Patch coverage is 77.50000% with 9 lines in your changes missing coverage. Please review.

Project coverage is 54.85%. Comparing base (2d4743d) to head (1c54bda).
Report is 10 commits behind head on master.

Files Patch % Lines
website/src/utils/planner.ts 74.28% 9 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3758      +/-   ##
==========================================
+ Coverage   53.87%   54.85%   +0.97%     
==========================================
  Files         274      274              
  Lines        6032     6049      +17     
  Branches     1449     1446       -3     
==========================================
+ Hits         3250     3318      +68     
+ Misses       2782     2731      -51     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zwliew zwliew changed the title Fixed nOf % case prerequisite check logic planner: Fix prereq check for 'nOf' with wildcard module codes Aug 17, 2024
@zwliew zwliew changed the title planner: Fix prereq check for 'nOf' with wildcard module codes planner: Fix prereq check for 'nOf' with module code wildcards Aug 17, 2024
@zwliew zwliew changed the title planner: Fix prereq check for 'nOf' with module code wildcards planner: Fix 'nOf' prereq check with module code wildcards Aug 17, 2024
@zwliew
Copy link
Member

zwliew commented Aug 17, 2024

Thank you. I refactored the code a bit to reduce code duplication and fixed an annoying disambiguity when displaying conflict texts involving multiple 'or', 'and', and 'nOf' fragments.

@zwliew zwliew merged commit ad81631 into nusmodifications:master Aug 17, 2024
6 checks passed
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.

2 participants