Merge pull request #1202 from alphagov/serve-whitehall-asset-from-med…

…ia-download-endpoint

Enable serving whitehall asset from media download endpoint

app/controllers/media_controller.rb

@@ -150,8 +150,7 @@ def filename_current?
 
   def asset_servable?
     asset.filename_valid?(params[:filename]) &&
-      asset.uploaded? &&
-      asset.mainstream?
+      asset.uploaded?
   end
 
   def asset

app/models/asset.rb

@@ -121,10 +121,6 @@ def public_url_path
     "/media/#{id}/#{filename}"
   end
 
-  def mainstream?
-    true
-  end
-
   def file=(file)
     old_filename = filename
     super(file).tap do

app/models/whitehall_asset.rb

@@ -44,8 +44,4 @@ def last_modified
   def public_url_path
     legacy_url_path
   end
-
-  def mainstream?
-    false
-  end
 end

spec/controllers/media_controller_spec.rb

@@ -210,6 +210,16 @@ def download
         get :download, **params
       end
 
+      context "with a whitehall asset" do
+        let(:asset) { FactoryBot.create(:uploaded_whitehall_asset) }
+
+        it "proxies whitehall asset to S3 via Nginx" do
+          expect(controller).to receive(:proxy_to_s3_via_nginx).with(asset)
+
+          get :download, **params
+        end
+      end
+
       it "sets Cache-Control header to expire in 30 minutes and be publicly cacheable" do
         get :download, **params
 
@@ -520,16 +530,6 @@ def download
       end
     end
 
-    context "with an otherwise servable whitehall asset" do
-      let(:path) { "/government/uploads/asset.png" }
-      let(:asset) { FactoryBot.create(:uploaded_whitehall_asset, legacy_url_path: path) }
-
-      it "responds with 404 Not Found" do
-        get :download, **params
-        expect(response).to have_http_status(:not_found)
-      end
-    end
-
     context "with an infected file" do
       let(:asset) { FactoryBot.create(:infected_asset) }
 

spec/models/asset_spec.rb

@@ -376,7 +376,7 @@
       described_class.new(file: load_fixture_file("asset.png"))
     end
 
-    it "returns public URL path for mainstream asset" do
+    it "returns public URL path for asset" do
       expected_path = download_media_path(id: asset.id, filename: asset.filename)
       expect(asset.public_url_path).to eq(expected_path)
     end
@@ -1035,14 +1035,6 @@
     end
   end
 
-  describe "#mainstream?" do
-    let(:asset) { described_class.new }
-
-    it "returns truth-y" do
-      expect(asset).to be_mainstream
-    end
-  end
-
   describe "#upload_success!" do
     context "when asset is unscanned" do
       let(:asset) { FactoryBot.create(:asset) }

spec/models/whitehall_asset_spec.rb

@@ -137,14 +137,6 @@
     end
   end
 
-  describe "#mainstream?" do
-    let(:asset) { described_class.new }
-
-    it "returns false-y" do
-      expect(asset).not_to be_mainstream
-    end
-  end
-
   describe ".from_params" do
     let(:format_from_params) { "png" }
     let(:path_from_params) { "government/uploads/path/to/asset" }