Merge pull request #231 from edgi-govdata-archiving/hotfix-capture-ti…

…me-and-other-version-data-on-page-queries HOTFIX: querying by capture_time + source_type/hash
edgi-govdata-archiving · Feb 20, 2018 · b4946b0 · b4946b0
2 parents f5db2f7 + a86b9d1
commit b4946b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/controllers/api/v0/pages_controller.rb b/app/controllers/api/v0/pages_controller.rb
@@ -102,7 +102,7 @@ def page_collection
 
     version_params = params.permit(:hash, :source_type)
     if version_params.present?
-      collection = collection.left_outer_joins(:versions).where(versions: {
+      collection = collection.joins(:versions).where(versions: {
         version_hash: params[:hash],
         source_type: params[:source_type]
       }.compact)

diff --git a/test/controllers/api/v0/pages_controller_test.rb b/test/controllers/api/v0/pages_controller_test.rb
@@ -532,4 +532,13 @@ def get_all_pages(url)
     assert_equal(3, body['meta']['total_results'])
     assert_equal(3, body['data'].length)
   end
+
+  test 'can query pages by capture time and source type together' do
+    sign_in users(:alice)
+    get api_v0_pages_path(params: {
+      capture_time: '2017-03-01T00:00:00Z..2017-03-01T12:00:00Z',
+      source_type: 'versionista'
+    })
+    assert_response :success
+  end
 end