Commit Graph

547 Commits

Author SHA1 Message Date
Kim Shepherd
069674e7ee [TLC-674] Duplicate Detection service and submission step
Service, submission step, integration tests
2024-03-04 11:39:48 +13:00
frabacche
1266d560d8 Merge remote-tracking branch 'origin/main' into coar-notify-7 2024-02-29 10:14:26 +01:00
frabacche
9b795b7dbd QA restore security, COAR sub section fix emptying request services, restore "openaire" lowercase as a Source. 2024-02-29 10:11:03 +01:00
frabacche
37e38c9ad9 Merge remote-tracking branch 'origin/main' into coar-notify-7 2024-02-29 10:05:40 +01:00
jeffmorin
1a3c0726dc Content reports ported from DSpace 6.x (#8598)
* content Reports

* Fixed CheckStyle errors

* Fixed CheckStyle errors

* Fixed CheckStyle errors

* First batch of fixes: mainly Javadoc, and a bit of code re-engineering

* Fixed CheckStyle errors

* Fixed CheckStyle errors in dspace-server-webapp

* Applied requested changes for DSpace code conventions compliance

* Added GET endpoint to Filtered Items report

* Updated to latest version from main branch

* Fixed missing imports

* Fixed CheckStyle errors

* Fixed H2 database initialization

* Fixed unit tests and an integration test

* Fixed CheckStyle errors

* Fixed CheckStyle errors

* Fixed ItemServiceIT test

* Test without collection criterion

* Fixed max result count in integration test

* Disable findByMetadataQuery test to diagnose errors in other tests

* Disabled ContentReportRestRepositoryIT test to validate existing tests

* Re-enable test in dspace-api

* Re-enabled ContentReportRestRepositoryIT tests to diagnose failures

* Fixed item matching in the second test

* Fixed JSON path error

* Use projections to trigger embedding the owning collection in ItemRest only for the Filtered Items report

* Fixed usage of allowEmbedding() through non-null arguments

* Exclude owning collection from ItemRest when null/empty

* Trying an alternate way to discriminate report-based Item conversions

* Fixed embedded owning collection management

* Replaced ItemConverter with correct version

* Fixed Filtered Collections test in ContentReportRestRepositoryIT

* Fixed test

* Transferred owning collection to a separate class FilteredItemRest

* Rollback to DSpace repo version

* Fixed matcher for Filtered Collections summary

* Fixed matcher for Filtered Collections summary (take 2)

* Add printing mock request results to diagnose remaining problems

* Try logging output through System.err

* Cancelled attempt to print JSON results (does nothing)

* Attempt to fix ContentReportRestRepositoryIT tests

* Removed predefined UUIDs and handles

* Fixed import formatting

* Fixed expected results in ContentReportRestRepositoryIT

* Switched to a custom matcher for the Filtered Item report test

* Fixed import format

* Fixed JSON collection matching in Filtered Items test

* Fixed Filtered Items matcher

* Fixed expected result

* Fixed the test for now...

* Fixed test again

* Disabled non-working test

* Fixed a few typos

* Moved Filtered Collections report business logic to dspace-api

* Fixed outdated controller

* Fixed import and lost @Ignore annotation

* Retrieved a lost test correction

* Fixed Filtered Collections test

* Reverted to the last working version (except for 2nd test, which remains
disabled)

* Moved Filtered Items report business logic to dspace-api

* Fixed import style

* Added switch to enable/disable Content Reports

* Fixed an out-of-date class

* Removed unused imports

* Fixed activation configuration for Content Reports

* Added missing @Test annotation

* A forgotten Hibernate dialect configuration. I also removed obsolete
Oracle settings configuration.

* Switched to GET requests for Content Reports

* Switched to GET requests for Content Reports

* Fixed styling in imports

* Fixed imports

* Cleaned deprecated code

* Simplified regex since trim() method is invoked on each token thereafter

* Added Javadoc in the interface.

* Relocated Content Reports configuration into a new file

* Added "unauthorized" tests and cleaned up code repetitions

* Fixed parameter according to Javadoc

* Fixed Filtered Items test

* Use of @ConditionalOnProperty annotation

* Rolled back to manual parameter managing

* Second try on @ConditionalOnProperty, with proper test configuration

* Rolled back (again) to manual service activation checking (needed for
proper behaviour depending on activation and authorization)

* Eliminated inheritance between FilteredItemRest and ItemRest

* Re-established the type property in FilteredItemRest (and in
FilterCollectionRest for uniformity).

---------

Co-authored-by: Jean-François Morin <jean-francois.morin@bibl.ulaval.ca>
2024-02-28 11:48:16 -06:00
Tim Donohue
ff302597c1 Merge pull request #9267 from 4Science/CST-12108-WithdrawnAndReinstate_topics
Create a DSpace Users correction source with REQUEST/WITHDRAWN and REQUEST/REINSTATE topics
2024-02-27 15:08:45 -06:00
kshepherd
386b6f8b1f Merge pull request #9336 from tdonohue/add_swordv2_its
Add more SWORDv2 Integration Tests
2024-02-27 11:43:19 +13:00
frabacche
08277e0dad coar-notify-7 incoming ldn message block configs, new item-filters map, hide coarnotify section on submission, IT fixes 2024-02-26 23:36:32 +01:00
frabacche
79155a26ba coar-notify-7 incoming ldn message block configs, new item-filters map, hide coarnotify section on submission, IT fixes 2024-02-26 23:35:34 +01:00
frabacche
cca9654da4 coar-notify-7 use only ldn.enabled variable for ldn enabling configuration 2024-02-22 18:49:22 +01:00
frabacche
ad40858bbb coar-notify-7 merge conflicts fixes, ldn configuration fixes 2024-02-21 16:38:34 +01:00
frabacche
1f438d1665 coar-notify-7 comment an old configuration, checkstyle 2024-02-20 14:48:48 +01:00
Mykhaylo Boychuk
a2ee986f7f [CST-12108] move configurations to qaevents.cfg 2024-02-20 13:21:54 +01:00
frabacche
feb2c8b48d coar-notify-7 sql h2 alignment, java fixes and refactors, configuration fixes 2024-02-19 17:49:30 +01:00
Mykhaylo
a92c478ef4 Merge branch 'main' into CST-12108-WithdrawnAndReinstate_topics 2024-02-19 12:50:07 +01:00
Tim Donohue
fc5ec8f6f0 Merge pull request #9346 from tuub/DS-9345
[DS-9345] Correct the package name of the IIIF search plugin
2024-02-16 11:08:19 -06:00
Tim Donohue
9b0e38a847 Merge pull request #9237 from 4Science/main_CST-12826
ROR Integration - OAI PMH & Orcid
2024-02-16 10:41:32 -06:00
haoueclf
03fe586681 [DS-9345] Correct the package name of the IIIF search plugin 2024-02-16 16:51:41 +01:00
frabacche
094637dc0c coar-notify-7 merge with main 2024-02-16 10:51:11 +01:00
Tim Donohue
eeee029510 Add more ITs to SWORDv2 to verify basic upload, edit, delete functionality. These all pass prior to any SWORDv2 refactoring 2024-02-15 14:58:57 -06:00
Tim Donohue
a986e8e43f Merge pull request #8280 from 4Science/CST-5249_suggestion
Openaire suggestions (publication claim)
2024-02-15 10:24:20 -06:00
Vincenzo Mecca
d6741fd610 Merge remote-tracking branch 'DSpace/main' into main_CST-12826
# Conflicts:
#	dspace-server-webapp/src/test/java/org/dspace/app/rest/RorImportMetadataSourceServiceIT.java
#	dspace/config/spring/api/ror-integration.xml
2024-02-15 10:13:28 +01:00
Tim Donohue
20c8b03c50 Merge pull request #9238 from 4Science/main_CST-12825
ROR Integration - Live Import
2024-02-14 15:16:23 -06:00
frabacche
d7350437f2 coar-notify-7 follow-ups on the community advices 2024-02-14 17:54:08 +01:00
Tim Donohue
3ced6586c4 Merge pull request #9194 from 4Science/DURACOM-204
[#9192] Makes forgot-password link removable
2024-02-13 12:31:34 -06:00
Vincenzo Mecca
f75eed90fa Merge remote-tracking branch 'DSpace/main' into main_CST-12826
# Conflicts:
#	dspace/config/spring/api/virtual-metadata.xml.openaire4
2024-02-13 19:14:13 +01:00
frabacche
cdaa500be4 Merge branch 'main' into CST-5249_suggestion 2024-02-13 12:03:12 +01:00
Vincenzo Mecca
8c3ec48438 [#9238][CST-12825] Addresses Changes Requests 2024-02-12 13:23:34 +01:00
Stefano Maffei
8b22a7f09a Merge remote-tracking branch 'origin/main' into coar-notify-7 2024-02-09 11:29:25 +01:00
Tim Donohue
4bc95a3198 Merge pull request #9309 from kshepherd/fix-doi-cfg-improvement
Improve default identifiers.cfg properties
2024-02-07 10:57:38 -06:00
Kim Shepherd
40b7427d88 Improve default identifiers.cfg properties
(Related to dspace-angular#2765)
2024-02-07 12:11:06 +13:00
frabacche
2f71ec2298 CST-5249_suggestion comment out openairecerif and openairefunding metadatas descriptions 2024-02-06 15:17:38 +01:00
Mykhaylo Boychuk
d44f01d01e Merge branch 'main' into CST-12108-WithdrawnAndReinstate_topics 2024-01-24 14:59:28 +01:00
Tim Donohue
944305a8ca Remove dspace-rest, all configs and a few deprecated methods only used by this module. 2024-01-19 11:15:18 -06:00
Stefano Maffei
3b78296ad7 Merge remote-tracking branch 'origin/coar-notify-7' into coar-notify-7 2024-01-17 16:35:38 +01:00
Stefano Maffei
cf6a7ec62d [CST-13315] set qaevents.enabled to true for COAR 2024-01-17 16:35:17 +01:00
Mohamed Saber Eskander
a72a370d5e Merged in coar-notify-7_CST-13257 (pull request #1550)
[CST-13257] added lowerIp and upperIp fields and operations to NotifyServiceEntity

Approved-by: Stefano Maffei
2024-01-17 15:29:49 +00:00
FrancescoMolinaro
7de9463110 restore profiles property 2024-01-16 13:24:45 +01:00
mohamed eskander
0191d914a3 [CST-13257] added sourceId to LDNMessageEntity to prevent untrusted IPs 2024-01-12 18:00:45 +02:00
frabacche
d2a122299a Fix Merge conflicts with main 2024-01-04 16:21:40 +01:00
Mykhaylo
b312c9ea52 Merge branch 'main' into CST-12108-WithdrawnAndReinstate_topics 2023-12-22 15:41:45 +01:00
Vincenzo Mecca
2fff92cdd8 [CST-12826] Orcid Synchronization for ROR organization 2023-12-19 17:40:43 +01:00
frabacche
e0c9c90b78 Merge conficts on EPersonServiceImpl 2023-12-19 09:37:05 +01:00
Tim Donohue
4bf7d17804 Merge pull request #8184 from 4Science/CST-5249
Add a correction service to dspace to enhance the data quality (was Enrich local data via the OpenAIRE Graph)
2023-12-18 13:51:24 -06:00
frabacche
5c845dbbaa CST-5249 new qaevent.enabled config and used for QAAuthorizationFeature 2023-12-15 10:51:36 +01:00
Vincenzo Mecca
c974e73e2c [CST-12825] Ror integration 2023-12-14 14:45:53 +01:00
frabacche
ff5f3fa74f CST-5249 rename OpenAIRE to Openaire, other minor issues 2023-12-12 16:15:25 +01:00
Stefano Maffei
da3605f18d Merge remote-tracking branch 'originGithub/main' into coar-notify-7
# Conflicts:
#	dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
#	dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
#	dspace/config/dspace.cfg
#	dspace/config/modules/rest.cfg
#	dspace/config/spring/api/core-factory-services.xml
#	dspace/config/spring/api/core-services.xml
2023-12-05 12:14:48 +01:00
Stefano Maffei
5466c263ef [CST-11899] general refactoring & improvements for LDN 2023-11-20 15:37:47 +01:00
Tim Donohue
500fbe70a3 Merge pull request #9162 from alexandrevryghem/theme-fixes_contribute-main
Fix match theme by handle with cannonical prefix https://hdl.handle.net/ not working
2023-11-13 14:20:06 -06:00