Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ae835c2
Metadata 4.7 updates for lupo
svogt0511 Jan 16, 2026
4c28141
Appease rubocop.
svogt0511 Jan 16, 2026
1c64a2e
Testing.
svogt0511 Jan 27, 2026
4b846a1
Appease Rubocop
svogt0511 Jan 27, 2026
e1c640d
Test - puts/patch metadata-4.7
svogt0511 Jan 27, 2026
6c843b7
Appease Rubocop
svogt0511 Jan 27, 2026
0b81c3d
Merge master updates into metadata_47 branch
svogt0511 Jan 27, 2026
5e1bc6e
Config fix.
svogt0511 Jan 28, 2026
95c889a
Config fix.
svogt0511 Jan 28, 2026
312c05e
Add tests for relatedItemsInformation bolognese bug.
svogt0511 Jan 29, 2026
5c744d0
Forgot to update bolognese.
svogt0511 Jan 29, 2026
e5e4df1
Merge remote-tracking branch 'origin/master' into metadata-47
svogt0511 Jan 29, 2026
b52d3a6
Merge remote-tracking branch 'origin/master' into metadata-47
svogt0511 Feb 3, 2026
9d6e0e5
Uncomment shoryuken config
jrhoads Feb 4, 2026
d3af110
Add back events group to shoryuken config
jrhoads Feb 4, 2026
2267c7b
Changing relationTypeInformation from ES/OS 'keyword' type field to '…
svogt0511 Feb 6, 2026
c2e2ed0
Merge branch 'metadata-47' of github.com:datacite/lupo into metadata-47
svogt0511 Feb 6, 2026
3225a25
Use released bolognese. Appease rubocop.
svogt0511 Feb 6, 2026
5c415ee
Debugging output.
svogt0511 Feb 6, 2026
d3180e7
Issue due to upgrade? Presence of both positional parameters and keye…
svogt0511 Feb 8, 2026
c823af3
Appease rubocop.
svogt0511 Feb 8, 2026
0bc8a72
Upgrade shoryuken from 7.0.0 to 7.0.1. 7.0.0 had broken support for m…
svogt0511 Feb 9, 2026
4c23b5e
Shoryuken - use all keyword arguments.
svogt0511 Feb 10, 2026
2c64ebf
Correct regressions in gemfile.lock.
svogt0511 Feb 10, 2026
bdab260
Remove perform/perform_later arg/param signature changes from previou…
svogt0511 Feb 10, 2026
69f5a1c
Remove inadvertently committed mods.
svogt0511 Feb 10, 2026
9a19813
Appease coderabbitai
svogt0511 Feb 11, 2026
6df2019
Appease coderabbitai.
svogt0511 Feb 11, 2026
e03d735
Test 'query' for new field.
svogt0511 Feb 12, 2026
2fd876b
Appease rubocop.
svogt0511 Feb 12, 2026
431d4c4
Test memcached update
svogt0511 Feb 12, 2026
4c59122
Merge remote-tracking branch 'origin/master' into metadata-47
svogt0511 Feb 13, 2026
6b79846
Fixes - related to facets/aggregations for resource type general.
svogt0511 Feb 18, 2026
748b12d
Fixes for aggregates/facets. Reindex required.
svogt0511 Feb 18, 2026
f2f57f6
Appease rubocop
svogt0511 Feb 18, 2026
8a415f5
add 4.7 changes to openapi.yaml
KellyStathis Feb 18, 2026
8782787
add changes from 4.6 to relation-type-id in openapi.yaml
KellyStathis Feb 18, 2026
9ec070a
Fixing the resource_type agg broke the open_licenses agg. I restored…
svogt0511 Feb 18, 2026
0c28726
Addresses 1 really minor coderrabit review comment.
svogt0511 Feb 20, 2026
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
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem "aws-sdk-sqs", "~> 1.3"
gem "base32-url", "~> 0.3"
gem "batch-loader", "~> 1.4", ">= 1.4.1"
gem "bcrypt", "~> 3.1.7"
gem "bolognese", "~> 2.5.0"
gem "bolognese", "~> 2.5.1"
gem "bootsnap", "~> 1.4", ">= 1.4.4", require: false
gem "cancancan", "~> 3.0"
gem "countries", "~> 2.1", ">= 2.1.2"
Expand Down Expand Up @@ -66,7 +66,7 @@ gem "rails", "~> 7.2"
gem "rake", "~> 12.0"
gem "sentry-ruby", "~> 5.20"
gem "sentry-rails", "~> 5.20"
gem "shoryuken", "~> 7.0"
gem "shoryuken", "~> 7.0.1"
gem "simple_command"
gem "slack-notifier", "~> 2.1"
gem "sparql", "~> 3.1", ">= 3.1.2"
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ GEM
bigdecimal (4.0.1)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bolognese (2.5.0)
bolognese (2.5.1)
activesupport (= 7.2.3)
benchmark_methods (~> 0.7)
bibtex-ruby (>= 5.1.0)
Expand Down Expand Up @@ -707,7 +707,7 @@ GEM
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
sexp_processor (4.17.1)
shoryuken (7.0.0)
shoryuken (7.0.1)
aws-sdk-sqs (>= 1.66.0)
concurrent-ruby
thor
Expand Down Expand Up @@ -821,7 +821,7 @@ DEPENDENCIES
bcrypt (~> 3.1.7)
better_errors
binding_of_caller
bolognese (~> 2.5.0)
bolognese (~> 2.5.1)
bootsnap (~> 1.4, >= 1.4.4)
brakeman (~> 6.1, >= 6.1.2)
bullet (~> 8.1)
Expand Down Expand Up @@ -897,7 +897,7 @@ DEPENDENCIES
seedbank
sentry-rails (~> 5.20)
sentry-ruby (~> 5.20)
shoryuken (~> 7.0)
shoryuken (~> 7.0.1)
shoulda-matchers (~> 4.1, >= 4.1.2)
simple_command
simplecov (~> 0.22.0)
Expand Down
2 changes: 2 additions & 0 deletions app/lib/params_sanitizer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ class ParamsSanitizer
schemeUri
schemeType
resourceTypeGeneral
relationTypeInformation
relatedMetadataScheme
schemeUri
schemeType
Expand Down Expand Up @@ -231,6 +232,7 @@ class ParamsSanitizer
relatedItems: [
:relationType,
:relatedItemType,
:relationTypeInformation,
{
relatedItemIdentifier: %i[relatedItemIdentifier relatedItemIdentifierType relatedMetadataScheme schemeURI schemeType],
},
Expand Down
16 changes: 12 additions & 4 deletions app/models/doi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,12 @@ def validate_publisher_obj?(doi)
schemeUri: { type: :keyword },
schemeType: { type: :keyword },
resourceTypeGeneral: { type: :keyword },
relationTypeInformation: { type: :text },
}
indexes :related_items, type: :object, properties: {
indexes :related_items, type: :object, properties: {
relatedItemType: { type: :keyword },
relationType: { type: :keyword },
relationTypeInformation: { type: :text },
relatedItemIdentifier: { type: :object, properties: {
relatedItemIdentifier: { type: :keyword, normalizer: "keyword_lowercase" },
relatedItemIdentifierType: { type: :keyword },
Expand Down Expand Up @@ -709,8 +711,14 @@ def as_indexed_json(_options = {})
end

DOI_AGGREGATION_DEFINITIONS = {
# number of resourceTypeGeneral increased from 30 to 32 in schema 4.6
resource_types: { terms: { field: "resource_type_id_and_name", size: 32, min_doc_count: 1 } },
# number of resourceTypeGeneral increased from 34 to 34 in schema 4.6
resource_types: { terms: { field: "resource_type_id_and_name", size: 34, min_doc_count: 1 },
aggs: {
resource_types: {
terms: { field: "resource_type_id_and_name", size: 34, min_doc_count: 1 }
}
}
},
open_licenses: {
filter: { terms: {
"rights_list.rightsIdentifier": [
Expand All @@ -728,7 +736,7 @@ def as_indexed_json(_options = {})
} },
aggs: {
resource_types: {
terms: { field: "resource_type_id_and_name", size: 32, min_doc_count: 1 }
terms: { field: "resource_type_id_and_name", size: 34, min_doc_count: 1 }
}
}
},
Expand Down
2 changes: 2 additions & 0 deletions app/models/resource_type.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ def self.get_data(_options = {})
{ "id" => "output-management-plan", "title" => "OutputManagementPlan" },
{ "id" => "peer-review", "title" => "PeerReview" },
{ "id" => "physical-object", "title" => "PhysicalObject" },
{ "id" => "poster", "title" => "Poster" },
{ "id" => "preprint", "title" => "Preprint" },
{ "id" => "presentation", "title" => "Presentation" },
{ "id" => "project", "title" => "Project" },
{ "id" => "report", "title" => "Report" },
{ "id" => "service", "title" => "Service" },
Expand Down
1 change: 0 additions & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
require "flipper/middleware/memoizer"
config.middleware.use Flipper::Middleware::Memoizer
config.flipper.memoize = false

config.hosts << "lupo_web"
ENV["TEST_ENV_NUMBER"] ||= "" # For parallel tests, often set by CI, default to empty
ENV["ES_PREFIX"] ||= "" # ElasticSearch index prefix
Expand Down
2 changes: 2 additions & 0 deletions config/initializers/constants.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ class IdentifierError < RuntimeError; end
"OutputManagementPlan" => "Output Management Plan",
"PeerReview" => "Peer Review",
"PhysicalObject" => "Physical Object",
"Poster" => "Poster",
"Preprint" => "Preprint",
"Presentation" => "Presentation",
"Project" => "Project",
"Report" => "Report",
"Service" => "Service",
Expand Down
5 changes: 3 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# DOCKER-COMPOSE.YML

services:
web:
env_file: .env
Expand Down Expand Up @@ -40,7 +42,6 @@ services:
- "3309:3306"
networks:
- public

elasticsearch:
image: opensearchproject/opensearch:2
ports:
Expand Down Expand Up @@ -89,4 +90,4 @@ networks:
ipam:
driver: default
config:
- subnet: 10.0.40.0/24
- subnet: 10.0.40.0/24
14 changes: 14 additions & 0 deletions openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,9 @@ paths:
- output-management-plan
- peer-review
- physical-object
- poster
- preprint
- presentation
- project
- report
- service
Expand Down Expand Up @@ -2518,6 +2520,8 @@ components:
type: string
schemeType:
type: string
relationTypeInformation:
type: string
relatedItems:
description: '[DataCite Metadata Schema: RelatedItem](https://datacite-metadata-schema.readthedocs.io/en/4/properties/relateditem/)'
type: array
Expand All @@ -2541,6 +2545,8 @@ components:
type: string
schemeType:
type: string
relationTypeInformation:
type: string
creators:
type: array
items:
Expand Down Expand Up @@ -3429,6 +3435,7 @@ components:
- Collects
- IsTranslationOf
- HasTranslation
- Other
resourceTypeGeneral:
description: '[DataCite Metadata Schema: resourceTypeGeneral](https://datacite-metadata-schema.readthedocs.io/en/4/appendices/appendix-1/resourceTypeGeneral/)'
type: string
Expand All @@ -3454,7 +3461,9 @@ components:
- OutputManagementPlan
- PeerReview
- PhysicalObject
- Poster
- Preprint
- Presentation
- Project
- Report
- Service
Expand Down Expand Up @@ -3511,7 +3520,9 @@ components:
- LSID
- PMID
- PURL
- RAiD
- RRID
- SWHID
- UPC
- URL
- URN
Expand Down Expand Up @@ -3650,6 +3661,9 @@ components:
- obsoletes
- is-collected-by
- collects
- is-translation-of
- has-translation
- other
- is-authored-by
- is-authored-at
- is-funded-by
Expand Down
Loading