Merge pull request #1319 from datacite/issue-838

Ensure cursor-based pagination and random sorting are mutually exclusive (+bonus VCRs)
datacite · Jan 28, 2025 · a72701c · a72701c
2 parents f156484 + 632d614
commit a72701c
Show file tree

Hide file tree

Showing 12 changed files with 422 additions and 2 deletions.
diff --git a/app/models/doi.rb b/app/models/doi.rb
@@ -1179,11 +1179,15 @@ def self.query(query, options = {})
         bool: bool_query,
       },
       random_score: {
-        "seed": Rails.env.test? ? "random_1234" : "random_#{rand(1...100000)}",
+        "seed": "random_#{rand(1...100000)}",
       },
     }
 
-    if options[:random].present?
+    if options[:random].present? && options[:random].to_s.downcase == "true"  # .present? will always be true even if "false" is the value, because strings are truthy
+      # Random results and cursor pagination are incompatible (https://github.com/datacite/lupo/issues/838), throw an error if attempted
+      if options.fetch(:page, {}).key?(:cursor)
+        fail ActionController::BadRequest, "Cursor-based pagination and random sampling are mutually exclusive, please choose one or the other."
+      end
       es_query["function_score"] = function_score
       # Don't do any sorting for random results
       sort = nil

diff --git a/..._request_is_valid_with_publisher_as_a_hash/creates_a_Doi_with_publisher_param_not_set.yml b/..._request_is_valid_with_publisher_as_a_hash/creates_a_Doi_with_publisher_param_not_set.yml
diff --git a/...uest_is_valid_with_publisher_as_a_hash/creates_a_Doi_with_publisher_param_set_to_true.yml b/...uest_is_valid_with_publisher_as_a_hash/creates_a_Doi_with_publisher_param_set_to_true.yml
diff --git a/...ttes/DataciteDoisController/POST_/dois/when_the_request_uses_schema_4_5/creates_a_Doi.yml b/...ttes/DataciteDoisController/POST_/dois/when_the_request_uses_schema_4_5/creates_a_Doi.yml
diff --git a/.../dois/when_the_request_uses_schema_4_5/creates_a_Doi_with_publisher_param_set_to_true.yml b/.../dois/when_the_request_uses_schema_4_5/creates_a_Doi_with_publisher_param_set_to_true.yml
diff --git a/...settes/DataciteDoisController/PUT_/dois/_id/update_publisher/with_publisher_as_object.yml b/...settes/DataciteDoisController/PUT_/dois/_id/update_publisher/with_publisher_as_object.yml
diff --git a/..._/dois/_id/update_publisher/with_publisher_as_object_with_publisher_param_set_to_true.yml b/..._/dois/_id/update_publisher/with_publisher_as_object_with_publisher_param_set_to_true.yml
diff --git a/...settes/DataciteDoisController/PUT_/dois/_id/update_publisher/with_publisher_as_string.yml b/...settes/DataciteDoisController/PUT_/dois/_id/update_publisher/with_publisher_as_string.yml
diff --git a/..._/dois/_id/update_publisher/with_publisher_as_string_with_publisher_param_set_to_true.yml b/..._/dois/_id/update_publisher/with_publisher_as_string_with_publisher_param_set_to_true.yml
diff --git a/...ettes/DataciteDoisController/PUT_/dois/_id/update_publisher/with_publisher_obj_in_xml.yml b/...ettes/DataciteDoisController/PUT_/dois/_id/update_publisher/with_publisher_obj_in_xml.yml