error mapping

Author: kpethtel

app/controllers/v0/tsa_letter_controller.rb

@@ -9,7 +9,9 @@ class TsaLetterController < ApplicationController
     before_action { authorize :tsa_letter, :access? }
 
     ERROR_MAP = {
+      400 => Common::Exceptions::BadRequest,
       401 => Common::Exceptions::Unauthorized,
+      403 => Common::Exceptions::Forbidden,
       500 => Common::Exceptions::ExternalServerInternalServerError,
       501 => Common::Exceptions::NotImplemented
     }.freeze
@@ -22,11 +24,14 @@ def show
       serialized = most_recent_letter(files_metadata)
       render(json: serialized)
     rescue Common::Client::Errors::ClientError => e
-      handle_error(e)
+      handle_show_error(e)
     end
 
     def download
-      files_metadata = fetch_letter_metadata
+      files_metadata = handle_download_error('TSA Letter Error on download validation') do
+        fetch_letter_metadata
+      end
+
       user_owns_file = files_metadata.any? do |file|
         params[:id] == file['uuid'] && params[:version_id] == file['currentVersionUuid']
       end
@@ -35,7 +40,9 @@ def download
       end
 
       download_service = ClaimsEvidenceApi::Service::Files.new
-      letter_response = download_service.download(params[:id], params[:version_id])
+      letter_response = handle_download_error('TSA Letter Download Error') do
+        download_service.download(params[:id], params[:version_id])
+      end
       send_data(
         letter_response.body,
         type: 'application/pdf',
@@ -74,20 +81,36 @@ def most_recent_letter(files)
             source: self.class.name
     end
 
-    def handle_error(error)
+    def handle_show_error(error)
       status = error.respond_to?(:status) && error.status
       case status
-      when *ERROR_MAP.keys
-        error_class = ERROR_MAP[status]
-        raise error_class
       when *NONBLOCKING_STATUSES
-        Rails.logger.info('TSA Letter Error',
+        Rails.logger.info('Non-blocking TSA Letter Error',
                           error_status: status,
                           user_account_id: current_user.user_account_uuid)
         render(json: { data: nil })
+      when *ERROR_MAP.keys
+        error_class = ERROR_MAP[status]
+        raise error_class
       else
         raise error
       end
     end
+
+    def handle_download_error(description, &command)
+      yield(command)
+    rescue Common::Client::Errors::ClientError => e
+      status = e.respond_to?(:status) && e.status
+      case status
+      when *ERROR_MAP.keys
+        Rails.logger.info(description,
+                          error_status: status,
+                          user_account_id: current_user.user_account_uuid)
+        error_class = ERROR_MAP[status]
+        raise error_class
+      else
+        raise e
+      end
+    end
   end
 end

spec/requests/v0/tsa_letter_spec.rb

@@ -40,7 +40,7 @@
           get '/v0/tsa_letter'
           expect(response).to have_http_status(:ok)
           expect(response.body).to eq({ data: nil }.to_json)
-          expect(Rails.logger).to have_received(:info).with('TSA Letter Error',
+          expect(Rails.logger).to have_received(:info).with('Non-blocking TSA Letter Error',
                                                             error_status: 403,
                                                             user_account_id: user.user_account_uuid)
         end
@@ -54,7 +54,7 @@
           get '/v0/tsa_letter'
           expect(response).to have_http_status(:ok)
           expect(response.body).to eq({ data: nil }.to_json)
-          expect(Rails.logger).to have_received(:info).with('TSA Letter Error',
+          expect(Rails.logger).to have_received(:info).with('Non-blocking TSA Letter Error',
                                                             error_status: 400,
                                                             user_account_id: user.user_account_uuid)
         end
@@ -179,20 +179,20 @@
     end
 
     context 'when metadata fetch fails' do
-      it 'raises service unavailable' do
+      it 'raises bad request' do
         VCR.use_cassette('tsa_letters/show_bad_request', { match_requests_on: %i[method uri body] }) do
           get "/v0/tsa_letter/#{document_id}/version/#{version_id}/download"
-          expect(response).to have_http_status(:service_unavailable)
+          expect(response).to have_http_status(:bad_request)
         end
       end
     end
 
     context 'when upstream returns error status' do
-      it 'renders 503' do
+      it 'renders mapped error' do
         VCR.use_cassette('tsa_letters/show_success', { match_requests_on: %i[method uri body] }) do
           VCR.use_cassette('tsa_letters/download_not_found', { match_requests_on: %i[method uri] }) do
             get "/v0/tsa_letter/#{document_id}/version/#{version_id}/download"
-            expect(response).to have_http_status(:service_unavailable)
+            expect(response).to have_http_status(:forbidden)
           end
         end
       end