Combined fixes 280624

app/controllers/application_controller.rb

@@ -9,6 +9,10 @@ class ApplicationController < ActionController::Base
 
   helper LinksHelper
 
+  def not_found
+    render status: :not_found, plain: 'Not found'
+  end
+
 private
 
   def http_referrer

app/controllers/visits_controller.rb

@@ -1,6 +1,8 @@
 class VisitsController < ApplicationController
   def show
     @visit = PrisonVisits::Api.instance.get_visit(params[:id])
+    raise PrisonVisits::APINotFound unless @visit
+
     @request_completed = !request.referer.nil?
     render @visit.processing_state.to_s
   rescue PrisonVisits::APINotFound

app/services/prison_visits/api.rb

@@ -105,7 +105,10 @@ def get_visit(id)
         response = pool.with { |client| client.get("visits/#{id}") }
         Visit.new(response.fetch('visit'))
       else
-        visit_decorator(Staff::Visit.where(human_id: id).first)
+        visit = Staff::Visit.where(human_id: id).first
+        if visit
+          visit_decorator(Staff::Visit.where(human_id: id).first)
+        end
       end
     end
 

app/services/vsip/client.rb

@@ -8,7 +8,7 @@ module Vsip
 
   # This client is **NOT** thread safe. To be used with a connection pool. See below.
   class Client
-    TIMEOUT = 5 # seconds
+    TIMEOUT = 10 # seconds
     EXCON_INSTRUMENT_NAME = 'vsip_api'.freeze
     JSON_MIME_TYPE = 'application/json'.freeze
 

config/routes.rb

@@ -66,4 +66,6 @@
       post '/validations/visitors', to: 'validations#visitors'
     end
   end
+
+  match '*path', to: 'application#not_found', via: :all
 end

spec/features/not_found_spec.rb

@@ -0,0 +1,8 @@
+require 'rails_helper'
+
+RSpec.feature 'not_found', js: true do
+  scenario 'catch all pages' do
+    visit '/unknown'
+    expect(page).to have_text('Not found')
+  end
+end