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

Merge develop into staging, 11 Oct 2024 #1663

Merged
merged 33 commits into from
Oct 11, 2024
Merged

Merge develop into staging, 11 Oct 2024 #1663

merged 33 commits into from
Oct 11, 2024

Conversation

dchiller
Copy link
Contributor

@dchiller dchiller commented Oct 11, 2024

This can be merged/updated once #1662, #1645, and #1653 have beed merged, which are (hopefully) the last fixes needed before a new production version can be deployed.

I have updated/reverted the staging database to look like the current production, so that the appropriate commands can be run staging to simulate a production update:
0. Run migrations

  1. Run reformat_source_ids (Formats DACT and Fragment ID fields; run before migrate_records so that these are correctly formatted when used in the shelfmark field).
  2. Run migrate_records.
  3. Run other commands that needed testing:
    • remap_user_ids
    • map_cantus_ids "008248:24" "008248:08"
    • combining feasts command for 2456 -> 4474 and 2094 -> 4475
    • run populate_diff_id_fields

ahankinson and others added 30 commits September 13, 2024 16:25
Allows for the description of colloquial names for sources
Allows for the capture of other identifiers for a source.
The addition of the institution model and the change from office to
service introduced changes in external APIs (the JSON CID export, 
the JSON melody export, and the cached concordances command).
This commit rolls back those changes to maintain compatibility. 
The modifications may be reintroduced at a later date if notice is given 
to external users (in particular, Cantus Index).

Also simplifies the logic and adjusts the typing of functions related to the
JSON melody export and the AJAX melody list views to address #1638.

Makes relevant changes to associated tests.

Fixes additional type errors in views/api.py.

Refs #1641.
With this commit, volpiano can be added to chants in this source but no volpiano will display in any user-facing way.
Reduces duplicate queries in the source create view.

Removes a function that contained a duplicate test for the existence of a source.
Add command to standardize formatting of DACT IDs and Fragmentarium IDs
Temporarily turn off volpiano display for MS 73
Modifies chant create, edit, and detail views to prevent and catch text syllabification errors. Modifies edit syllabification view for the same.

Invalidates chant text fields if they error on syllabification.

Catches errors for texts with error rather than propagating to a server error.
Updates source create, source edit, and source detail pages.

Adds command to populate the `source_completeness` field based on the current contents of the `full_source` field (which can be deleted after this field is populated).
Removes the need to duplicate process of using default SelectWidget on ChoiceFields and then manually changing attributes.
This commit removes the requirement for a source to have a holding_institution.

Tests and forms are updated to account for this.

The `migrate_records` command is updated so that sources with un-parseable sigla that are not otherwise accounted for (by virtue of being private collections or prints) do not have institution records made.

Note: For the purposes of data migration, no constraint is added to sources to designate when no holding institution is necessary. After migration, these should be modified.

Refs: #1631
Use select_related to reduce queries on json_cid_export view
fix(api): optimize json-cid view queries
@lucasmarchd01
Copy link
Contributor

Note that you might also have to re-run the populate_diff_id_fields command if you are using a fresh dump of the database from production as suggested by one of the previous PRs. Or take a copy of the database from staging since it's already been run there.

@dchiller dchiller merged commit 8ca73e2 into staging Oct 11, 2024
1 check 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.

3 participants