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
Replace organisation->organization #9455
Replace organisation->organization #9455
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@paulo-graca : Currently this PR is failing an IT because there is a test that checks for the name "organisation". Here's the errors:
Failures:
Error: org.dspace.app.rest.DiscoveryRestControllerIT.checkSortOrderInPersonOrOrgunitConfigurationTest(org.dspace.app.rest.DiscoveryRestControllerIT)
Error: Run 1: DiscoveryRestControllerIT.checkSortOrderInPersonOrOrgunitConfigurationTest:1275 JSON path "$.sortOptions"
Expected: iterable containing [(is json with json path "$['name']" evaluated to is "dspace.entity.type" and is json with json path "$['sortOrder']" evaluated to is "desc"), (is json with json path "$['name']" evaluated to is "organization.legalName" and is json with json path "$['sortOrder']" evaluated to is "asc"), (is json with json path "$['name']" evaluated to is "organisation.address.addressCountry" and is json with json path "$['sortOrder']" evaluated to is "asc"), (is json with json path "$['name']" evaluated to is "organisation.address.addressLocality" and is json with json path "$['sortOrder']" evaluated to is "asc"), (is json with json path "$['name']" evaluated to is "organisation.foundingDate" and is json with json path "$['sortOrder']" evaluated to is "desc"), (is json with json path "$['name']" evaluated to is "dc.date.accessioned" and is json with json path "$['sortOrder']" evaluated to is "desc"), (is json with json path "$['name']" evaluated to is "person.familyName" and is json with json path "$['sortOrder']" evaluated to is "asc"), (is json with json path "$['name']" evaluated to is "person.givenName" and is json with json path "$['sortOrder']" evaluated to is "asc"), (is json with json path "$['name']" evaluated to is "person.birthDate" and is json with json path "$['sortOrder']" evaluated to is "desc")]
but: item 2: is json with json path "$['name']" evaluated to is "organisation.address.addressCountry" json path "$['name']" was evaluated to "organization.address.addressCountry"
Overall, I'm OK with this rename if it fixes issues. But, we need to update this IT as well. Thanks
I will do this today, thank you @tdonohue! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 Thanks @paulo-graca ! This now looks correct, and I've verified that the metadata schema is named organization
and not organisation
. So, this is a necessary fix to ensure the correct metadata fields are used in these Discovery sort configurations.
Successfully created backport PR for |
References
There isn't a specific issue for this PR
Description
From a missing translation, we noticed that some fields were written with a different schema:
I personally don't have any strong preference on the way it's written (en_EN or en_US), but I think we should use one and stick to it. Currently the schema is organization with the Z and not with the S, so, we need to change the one that were specified with the S