ACD-472: Update Ruby to v. 3.3.6 (#2716)

* ACD-472: Update Ruby to v. 3.3.6

* Small refactor: make explicit calls in query_cda.

* Update Gemfile

* Handle Rubocop improvements and fix error about empty @laa_reference

Author: alexdesi

.circleci/config.yml

@@ -73,7 +73,7 @@ executors:
   test-executor:
     working_directory: ~/repo
     docker:
-      - image: cimg/ruby:3.1.5-browsers
+      - image: cimg/ruby:3.3.6-browsers
         environment:
           RAILS_ENV: test
           DATABASE_URL: postgres://postgres:circleci@127.0.0.1:5432/laa_court_data_ui_test

.ruby-version

@@ -1 +1,2 @@
-3.1.5
+3.3.6
+

Gemfile

@@ -3,8 +3,6 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.1.5'
-
 gem 'activeresource', '~> 6.1.4'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.7.0', require: false
@@ -23,7 +21,7 @@ gem 'json_api_client', '~> 1.23'
 gem 'json-schema', '~> 5.1'
 gem 'logstasher'
 gem 'oauth2', '~> 2.0.9'
-gem 'pg', '>= 0.18', '< 2.0'
+gem 'pg', '>= 1.5.9', '< 2.0'
 gem 'prometheus_exporter', '2.1.1'
 gem 'puma', '>= 5.6.4'
 gem 'rails', '~> 7.0.8'

Gemfile.lock

@@ -129,7 +129,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    date (3.4.0)
+    date (3.4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     devise (4.9.4)
@@ -229,12 +229,13 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    io-console (0.7.2)
+    io-console (0.8.0)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.8.2)
-    json-schema (5.1.0)
+    json (2.9.0)
+    json-schema (5.1.1)
       addressable (~> 2.8)
+      bigdecimal (~> 3.1)
     json_api_client (1.23.0)
       activemodel (>= 6.0.0)
       activesupport (>= 6.0.0)
@@ -251,7 +252,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
+    logger (1.6.2)
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
@@ -267,7 +268,7 @@ GEM
     matrix (0.4.2)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.25.2)
+    minitest (5.25.4)
     msgpack (1.7.5)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
@@ -282,9 +283,9 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.16.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.8-x86_64-linux)
       racc (~> 1.4)
     notifications-ruby-client (6.2.0)
       jwt (>= 1.5, < 3)
@@ -313,7 +314,7 @@ GEM
     pry-rails (0.3.11)
       pry (>= 0.13.0)
     public_suffix (6.0.1)
-    puma (6.4.3)
+    puma (6.5.0)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (2.2.10)
@@ -341,9 +342,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
@@ -363,8 +364,8 @@ GEM
       redis-client (>= 0.22.0)
     redis-client (0.22.2)
       connection_pool
-    regexp_parser (2.9.2)
-    reline (0.5.11)
+    regexp_parser (2.9.3)
+    reline (0.5.12)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
@@ -395,42 +396,42 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.66.1)
+    rubocop (1.69.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.36.2)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-performance (1.22.1)
+    rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.26.2)
+    rubocop-rails (2.27.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.5)
+    rubocop-rspec (3.2.0)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    selenium-webdriver (4.26.0)
+    selenium-webdriver (4.27.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -507,14 +508,14 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.0)
+    webrick (1.9.1)
     websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.1)
     zlib (3.2.0)
 
 PLATFORMS
@@ -553,7 +554,7 @@ DEPENDENCIES
   net-pop (~> 0.1.2)
   net-smtp (~> 0.5.0)
   oauth2 (~> 2.0.9)
-  pg (>= 0.18, < 2.0)
+  pg (>= 1.5.9, < 2.0)
   prometheus_exporter (= 2.1.1)
   pry
   pry-byebug
@@ -588,8 +589,5 @@ DEPENDENCIES
   web-console (>= 4.2.0)
   webmock
 
-RUBY VERSION
-   ruby 3.1.5p252
-
 BUNDLED WITH
    2.3.3

app/controllers/searches_controller.rb

@@ -82,13 +82,14 @@ def set_view_options
 
   def handle_client_error(exception)
     logger.info 'CLIENT_ERROR_OCCURRED'
-    @laa_reference&.errors&.from_json(exception.response.body)
-    render_error(I18n.t('search.error.unprocessable'), @laa_reference&.errors&.full_messages&.join(', '))
+
+    render_error(I18n.t('search.error.unprocessable'), exception.response.body)
   end
 
   def handle_server_error(exception)
     logger.error 'SERVER_ERROR_OCCURRED'
-    log_sentry_error(exception, @laa_reference&.errors)
+
+    log_sentry_error(exception, exception.response.body)
     render_error(I18n.t('search.error.failure'), I18n.t('error.it_helpdesk'))
   end
 

app/decorators/offence_decorator.rb

@@ -25,9 +25,11 @@ def sorted_pleas
   end
 
   def plea_sentence(plea)
+    plea_date = plea&.pleaded_at&.to_date
+
     t('offence.plea.sentence',
       plea: plea&.code&.humanize || t('generic.not_available'),
-      pleaded_at: plea&.pleaded_at&.to_date&.strftime('%d/%m/%Y') || t('generic.not_available'))
+      pleaded_at: plea_date&.strftime('%d/%m/%Y') || t('generic.not_available'))
   end
 
   def mode_of_trial_reason_descriptions

app/decorators/offence_summary_decorator.rb

@@ -19,8 +19,10 @@ def sorted_pleas
   end
 
   def return_plea(plea)
