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.

Sign up for GitHub

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

Added the missing v2 attributes when creating orgs for ROR type #7116

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Added the missing v2 attributes when creating orgs for ROR type #7116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e646f26
Added the missing v2 attributes when creating orgs for ROR type
Camelia-Orcid Oct 30, 2024
4e10fd0
Merge branch 'main' into 9455-orgbug-the-other-names-json-not-saved-i…
amontenegro Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...d-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/ror/RorOrgLoadSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ private OrgDisambiguatedEntity processInstitute(String sourceId, String name, Is
}

// Create a new disambiguated org
OrgDisambiguatedEntity newOrg = createDisambiguatedOrg(sourceId, name, orgType, country, city, region, url);
OrgDisambiguatedEntity newOrg = createDisambiguatedOrg(sourceId, name, orgType, country, city, region, url, locationsJson, namesJson);
try {
// mark group for indexing
new OrgGrouping(newOrg, orgDisambiguatedManager).markGroupForIndexing(orgDisambiguatedDao);
Expand Down Expand Up @@ -394,7 +394,7 @@ private boolean entityChanged(OrgDisambiguatedEntity entity, String name, String
/**
* Creates a disambiguated ORG in the org_disambiguated table
*/
private OrgDisambiguatedEntity createDisambiguatedOrg(String sourceId, String name, String orgType, Iso3166Country country, String city, String region, String url) {
private OrgDisambiguatedEntity createDisambiguatedOrg(String sourceId, String name, String orgType, Iso3166Country country, String city, String region, String url,String locationsJson, String namesJson) {
LOGGER.info("Creating disambiguated org {}", name);
OrgDisambiguatedEntity orgDisambiguatedEntity = new OrgDisambiguatedEntity();
orgDisambiguatedEntity.setName(name);
Expand All @@ -405,6 +405,8 @@ private OrgDisambiguatedEntity createDisambiguatedOrg(String sourceId, String na
orgDisambiguatedEntity.setOrgType(orgType);
orgDisambiguatedEntity.setSourceId(sourceId);
orgDisambiguatedEntity.setSourceType(OrgDisambiguatedSourceType.ROR.name());
orgDisambiguatedEntity.setLocationsJson(locationsJson);
orgDisambiguatedEntity.setNamesJson(namesJson);
orgDisambiguatedManager.createOrgDisambiguated(orgDisambiguatedEntity);
return orgDisambiguatedEntity;
}
Expand Down
Loading