From 67e227b805695e6581fcd6d0b813e1e411fba9d7 Mon Sep 17 00:00:00 2001 From: Mike Walmsley Date: Tue, 16 Apr 2024 16:58:18 +0200 Subject: [PATCH 1/4] Add id_str as generic unique id field option (#166) --- app/services/import/reduction.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/services/import/reduction.rb b/app/services/import/reduction.rb index d06dc9c..8da1e0b 100644 --- a/app/services/import/reduction.rb +++ b/app/services/import/reduction.rb @@ -77,6 +77,10 @@ def unique_id unique_id = subject_metadata['#name'] return unique_id if unique_id + # generic metadata + unique_id = subject_metadata['id_str'] || subject_metadata['!id_str'] || subject_metadata['#id_str'] + return unique_id if unique_id + # staging has older data with different subject metadata - fallback to handling this special env case subject_metadata['!SDSS_ID'] if Rails.env.staging? || Rails.env.test? end From e4a079b597251aeb85d8462ace6a3656377e76bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 09:59:27 -0500 Subject: [PATCH 2/4] Bump nokogiri from 1.14.3 to 1.16.4 (#163) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.3 to 1.16.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.14.3...v1.16.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d509894..589ef7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,9 +191,9 @@ GEM net-protocol newrelic_rpm (9.7.0) nio4r (2.7.0) - nokogiri (1.14.3-x86_64-darwin) + nokogiri (1.16.4-x86_64-darwin) racc (~> 1.4) - nokogiri (1.14.3-x86_64-linux) + nokogiri (1.16.4-x86_64-linux) racc (~> 1.4) panoptes-client (1.2.0) deprecate @@ -217,7 +217,7 @@ GEM puma (6.4.2) nio4r (~> 2.0) raabro (1.4.0) - racc (1.6.2) + racc (1.7.3) rack (2.2.8) rack-cors (2.0.1) rack (>= 2.0.0) From 8b8b4b31e481b0b0760a987231bfe4a2f5753a8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 10:02:23 -0500 Subject: [PATCH 3/4] Bump rack from 2.2.8 to 2.2.9 (#164) Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 2.2.9. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v2.2.9) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 589ef7f..26bf7b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -218,7 +218,7 @@ GEM nio4r (~> 2.0) raabro (1.4.0) racc (1.7.3) - rack (2.2.8) + rack (2.2.9) rack-cors (2.0.1) rack (>= 2.0.0) rack-test (2.1.0) From 18920e70a17845784d54b44d6504febd3d3b33d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 10:04:33 -0500 Subject: [PATCH 4/4] Bump rack-cors from 2.0.1 to 2.0.2 (#165) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2. - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](https://github.com/cyu/rack-cors/compare/v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: rack-cors dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 26bf7b3..341522f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,7 +219,7 @@ GEM raabro (1.4.0) racc (1.7.3) rack (2.2.9) - rack-cors (2.0.1) + rack-cors (2.0.2) rack (>= 2.0.0) rack-test (2.1.0) rack (>= 1.3)