-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Cscttv 3244 hidden profile handling (#159) Update TTV model to include field ”hidden” in table dim_user_profile. When user profile is set to state ”hidden”, it is removed from Elasticsearch index. When profile is removed from state ”hidden”, then Elasticsearch index is updated. Simplify code related to Elasticsearch actions. Add model ProfileSettings for API data. Add methods for getting and modifying settings. Use memory cache to store settings data. * TTV model update 4.5.2023 (#160) dim_publication: - international_collaboration bit NULL - business_collaboration bit NULL - self_archived_code bit NULL * CSCTTV-3244 Fix error in ORCID webhook (#161) Fix bug where database context was not available during ORCID webhook processing (in Elasticsearch update). * CSCTTV-3267 Populate fullName property (#162) When first name and last name are known, populate property full name. This is needed in the Elasticsearch index to execute name searches in user profiles. * CSCTTV-3275 Admin command to update all profiles in Elasticsearch (#163) Add endpoint in admin controller, which triggers update on all user profiles in Elasticsearch * Cscttv 3269 orcid funding decisions import (#164) * CSCTTV-3269 ORCID fundings import Import ORCID fundings into table dim_profile_only_funding_decision. * CSCTTV-3269 ORCID fundings profile editor data Add data from dim_profile_only_funding_decision into profile editor data. * CSCTTV-3269 ORCID fundings organization handling Get ORCID funding related organization name from either dim_organization or dim_identifierless_data. Improve RORID organization matching from dim_pid. * Fix bug in Swagger specification of ProfileSettings endpoint (#165) * Modify GitHub workflow configuration * CSCTTV-3268 ORCID dataset import (#166) * CSCTTV-3268 ORCID dataset import * Fix bug in Swagger specification of ProfileSettings endpoint (#165) * CSCTTV-3268 ORCID dataset import - profile editor data * Use correct referencedata code scheme when getting user choice options. (#167) * CSCTTV-3269 fix handling of missing ORCID funding properties (#168) * Modify ORCID affiliation organization handling. Fixes bug when linked organization is changed from DimIdentifierlessData to DimOrganization (and vice versa). (#169) * Limit ORCID research activity name name to 255 (#170) Limit ORCID research activity name name to 255 since in database dim_profile_only_research_activity.name_en max length is 255. * Handle settings endpoint error case, where user profile does not exist. (#171) * TTV model update in DimPid (#173) alter TABLE [dbo].[dim_publication] alter column [international_collaboration] [bit] NOT NULL alter TABLE [dbo].[dim_publication] alter column [business_collaboration] [bit] NOT NULL alter TABLE [dbo].[dim_publication] alter column [self_archived_code] [nvarchar](255) NULL
- Loading branch information
Showing
58 changed files
with
2,686 additions
and
828 deletions.
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -6,10 +6,7 @@ name: .NET | |
| on: | ||
| pull_request: | ||
| branches: | ||
| - "devel" | ||
| - "qa" | ||
| - "master" | ||
| - "main" | ||
| - "**" | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
41 changes: 41 additions & 0 deletions
41
aspnetcore/src/api.Tests/Infrastructure/funding-detail-without-amount.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "created-date": { "value": 1684156470906 }, | ||
| "last-modified-date": { "value": 1684156470906 }, | ||
| "source": { | ||
| "source-orcid": { | ||
| "uri": "https://sandbox.orcid.org/0000-0001-6790-8767", | ||
| "path": "0000-0001-6790-8767", | ||
| "host": "sandbox.orcid.org" | ||
| }, | ||
| "source-client-id": null, | ||
| "source-name": { "value": "Timo J S" }, | ||
| "assertion-origin-orcid": null, | ||
| "assertion-origin-client-id": null, | ||
| "assertion-origin-name": null | ||
| }, | ||
| "put-code": 15862, | ||
| "path": "/0000-0001-6790-8767/funding/15862", | ||
| "type": "grant", | ||
| "organization-defined-type": null, | ||
| "title": { | ||
| "title": { "value": "Funding without amount" }, | ||
| "translated-title": null | ||
| }, | ||
| "short-description": null, | ||
| "amount": null, | ||
| "url": null, | ||
| "start-date": null, | ||
| "end-date": null, | ||
| "external-ids": null, | ||
| "contributors": null, | ||
| "organization": { | ||
| "name": "Test agency name", | ||
| "address": { | ||
| "city": "Helsinki", | ||
| "region": null, | ||
| "country": "GR" | ||
| }, | ||
| "disambiguated-organization": null | ||
| }, | ||
| "visibility": "public" | ||
| } |
66 changes: 66 additions & 0 deletions
66
aspnetcore/src/api.Tests/Infrastructure/funding-detail.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| { | ||
| "created-date": { "value": 1683523680278 }, | ||
| "last-modified-date": { "value": 1683523680278 }, | ||
| "source": { | ||
| "source-orcid": { | ||
| "uri": "https://sandbox.orcid.org/0000-0001-6790-8767", | ||
| "path": "0000-0001-6790-8767", | ||
| "host": "sandbox.orcid.org" | ||
| }, | ||
| "source-client-id": null, | ||
| "source-name": { "value": "Timo J S" }, | ||
| "assertion-origin-orcid": null, | ||
| "assertion-origin-client-id": null, | ||
| "assertion-origin-name": null | ||
| }, | ||
| "put-code": 15531, | ||
| "path": "/0000-0001-6790-8767/funding/15531", | ||
| "type": "grant", | ||
| "organization-defined-type": { "value": "Test funding subtype" }, | ||
| "title": { | ||
| "title": { "value": "Test title of funded project" }, | ||
| "translated-title": null | ||
| }, | ||
| "short-description": "This is a test description of test funding.", | ||
| "amount": { | ||
| "value": "1999.5", | ||
| "currency-code": "EUR" | ||
| }, | ||
| "url": { "value": "https://www.google.fi" }, | ||
| "start-date": { | ||
| "year": { "value": "2010" }, | ||
| "month": null, | ||
| "day": null | ||
| }, | ||
| "end-date": { | ||
| "year": { "value": "2013" }, | ||
| "month": { "value": "02" }, | ||
| "day": null | ||
| }, | ||
| "external-ids": { | ||
| "external-id": [ | ||
| { | ||
| "external-id-type": "grant_number", | ||
| "external-id-value": "123456789", | ||
| "external-id-normalized": null, | ||
| "external-id-normalized-error": null, | ||
| "external-id-url": { "value": "https://mytestgrantlink.com" }, | ||
| "external-id-relationship": "self" | ||
| } | ||
| ] | ||
| }, | ||
| "contributors": null, | ||
| "organization": { | ||
| "name": "Aalto University", | ||
| "address": { | ||
| "city": "Espoo", | ||
| "region": "Uusimaa", | ||
| "country": "FI" | ||
| }, | ||
| "disambiguated-organization": { | ||
| "disambiguated-organization-identifier": "https://ror.org/020hwjq30", | ||
| "disambiguation-source": "ROR" | ||
| } | ||
| }, | ||
| "visibility": "public" | ||
| } |
This file contains 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
Oops, something went wrong.