fix url registration in handle system. #666

datacite · Oct 23, 2020 · c52c1f9 · c52c1f9
1 parent 3c4382e
commit c52c1f9
Show file tree

Hide file tree

Showing 51 changed files with 518 additions and 217 deletions.
diff --git a/app/models/doi.rb b/app/models/doi.rb
@@ -106,7 +106,7 @@ class Doi < ActiveRecord::Base
   validates_inclusion_of :agency, :in => %w(datacite crossref kisti medra istic jalc airiti cnki op), allow_blank: true
   validates :last_landing_page_status, numericality: { only_integer: true }, if: :last_landing_page_status?
   validates :xml, presence: true, xml_schema: true, if: Proc.new { |doi| doi.validatable? }
-  validate :check_url, if: :url?
+  validate :check_url, if: Proc.new { |doi| doi.is_registered_or_findable? }
   validate :check_dates, if: :dates?
   validate :check_rights_list, if: :rights_list?
   validate :check_titles, if: :titles?
@@ -1774,7 +1774,9 @@ def update_url
 
     if %w(europ).include?(provider_id) || type == "OtherDoi"
       UrlJob.perform_later(doi)
-    elsif url_changed? || changes["aasm_state"] == ["draft", "findable"] || changes["aasm_state"] == ["draft", "registered"]
+    # TODO better define conditions for updating handle system
+    # elsif url_changed? || changes["aasm_state"] == ["draft", "findable"] || changes["aasm_state"] == ["draft", "registered"]
+    else
       register_url
     end
   end
@@ -1838,9 +1840,7 @@ def event=(value)
   end
 
   def check_url
-    return nil if is_registered_or_findable?
-
-    unless match_url_with_domains(url: url, domains: client.domains)
+    unless url.blank? || match_url_with_domains(url: url, domains: client.domains)
       errors.add(:url, "URL is not allowed by repository domain settings.")
     end
   end

diff --git a/spec/fixtures/files/datacite-user-example.json b/spec/fixtures/files/datacite-user-example.json
@@ -4,14 +4,16 @@
     "resourceTypeGeneral": "Text"
   },
   "identifiers": [{
-    "identifier":"https://doi.org/10.17918/9zwb-rb91",
+    "identifier": "https://doi.org/10.17918/9zwb-rb91",
     "identifier_type": "DOI"
   }],
   "creators": [{
     "nameType": "Personal",
     "givenName": "Julia M.",
     "familyName": "Rovera",
-    "affiliation": ["Drexel University"],
+    "affiliation": [{
+      "name": "Drexel University"
+    }],
     "nameIdentifiers": [{
       "schemeUri": "https://orcid.org",
       "nameIdentifier": "",

diff --git a/...tures/vcr_cassettes/DataciteDoisController/GET_/dois/DOI/get-url/it_works/returns_url.yml b/...tures/vcr_cassettes/DataciteDoisController/GET_/dois/DOI/get-url/it_works/returns_url.yml
diff --git a/...es/vcr_cassettes/DataciteDoisController/GET_/dois/DOI/get-url/no_password/returns_url.yml b/...es/vcr_cassettes/DataciteDoisController/GET_/dois/DOI/get-url/no_password/returns_url.yml
diff --git a/...cr_cassettes/DataciteDoisController/GET_/dois/DOI/get-url/not_found/returns_not_found.yml b/...cr_cassettes/DataciteDoisController/GET_/dois/DOI/get-url/not_found/returns_not_found.yml
diff --git a/spec/fixtures/vcr_cassettes/DataciteDoisController/GET_/dois/get-dois/returns_all_dois.yml b/spec/fixtures/vcr_cassettes/DataciteDoisController/GET_/dois/get-dois/returns_all_dois.yml
diff --git a/...r_cassettes/DataciteDoisController/GET_/dois_with_views_and_downloads/includes_events.yml b/...r_cassettes/DataciteDoisController/GET_/dois_with_views_and_downloads/includes_events.yml
diff --git a/...H_/dois/_id/NoMethodError_https_/github_com/datacite/lupo/issues/84/returns_no_errors.yml b/...H_/dois/_id/NoMethodError_https_/github_com/datacite/lupo/issues/84/returns_no_errors.yml
diff --git a/...ators_no_xml/returns_validation_error.yml → ...is/_id/update_formats/updates_the_doi.yml b/...ators_no_xml/returns_validation_error.yml → ...is/_id/update_formats/updates_the_doi.yml
diff --git a/...res/vcr_cassettes/DataciteDoisController/PATCH_/dois/_id/update_sizes/updates_the_doi.yml b/...res/vcr_cassettes/DataciteDoisController/PATCH_/dois/_id/update_sizes/updates_the_doi.yml
diff --git a/...roller/PATCH_/dois/_id/when_a_doi_is_created_ignore_reverting_back/creates_the_record.yml b/...roller/PATCH_/dois/_id/when_a_doi_is_created_ignore_reverting_back/creates_the_record.yml
diff --git a/...roller/PATCH_/dois/_id/when_a_doi_is_created_ignore_reverting_back/revert_the_changes.yml b/...roller/PATCH_/dois/_id/when_a_doi_is_created_ignore_reverting_back/revert_the_changes.yml
diff --git a/...es/DataciteDoisController/PATCH_/dois/_id/when_the_creators_change/updates_the_record.yml b/...es/DataciteDoisController/PATCH_/dois/_id/when_the_creators_change/updates_the_record.yml
diff --git a/...sController/PATCH_/dois/_id/when_the_date_issued_is_changed_to_tba/updates_the_record.yml b/...sController/PATCH_/dois/_id/when_the_date_issued_is_changed_to_tba/updates_the_record.yml
diff --git a/...ontroller/PATCH_/dois/_id/when_the_description_is_changed_to_empty/updates_the_record.yml b/...ontroller/PATCH_/dois/_id/when_the_description_is_changed_to_empty/updates_the_record.yml
diff --git a/...taciteDoisController/PATCH_/dois/_id/when_the_record_doesn_t_exist/creates_the_record.yml b/...taciteDoisController/PATCH_/dois/_id/when_the_record_doesn_t_exist/creates_the_record.yml