From 2417518fe5f487a8c24d3ff0ef9fc424f7bab048 Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Tue, 4 Jun 2024 10:51:45 +0200 Subject: [PATCH 1/4] add update_schema_version before_save action --- app/models/doi.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/models/doi.rb b/app/models/doi.rb index 26a9fb176..9946b8129 100644 --- a/app/models/doi.rb +++ b/app/models/doi.rb @@ -154,6 +154,7 @@ def validate_publisher_obj?(doi) before_validation :update_identifiers before_validation :update_types before_save :set_defaults, :save_metadata + before_save :update_schema_version before_create { self.created = Time.zone.now.utc.iso8601 } FIELD_OF_SCIENCE_SCHEME = "Fields of Science and Technology (FOS)" @@ -2332,6 +2333,12 @@ def update_types ).compact end + def update_schema_version + if current_metadata.present? && current_metadata.valid? + self.schema_version = current_metadata.namespace + end + end + def update_publisher case publisher_before_type_cast when Hash From 08399c2ae8f49c647f2d942c76a4a3fa6b50b15b Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Tue, 4 Jun 2024 17:18:23 +0200 Subject: [PATCH 2/4] comment out auth code to make staging testing easier --- app/controllers/datacite_dois_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/datacite_dois_controller.rb b/app/controllers/datacite_dois_controller.rb index f5aec8b5c..3f0bb1907 100644 --- a/app/controllers/datacite_dois_controller.rb +++ b/app/controllers/datacite_dois_controller.rb @@ -8,7 +8,7 @@ class DataciteDoisController < ApplicationController include ActionController::MimeResponds include Crosscitable - prepend_before_action :authenticate_user! + # prepend_before_action :authenticate_user! before_action :set_include, only: %i[index show create update] before_action :set_raven_context, only: %i[create update validate] @@ -558,7 +558,7 @@ def update authorize! :transfer, @doi @doi.assign_attributes(sanitized_params.slice(:client_id)) else - authorize! :update, @doi + # authorize! :update, @doi if sanitized_params[:schema_version].blank? @doi.assign_attributes( sanitized_params.except(:doi, :client_id).merge( From 7297b7d10d75081387e7187e1497e4be96c1fcda Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Tue, 4 Jun 2024 17:30:32 +0200 Subject: [PATCH 3/4] comment out auth code to make staging testing easier --- app/controllers/datacite_dois_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/datacite_dois_controller.rb b/app/controllers/datacite_dois_controller.rb index 3f0bb1907..8cb630612 100644 --- a/app/controllers/datacite_dois_controller.rb +++ b/app/controllers/datacite_dois_controller.rb @@ -8,7 +8,7 @@ class DataciteDoisController < ApplicationController include ActionController::MimeResponds include Crosscitable - # prepend_before_action :authenticate_user! + prepend_before_action :authenticate_user! before_action :set_include, only: %i[index show create update] before_action :set_raven_context, only: %i[create update validate] From f9f0e5cd6d0813196adec7d405af97160655f681 Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Tue, 4 Jun 2024 17:57:08 +0200 Subject: [PATCH 4/4] comment out auth code to make staging testing easier --- app/controllers/datacite_dois_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/datacite_dois_controller.rb b/app/controllers/datacite_dois_controller.rb index 8cb630612..f5aec8b5c 100644 --- a/app/controllers/datacite_dois_controller.rb +++ b/app/controllers/datacite_dois_controller.rb @@ -558,7 +558,7 @@ def update authorize! :transfer, @doi @doi.assign_attributes(sanitized_params.slice(:client_id)) else - # authorize! :update, @doi + authorize! :update, @doi if sanitized_params[:schema_version].blank? @doi.assign_attributes( sanitized_params.except(:doi, :client_id).merge(