Merge pull request #77 from datacite/refactor_use_stage_env

Refactor use stage env
datacite · Jun 15, 2020 · 9be23ff · 9be23ff
2 parents 4b58815 + 9d4d219
commit 9be23ff
Show file tree

Hide file tree

Showing 61 changed files with 668 additions and 151 deletions.
diff --git a/app/models/base.rb b/app/models/base.rb
@@ -154,7 +154,7 @@ def send_notification_to_slack(text, options={})
   end
 
   def self.doi_from_url(url)
-    if /\A(?:(http|https):\/\/(dx\.)?(doi.org|handle.test.datacite.org)\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(url)
+    if /\A(?:(http|https):\/\/(dx\.)?(doi.org|handle.test.datacite.org|handle.stage.datacite.org)\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(url)
       uri = Addressable::URI.parse(url)
       uri.path.gsub(/^\//, '').downcase
     end

diff --git a/app/models/report.rb b/app/models/report.rb
@@ -21,12 +21,18 @@ def initialize report, options={}
 
   def self.parse_multi_subset_report report
     subset = report.subsets.last
-
-    #puts subset["checksum"]
+
     compressed = decode_report subset["gzip"]
     json = decompress_report compressed
     dataset_array = parse_subset json
-    url = Rails.env.production? ? "https://api.datacite.org/reports/#{report.report_id}" : "https://api.test.datacite.org/reports/#{report.report_id}"
+    url = case true
+          when Rails.env.production?
+            "https://api.datacite.org/reports/#{report.report_id}"
+          when ENV["API_URL"].include?("test")
+            "https://api.test.datacite.org/reports/#{report.report_id}"
+          else
+            "https://api.stage.datacite.org/reports/#{report.report_id}"
+          end
     dataset_array.map do |dataset|
       args = {header: report.header, url: url}
       UsageUpdateParseJob.perform_later(dataset, args)

diff --git a/config/application.rb b/config/application.rb
@@ -35,10 +35,10 @@
 ENV['CONCURRENCY'] ||= "25"
 ENV['GITHUB_URL'] ||= "https://github.com/datacite/levriero"
 ENV['ORCID_API_URL'] ||= "https://pub.orcid.org/v2.1"
-ENV['API_URL'] ||= "https://api.test.datacite.org"
-ENV['VOLPINO_URL'] ||= "https://api.test.datacite.org"
-ENV['LAGOTTINO_URL'] ||= "https://api.test.datacite.org"
-ENV['SASHIMI_QUERY_URL'] ||= "https://api.test.datacite.org"
+ENV['API_URL'] ||= "https://api.stage.datacite.org"
+ENV['VOLPINO_URL'] ||= "https://api.stage.datacite.org"
+ENV['LAGOTTINO_URL'] ||= "https://api.stage.datacite.org"
+ENV['SASHIMI_QUERY_URL'] ||= "https://api.stage.datacite.org"
 ENV['EVENTDATA_URL'] ||= "https://bus-staging.eventdata.crossref.org"
 ENV['CROSSREF_QUERY_URL'] ||= "https://api.eventdata.crossref.org"
 ENV['TRUSTED_IP'] ||= "10.0.40.1"

diff --git a/spec/fixtures/event_data_resp_1 b/spec/fixtures/event_data_resp_1
@@ -1,2 +1,2 @@
-https://api.test.datacite.org/reports/2018-3-Dash total-dataset-investigations-regular https://doi.org/10.7291/d1q94r pushed to Event Data service.
-https://api.test.datacite.org/reports/2018-3-Dash unique-dataset-investigations-regular https://doi.org/10.7291/d1q94r pushed to Event Data service.
+https://api.stage.datacite.org/reports/2018-3-Dash total-dataset-investigations-regular https://doi.org/10.7291/d1q94r pushed to Event Data service.
+https://api.stage.datacite.org/reports/2018-3-Dash unique-dataset-investigations-regular https://doi.org/10.7291/d1q94r pushed to Event Data service.
diff --git a/spec/fixtures/event_data_resp_2 b/spec/fixtures/event_data_resp_2
@@ -1,4 +1,4 @@
-https://api.test.datacite.org/reports/2018-3-Dash total-dataset-investigations-regular https://doi.org/10.7291/d1q94r had an error:\nthe server responded with status 500/\n
-https://api.test.datacite.org/reports/2018-3-Dash unique-dataset-investigations-regular https://doi.org/10.7291/d1q94r had an error:\nthe server responded with status 500/\n
-https://api.test.datacite.org/reports/2018-3-Dash Total-Dataset-Requests-Machine https://doi.org/10.6071/z7wc73 had an error:\nthe server responded with status 500/\n
-https://api.test.datacite.org/reports/2018-3-Dash Unique-Dataset-Requests-Machine https://doi.org/10.6071/z7wc73 had an error:\nthe server responded with status 500/\n
+https://api.stage.datacite.org/reports/2018-3-Dash total-dataset-investigations-regular https://doi.org/10.7291/d1q94r had an error:\nthe server responded with status 500/\n
+https://api.stage.datacite.org/reports/2018-3-Dash unique-dataset-investigations-regular https://doi.org/10.7291/d1q94r had an error:\nthe server responded with status 500/\n
+https://api.stage.datacite.org/reports/2018-3-Dash Total-Dataset-Requests-Machine https://doi.org/10.6071/z7wc73 had an error:\nthe server responded with status 500/\n
+https://api.stage.datacite.org/reports/2018-3-Dash Unique-Dataset-Requests-Machine https://doi.org/10.6071/z7wc73 had an error:\nthe server responded with status 500/\n
diff --git a/spec/fixtures/events_empty.json b/spec/fixtures/events_empty.json
@@ -17,9 +17,9 @@
   }, {
     "uuid": "fc6860b8-4230-41bc-8b8e-21d60e9a7d9a",
     "message-action": "create",
-    "subj-id": "https://api.test.datacite.org/reports/2018-3-Dashs",
+    "subj-id": "https://api.stage.datacite.org/reports/2018-3-Dashs",
     "subj": {
-      "id": "https://api.test.datacite.org/reports/2018-3-Dashs",
+      "id": "https://api.stage.datacite.org/reports/2018-3-Dashs",
       "issued": "2128-04-09"
     },
     "total": 3,

diff --git a/spec/fixtures/usage_event.json b/spec/fixtures/usage_event.json
@@ -1 +1 @@
-{"report_id":"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"}
+{"report_id":"https://api.stage.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"}
diff --git a/spec/fixtures/usage_event_fail.json b/spec/fixtures/usage_event_fail.json
@@ -2,7 +2,7 @@
     "id": 12332423432432,
     "message-action": "create",
     "subj": {
-      "id": "https://api.test.datacite.org/reports/2018-3-Dash",
+      "id": "https://api.stage.datacite.org/reports/2018-3-Dash",
       "issued": "2128-04-09"
     },
     "total": "208",

diff --git a/spec/fixtures/usage_events.json b/spec/fixtures/usage_events.json
@@ -2,9 +2,9 @@
   {
     "uuid": "a17e783b-8214-451e-9b0d-077213c2acae",
     "message-action": "create",
-    "subj-id": "https://api.test.datacite.org/reports/2018-3-Dash",
+    "subj-id": "https://api.stage.datacite.org/reports/2018-3-Dash",
     "subj": {
-      "id": "https://api.test.datacite.org/reports/2018-3-Dash",
+      "id": "https://api.stage.datacite.org/reports/2018-3-Dash",
       "issued": "2128-04-09"
     },
     "total": 3,
@@ -17,9 +17,9 @@
   }, {
     "uuid": "fc6860b8-4230-41bc-8b8e-21d60e9a7d9a",
     "message-action": "create",
-    "subj-id": "https://api.test.datacite.org/reports/2018-3-Dash",
+    "subj-id": "https://api.stage.datacite.org/reports/2018-3-Dash",
     "subj": {
-      "id": "https://api.test.datacite.org/reports/2018-3-Dash",
+      "id": "https://api.stage.datacite.org/reports/2018-3-Dash",
       "issued": "2128-04-09"
     },
     "total": 3,
@@ -32,9 +32,9 @@
   }, {
     "uuid": "054da0ad-9821-492e-877e-5c3adbfd5ccf",
     "message-action": "create",
-    "subj-id": "https://api.test.datacite.org/reports/2018-3-Dash",
+    "subj-id": "https://api.stage.datacite.org/reports/2018-3-Dash",
     "subj": {
-      "id": "https://api.test.datacite.org/reports/2018-3-Dash",
+      "id": "https://api.stage.datacite.org/reports/2018-3-Dash",
       "issued": "2128-04-09"
     },
     "total": 254,
@@ -47,9 +47,9 @@
   }, {
     "uuid": "6d6fd620-2123-42da-91f3-6c02e63f3cec",
     "message-action": "create",
-    "subj-id": "https://api.test.datacite.org/reports/2018-3-Dash",
+    "subj-id": "https://api.stage.datacite.org/reports/2018-3-Dash",
     "subj": {
-      "id": "https://api.test.datacite.org/reports/2018-3-Dash",
+      "id": "https://api.stage.datacite.org/reports/2018-3-Dash",
       "issued": "2128-04-09"
     },
     "total": 208,

diff --git a/spec/fixtures/vcr_cassettes/AffiliationIdentifier/import_affiliation_identifiers/import.yml b/spec/fixtures/vcr_cassettes/AffiliationIdentifier/import_affiliation_identifiers/import.yml
diff --git a/...xtures/vcr_cassettes/AffiliationIdentifier/import_affiliation_identifiers/import_zero.yml b/...xtures/vcr_cassettes/AffiliationIdentifier/import_affiliation_identifiers/import_zero.yml
diff --git a/...fixtures/vcr_cassettes/AffiliationIdentifier/import_affiliation_identifiers/push_item.yml b/...fixtures/vcr_cassettes/AffiliationIdentifier/import_affiliation_identifiers/push_item.yml
diff --git a/spec/fixtures/vcr_cassettes/Base/get_crossref_metadata/fetch_crossref_metadata.yml b/spec/fixtures/vcr_cassettes/Base/get_crossref_metadata/fetch_crossref_metadata.yml
diff --git a/spec/fixtures/vcr_cassettes/Base/get_datacite_json/fetch_metadata_dataset.yml b/spec/fixtures/vcr_cassettes/Base/get_datacite_json/fetch_metadata_dataset.yml
diff --git a/spec/fixtures/vcr_cassettes/Base/get_datacite_json/fetch_metadata_scholarly-article.yml b/spec/fixtures/vcr_cassettes/Base/get_datacite_json/fetch_metadata_scholarly-article.yml
diff --git a/spec/fixtures/vcr_cassettes/Base/get_datacite_metadata/fetch_metadata_ScholarlyArticle.yml b/spec/fixtures/vcr_cassettes/Base/get_datacite_metadata/fetch_metadata_ScholarlyArticle.yml
diff --git a/spec/fixtures/vcr_cassettes/Base/get_datacite_metadata/fetch_metadata_dataset.yml b/spec/fixtures/vcr_cassettes/Base/get_datacite_metadata/fetch_metadata_dataset.yml
diff --git a/...tures/vcr_cassettes/Base/get_datacite_metadata/fetch_metadata_with_author_information.yml b/...tures/vcr_cassettes/Base/get_datacite_metadata/fetch_metadata_with_author_information.yml
diff --git a/...ures/vcr_cassettes/Base/get_datacite_metadata/fetch_metadata_with_funding_information.yml b/...ures/vcr_cassettes/Base/get_datacite_metadata/fetch_metadata_with_funding_information.yml
diff --git a/spec/fixtures/vcr_cassettes/Base/get_datacite_xml/fetch_metadata_dataset.yml b/spec/fixtures/vcr_cassettes/Base/get_datacite_xml/fetch_metadata_dataset.yml
diff --git a/spec/fixtures/vcr_cassettes/Base/get_datacite_xml/fetch_metadata_scholarly-article.yml b/spec/fixtures/vcr_cassettes/Base/get_datacite_xml/fetch_metadata_scholarly-article.yml
diff --git a/spec/fixtures/vcr_cassettes/Base/get_orcid_metadata/fetch_orcid_metadata.yml b/spec/fixtures/vcr_cassettes/Base/get_orcid_metadata/fetch_orcid_metadata.yml
diff --git a/spec/fixtures/vcr_cassettes/CrossrefFunder/import_crossref_funder/push_item.yml b/spec/fixtures/vcr_cassettes/CrossrefFunder/import_crossref_funder/push_item.yml
diff --git a/spec/fixtures/vcr_cassettes/CrossrefImport/import_crossref_import/push_item.yml b/spec/fixtures/vcr_cassettes/CrossrefImport/import_crossref_import/push_item.yml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"report_id":"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"}
		{"report_id":"https://api.stage.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"}