-
Notifications
You must be signed in to change notification settings - Fork 13
fix(degreeworks): Provide Polymorphic requirements for majors with specializations #310
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
Open
HwijungK
wants to merge
104
commits into
main
Choose a base branch
from
polymorphic-majors
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
104 commits
Select commit
Hold shift + click to select a range
5336574
refactored RuleBase type to have a nullable proxyAdvice
HwijungK 70da258
added degreeworksSpecRequirment to schema
HwijungK 1a05141
added ifElsePart property to RuleBase
HwijungK bddc87a
push DWSpecRequirement when encountering match in ruleArrayToReq
HwijungK a761de2
added requireSpec to schema
HwijungK 480abb6
migrated db and did some pg testing
HwijungK 6359bdb
updated pnpm
HwijungK cf4e1a0
added requireSpec field to graphql schema
HwijungK 9b396a7
made requireSpec a nonnullable type
HwijungK 5bcd14e
remigrated db after making requireSpec nonNullable
HwijungK e8f271c
added comments for evaluating spec req
HwijungK 02106bb
filtered out DegreeworksSpecRequirement when adding to db to reduce r…
HwijungK b1744ff
removed 2 migrations so that we could redo
HwijungK 50e0f4f
reran migration with --name flag
HwijungK ba20f4f
refactored parsedPrograms to store majorDegrees of (major, spec) pairs
HwijungK c7c3997
save found major, spec pairs when finding specs
HwijungK c561897
temp commit, upserting is currently broken
HwijungK ae555a4
Merge branch 'main' into polymorphic-majors
HwijungK a32e91a
encoded parsed Program key into a string instead of a list so that ma…
HwijungK a42d151
saved spec_id in major_requirement in coorect - format to match with …
HwijungK c44cba0
feat: changed schema to contain major_spec_pair_to_requirement table …
HwijungK 11c23a5
Auogenerate id in major_spec_pair_to_requirement table
HwijungK f9e8b26
db migration
HwijungK 0fbcf18
deleted outdated numbered migration files
HwijungK e621ebf
Merge branch 'main' into optional-spec
HwijungK 97f7985
re-migrated
HwijungK bd47eaa
made specRequirement a subtype of markerRequirement
HwijungK 2b81a70
hard coded setting ChemE to have opitonal Specs
HwijungK 1a56be0
refactored major_requirement table to use hashed json as its primary key
HwijungK b67922f
removed debug logs used during testing
HwijungK 950864c
reran migration
HwijungK d4171d3
seperated parsing of specialization requirement to different function
HwijungK c236259
added requiresSpecialization member to Degree Works Program Type
HwijungK 0dd2141
refactored index to get requiredSpecialization data from the Degreeor…
HwijungK 8393667
removed DegreeWorksRequireSpecialization type
HwijungK b363c76
refactored hard coding requirespec to false for chemE major
HwijungK d56e89c
removed migrations for merge
HwijungK 4c21532
Merge branch 'main' into optional-spec
HwijungK 5fcca0a
reverted packaageManager update
HwijungK fd8a69b
renamed require_spec to specialization_required
HwijungK b203d33
set specializationRequired to false if the program doesn't have any s…
HwijungK 6155d8a
renamed function in Audit parser
HwijungK 47adb63
cleaned code in checking for required specs
HwijungK 3c23a25
cleaned code for filtering out 0 spec programs with specializationReq…
HwijungK 88ef8cf
updated comment in schema
HwijungK 587cba2
updated comment in schema
HwijungK d7b193d
fixed bug in pushing to specs from spec-cache
HwijungK 0e377e9
Merge branch 'optional-spec' of github.com:icssc/anteater-api into op…
HwijungK 68960ee
Merge branch 'optional-spec' of github.com:icssc/anteater-api into op…
HwijungK b3cc6e0
refactored spec-cache type to store major as a programRequirement ins…
HwijungK efef8b5
Merge branch 'optional-spec' of github.com:icssc/anteater-api into op…
HwijungK 6f593b3
update comments
HwijungK e83d798
update comments
HwijungK 2f07907
removed redundant parsing of programs in post-proccessing step
HwijungK e0d6f52
Merge branch 'optional-spec' of github.com:icssc/anteater-api into op…
HwijungK 715875a
Merge branch 'optional-spec' into polymorphic-majors
HwijungK 43e193b
Merge branch 'optional-spec' into polymorphic-majors
HwijungK 063f3a2
still push specs into programs
HwijungK 43c6aa6
moved specCodes into MajorProgram type
HwijungK 517606c
Revert "still push specs into programs"
HwijungK 7ad24f3
Revert "moved specCodes into MajorProgram type"
HwijungK f3ff2d2
Revert "Revert "still push specs into programs""
HwijungK 38d60a8
converted programTriplets into programQuadruplets by adding spec code
HwijungK 1fc8bb6
refacotred MajorProgram type to be an object with added specId property
HwijungK edc450e
added specId to MajorProgram
HwijungK 00ef310
moved hard coding of chemE optional spec into audit parser instead of…
HwijungK 9cc6e46
added specialization id parameter to rest endpoint for major req
HwijungK 5dfa44a
refactored service to not cause compile error
HwijungK fa72438
implemented graphql endpoints
HwijungK df9425c
clearer description for specializationID parameter
HwijungK 1dc6b07
reorganized conditional structure of services
HwijungK 1d6dd56
reset delay on DW client to 1000
HwijungK fbd2fe4
removed debugging comments from dw index
HwijungK eff2c3d
changed 'spec' into 'specCode'
HwijungK 046230d
updated comments in scraper
HwijungK 34c0db8
moved chemE optional specialization special case handling into AP
HwijungK 9f56859
renamed regex into screaming snake case
HwijungK 7a292e6
fixed typo
HwijungK 8077783
migration
HwijungK 10e8e99
goldylocks
HwijungK afce1a0
spellcheck TT
HwijungK bc58c62
merged optional specs into polymorphic majors
HwijungK 00b64ac
cleaned up comment in schema for MajorProgram Type
HwijungK f3f4092
graphql specializationId is optional
HwijungK 493da8f
fixed schoolRequirement typo
HwijungK b2d1778
changed response for when a major spec pair is not found
HwijungK 1825709
converted key of parsedPrograms into a template literal type
HwijungK 9fd770f
refactored programQuadruplet into ProgramCodes type
HwijungK 22b77a8
push found programs with spec into existing parsedPrograms list
HwijungK 0230efd
made docs for major and major requirement endpoint clearer
HwijungK 4771309
make program service more 'drizzle-onic'
HwijungK c92cee7
logging stuff
HwijungK 19cb482
used asmajorSpecId to create parsedProgram keys where originally missed
HwijungK 3e78581
merged main into polymorphic majors
HwijungK ac7051f
doc changes
HwijungK 730e009
minor doc and cleaning changes
HwijungK 19cc8d4
Update apps/api/src/rest/routes/programs.ts
HwijungK 847e2e3
removed local sql file
HwijungK 8c6b5e7
Merge branch 'polymorphic-majors' of github.com:icssc/anteater-api in…
HwijungK 54e5d89
yet additional doc changes. bless me with english TT
HwijungK a4bd0ad
better error logs on graphql logs and delete migration to sync with main
HwijungK 7947166
Merge branch 'main' into polymorphic-majors
HwijungK e1c9ddb
remigrate and fix dwClient majorAudit bug
HwijungK bd21520
final i hope
HwijungK File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -97,12 +97,14 @@ export class DegreeworksClient { | |
| * @param degree a degree code, e.g. "BS" | ||
| * @param school this corresponds to the UCI notion of division, e.g. "U" or "G" | ||
| * @param majorCode a major code | ||
| * @param specCode a specialization code | ||
| * @param college this corresponds to the UCI notion of school, e.g. 55 for the school of bio sci | ||
| */ | ||
| async getMajorAudit( | ||
| degree: string, | ||
| school: string, | ||
| majorCode: string, | ||
| specCode?: string, | ||
|
Comment on lines
104
to
+107
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. More than one optional argument gets a little messy, especially if we add/reorder them. Do you want to pass in some kind of object instead? We could also leave this in if you don't care enough |
||
| college?: string, | ||
| ): Promise< | ||
| | { | ||
|
|
@@ -122,6 +124,7 @@ export class DegreeworksClient { | |
| goals: [ | ||
| { code: "MAJOR", value: majorCode }, | ||
| ...(college ? [{ code: "COLLEGE", value: college }] : []), | ||
| ...(specCode ? [{ code: "SPEC", value: specCode }] : []), | ||
| ], | ||
| }), | ||
| headers: this.headers, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.