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

Add r ai d identifier #7044

Merged
merged 20 commits into from
Jun 19, 2024
Merged

Add r ai d identifier #7044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3279481
Deactivated records should get 409 on GET requests
amontenegro Feb 27, 2024
b3660c2
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Feb 28, 2024
2cc66ab
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Mar 1, 2024
f2dc713
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Mar 4, 2024
b4f8223
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Mar 7, 2024
b0026c3
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Mar 12, 2024
53e7616
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Mar 19, 2024
bf82372
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Mar 25, 2024
23b6afb
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Apr 4, 2024
182c67d
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Apr 4, 2024
c52ef13
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Apr 8, 2024
d4f779b
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Apr 8, 2024
27b0033
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Apr 17, 2024
585b896
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Apr 18, 2024
9c9dfef
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro May 8, 2024
42ac636
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro May 28, 2024
3f0d771
Merge branch 'main' of https://github.com/ORCID/ORCID-Source
amontenegro Jun 10, 2024
baa0aa9
Add RAiD identifier
amontenegro Jun 18, 2024
f6b090a
Fix unit tests
amontenegro Jun 19, 2024
77bde4d
Fix unit tests
amontenegro Jun 19, 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
2 changes: 1 addition & 1 deletion orcid-core/src/main/resources/i18n/identifiers_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ org.orcid.jaxb.model.record.WorkExternalIdentifierType.proposal-id=Proposal ID
org.orcid.jaxb.model.record.WorkExternalIdentifierType.cstr=cstr\: Science and technology resource identification
org.orcid.jaxb.model.record.WorkExternalIdentifierType.k10plus=k10plus\: K10plus
org.orcid.jaxb.model.record.WorkExternalIdentifierType.cgn=cgn\: Culturegraph Number

org.orcid.jaxb.model.record.WorkExternalIdentifierType.raid=raid\: RAiD is an identifier for research projects and sub-projects or activies within such projects.
2 changes: 1 addition & 1 deletion orcid-core/src/test/java/org/orcid/core/manager/IdentifierTypeManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void after() {
@Test
public void test0FetchEntities(){
Map<String,IdentifierType> map = idTypeMan.fetchIdentifierTypesByAPITypeName(null);
assertEquals(42+v2Ids.size(), map.size());
assertEquals(43+v2Ids.size(), map.size());
checkExists(map,"other-id");
for (String id : v2Ids){
checkExists(map, id);
Expand Down
4 changes: 3 additions & 1 deletion orcid-persistence/src/main/resources/db-master.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,5 +388,7 @@
<include file="/db/updates/add_ip_col_in_events.xml" />
<include file="/db/updates/alter_ip_col_in_events.xml" />
<include file="/db/updates/dw_papi_event_stats.xml" />
<include file="/db/updates/org_disambiguated_extra_columns.xml" />
<include file="/db/updates/org_disambiguated_extra_columns.xml" />
<include file="/db/updates/varchar_to_text_hsqldb.xml" />
<include file="/db/updates/identifier-types/identifier-type-52-RAiD.xml" />
</databaseChangeLog>
11 changes: 11 additions & 0 deletions orcid-persistence/src/main/resources/db/updates/identifier-types/identifier-type-52-RAiD.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">
<changeSet author="Angel Montenegro" id="ADD_RAID_IDENTIFIER_TYPE">
<preConditions onFail="MARK_RAN">
<sqlCheck expectedResult="0">select count(*) from identifier_type where id_name='RAiD';</sqlCheck>
</preConditions>
<sql>INSERT INTO identifier_type (id, id_name, id_resolution_prefix, id_deprecated, date_created, last_modified, primary_use) VALUES (52, 'RAiD', 'https://raid.org/', false, now(), now(), 'professional-activities');</sql>
<sql>UPDATE identifier_type SET "case_sensitive" = false WHERE id_name = 'RAiD';</sql>
</changeSet>
</databaseChangeLog>
10 changes: 10 additions & 0 deletions orcid-persistence/src/main/resources/db/updates/varchar_to_text_hsqldb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">

<changeSet id="HSQLDB-Update-Identifier-type" author="Angel Montenegro" dbms="hsqldb">
<sql>ALTER TABLE identifier_type ALTER COLUMN primary_use varchar(1000);</sql>
</changeSet>

</databaseChangeLog>
Loading