+    plea_date = plea&.date&.to_date
+
     t('offence.plea.sentence',
       plea: plea&.value&.humanize || t('generic.not_available'),
-      pleaded_at: plea&.date&.to_date&.strftime('%d/%m/%Y') || t('generic.not_available'))
+      pleaded_at: plea_date&.strftime('%d/%m/%Y') || t('generic.not_available'))
   end
 end

app/helpers/hearing_helper.rb

@@ -6,7 +6,7 @@ def paginator(...)
   end
 
   def earliest_day_for(hearing)
-    hearing&.hearing_days&.map(&:to_datetime)&.min
+    hearing.hearing_days.map(&:to_datetime).min
   end
 
   def transform_and_sanitize(text)

app/models/search.rb

@@ -6,6 +6,8 @@
 class Search
   include ActiveModel::Model
 
+  attr_accessor :filter, :term, :dob, :version2
+
   def self.filters
     [
       _filter(id: :case_reference,
@@ -21,8 +23,6 @@ def self.filters
     SearchFilter.new(**args)
   end
 
-  attr_accessor :filter, :term, :dob, :version2
-
   def filters
     self.class.filters
   end
@@ -62,18 +62,13 @@ def query_cd_api
   end
 
   def query_cda
-    send(:"#{filter}_query")
-  end
-
-  def case_reference_query
-    CourtDataAdaptor::Query::ProsecutionCase.new(term)
-  end
-
-  def defendant_reference_query
-    CourtDataAdaptor::Query::Defendant::ByReference.new(term)
-  end
-
-  def defendant_name_query
-    CourtDataAdaptor::Query::Defendant::ByName.new(term, dob:)
+    case filter
+    when 'case_reference'
+      CourtDataAdaptor::Query::ProsecutionCase.new(term)
+    when 'defendant_reference'
+      CourtDataAdaptor::Query::Defendant::ByReference.new(term)
+    when 'defendant_name'
+      CourtDataAdaptor::Query::Defendant::ByName.new(term, dob:)
+    end
   end
 end

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1.5-alpine3.20
+FROM ruby:3.3.6-alpine3.20
 LABEL Organisation="Ministry of Justice"
 LABEL Team="LAA Get Paid"
 LABEL Contact="<assessaclaim@digital.justice.gov.uk>"

spec/lib/court_data_adaptor/query/defendant/by_name_spec.rb

@@ -29,7 +29,7 @@ def self.resource
 
     context 'with mocking' do
       let(:resource) { self.class.resource }
-      let(:resultset) { instance_double('ResultSet') }
+      let(:resultset) { instance_double('ResultSet') } # rubocop:disable RSpec/StringAsInstanceDoubleConstant
 
       before do
         allow(instance).to receive(:refresh_token_if_required!)

spec/lib/court_data_adaptor/query/defendant/by_reference_spec.rb

@@ -24,7 +24,7 @@ def self.resource
 
     let(:instance) { described_class.new(term) }
     let(:resource) { self.class.resource }
-    let(:resultset) { instance_double('ResultSet') }
+    let(:resultset) { instance_double('ResultSet') } # rubocop:disable RSpec/StringAsInstanceDoubleConstant
 
     before do
       allow(instance).to receive(:refresh_token_if_required!)

spec/lib/court_data_adaptor/query/defendant/by_uuid_spec.rb

@@ -24,7 +24,7 @@ def self.resource
 
     let(:instance) { described_class.new(term) }
     let(:resource) { self.class.resource }
-    let(:resultset) { instance_double('ResultSet') }
+    let(:resultset) { instance_double('ResultSet') } # rubocop:disable RSpec/StringAsInstanceDoubleConstant
 
     before do
       allow(instance).to receive(:refresh_token_if_required!)

spec/lib/court_data_adaptor/query/hearing_spec.rb

@@ -22,7 +22,7 @@ def self.resource
     let(:instance) { described_class.new(term) }
     let(:term) { 'a-hearing-uuid' }
     let(:resource) { self.class.resource }
-    let(:resultset) { instance_double('ResultSet') }
+    let(:resultset) { instance_double('ResultSet') } # rubocop:disable RSpec/StringAsInstanceDoubleConstant
 
     before do
       allow(instance).to receive(:refresh_token_if_required!)

spec/lib/court_data_adaptor/query/prosecution_case_spec.rb

@@ -22,7 +22,7 @@ def self.resource
     let(:instance) { described_class.new(term) }
     let(:term) { 'ACASEURN' }
     let(:resource) { self.class.resource }
-    let(:resultset) { instance_double('ResultSet') }
+    let(:resultset) { instance_double('ResultSet') } # rubocop:disable RSpec/StringAsInstanceDoubleConstant
 
     before do
       allow(instance).to receive(:refresh_token_if_required!)

spec/support/capybara_extensions.rb

@@ -70,15 +70,15 @@ def has_govuk_error_field?(model, field, error_text = nil)
     end
 
     def has_govuk_detail_summary?(text, options = {})
-      has_selector?(detail_summary_selector, **options.merge(text:))
+      has_selector?(detail_summary_selector, text:, **options)
     end
 
     def has_no_govuk_detail_summary?(text, options = {})
-      has_no_selector?(detail_summary_selector, **options.merge(text:))
+      has_no_selector?(detail_summary_selector, text:, **options)
     end
 
     def click_govuk_detail_summary(text, options = {})
-      detail_summary = find(detail_summary_selector, **options.merge(text:))
+      detail_summary = find(detail_summary_selector, text:, **options)
       detail_summary.click
     end