CDPT-954 Rehabilitation Legislation Changes (#668)

Author: vertism

.gitignore

@@ -36,3 +36,7 @@ public/assets/
 .DS_Store
 
 rerun.txt
+.idea/disclosure-checker.iml
+.idea/misc.xml
+.idea/vcs.xml
+.idea/workspace.xml

README.md

@@ -1,6 +1,6 @@
 # Check when to disclose cautions or convictions
 
-[![repo standards badge](https://img.shields.io/badge/dynamic/json?color=blue&style=for-the-badge&logo=github&label=MoJ%20Compliant&query=%24.data%5B%3F%28%40.name%20%3D%3D%20%22disclosure-checker%22%29%5D.status&url=https%3A%2F%2Foperations-engineering-reports.cloud-platform.service.justice.gov.uk%2Fgithub_repositories)](https://operations-engineering-reports.cloud-platform.service.justice.gov.uk/github_repositories#disclosure-checker "Link to report")
+[![repo standards badge](https://img.shields.io/badge/dynamic/json?color=blue&style=for-the-badge&logo=github&label=MoJ%20Compliant&query=%24.data%5B%3F%28%40.name%20%3D%3D%20%22disclosure-checker%22%29%5D.status&url=https%3A%2F%2Foperations-engineering-reports.cloud-platform.service.justice.gov.uk%2Fgithub_repositories)](https://operations-engineering-reports.cloud-platform.service.justice.gov.uk/public-report/disclosure-checker "Link to report")
 
 [![CI and CD](https://github.com/ministryofjustice/disclosure-checker/actions/workflows/test-build-deploy.yml/badge.svg)](https://github.com/ministryofjustice/disclosure-checker/actions/workflows/test-build-deploy.yml)
 

app/controllers/application_controller.rb

@@ -53,6 +53,6 @@ def initialize_disclosure_check(attributes = {})
   end
 
   def maintenance_mode
-    render "errors/maintenance" unless Rails.env.test?
+    render "errors/maintenance" if Rails.env.production?
   end
 end

app/controllers/steps/conviction/conviction_multiple_sentences_controller.rb

@@ -0,0 +1,16 @@
+module Steps
+  module Conviction
+    class ConvictionMultipleSentencesController < Steps::ConvictionStepController
+      def edit
+        @form_object = ConvictionMultipleSentencesForm.new(
+          disclosure_check: current_disclosure_check,
+          conviction_multiple_sentences: current_disclosure_check.conviction_multiple_sentences,
+        )
+      end
+
+      def update
+        update_and_advance(ConvictionMultipleSentencesForm)
+      end
+    end
+  end
+end

app/controllers/steps/conviction/conviction_schedule18_controller.rb

@@ -0,0 +1,16 @@
+module Steps
+  module Conviction
+    class ConvictionSchedule18Controller < Steps::ConvictionStepController
+      def edit
+        @form_object = ConvictionSchedule18Form.new(
+          disclosure_check: current_disclosure_check,
+          conviction_schedule18: current_disclosure_check.conviction_schedule18,
+        )
+      end
+
+      def update
+        update_and_advance(ConvictionSchedule18Form)
+      end
+    end
+  end
+end

app/controllers/steps/conviction/single_sentence_over4_controller.rb

@@ -0,0 +1,16 @@
+module Steps
+  module Conviction
+    class SingleSentenceOver4Controller < Steps::ConvictionStepController
+      def edit
+        @form_object = SingleSentenceOver4Form.new(
+          disclosure_check: current_disclosure_check,
+          single_sentence_over4: current_disclosure_check.single_sentence_over4,
+        )
+      end
+
+      def update
+        update_and_advance(SingleSentenceOver4Form)
+      end
+    end
+  end
+end

app/forms/steps/conviction/conviction_multiple_sentences_form.rb

@@ -0,0 +1,9 @@
+module Steps
+  module Conviction
+    class ConvictionMultipleSentencesForm < BaseForm
+      include SingleQuestionForm
+
+      yes_no_attribute :conviction_multiple_sentences
+    end
+  end
+end

app/forms/steps/conviction/conviction_schedule18_form.rb

@@ -0,0 +1,13 @@
+module Steps
+  module Conviction
+    class ConvictionSchedule18Form < BaseForm
+      include SingleQuestionForm
+
+      yes_no_attribute :conviction_schedule18
+
+      def i18n_attribute
+        "conviction_schedule18_text"
+      end
+    end
+  end
+end

app/forms/steps/conviction/single_sentence_over4_form.rb

@@ -0,0 +1,9 @@
+module Steps
+  module Conviction
+    class SingleSentenceOver4Form < BaseForm
+      include SingleQuestionForm
+
+      yes_no_attribute :single_sentence_over4
+    end
+  end
+end

app/models/disclosure_check.rb

@@ -2,7 +2,7 @@ class DisclosureCheck < ApplicationRecord
   belongs_to :check_group, default: -> { create_check_group }
   has_one :disclosure_report, through: :check_group
 
-  delegate :drag_through?, to: :conviction, allow_nil: true
+  delegate :no_drag_through?, to: :conviction, allow_nil: true
 
   enum status: {
     in_progress: 0,
@@ -14,4 +14,30 @@ class DisclosureCheck < ApplicationRecord
 
   composed_of :caution, allow_nil: true, constructor: :find_constant,
                         mapping: [%i[caution_type value]], class_name: "CautionType"
+
+  def conviction_length_in_years(conviction_length)
+    if conviction_length_type == ConvictionLengthType::MONTHS.to_s
+      conviction_length.months.in_years
+    elsif conviction_length_type == ConvictionLengthType::DAYS.to_s
+      conviction_length.days.in_years
+    elsif conviction_length_type == ConvictionLengthType::WEEKS.to_s
+      conviction_length.weeks.in_years
+    elsif conviction_length_type == ConvictionLengthType::YEARS.to_s
+      conviction_length.years.in_years
+    end
+  end
+
+  def schedule18_over_4_years
+    return nil if conviction_schedule18.blank?
+
+    if conviction_schedule18.inquiry.yes? && (conviction_multiple_sentences.inquiry.no? || single_sentence_over4.inquiry.yes?)
+      "yes"
+    else
+      "no"
+    end
+  end
+
+  def schedule18_over_4_years?
+    schedule18_over_4_years == "yes"
+  end
 end

app/presenters/conviction_result_presenter.rb

@@ -14,6 +14,7 @@ def question_attributes
       :conviction_bail_days,
       :compensation_payment_date,
       :motoring_endorsement,
+      :schedule18_over_4_years,
     ].freeze
   end
 
@@ -24,6 +25,7 @@ def editable_attributes
       conviction_bail_days: ->(id) { edit_steps_conviction_conviction_bail_days_path(check_id: id, next_step: :cya) },
       compensation_payment_date: ->(id) { edit_steps_conviction_compensation_payment_date_path(check_id: id, next_step: :cya) },
       motoring_endorsement: ->(id) { edit_steps_conviction_motoring_endorsement_path(check_id: id, next_step: :cya) },
+      schedule18_over_4_years: ->(id) { edit_steps_conviction_conviction_schedule18_path(check_id: id) },
     }
   end
 

app/presenters/results_item_presenter.rb

@@ -32,7 +32,7 @@ def summary
         scope:,
         change_path: change_path(item),
       )
-    }.select(&:show?)
+    }.compact.select(&:show?)
   end
 
   delegate :expiry_date, to: :result_service
@@ -46,7 +46,7 @@ def result_service
   end
 
   def format_value(attr)
-    value = disclosure_check[attr]
+    value = disclosure_check.send(attr)
     return value unless value.is_a?(Date)
 
     approx_attr = ["approximate", attr].join("_").to_sym

app/services/calculators/multiples/proceedings.rb

@@ -59,7 +59,7 @@ def expiry_dates
       end
 
       def non_relevant_expiry_dates
-        @non_relevant_expiry_dates ||= disclosure_checks.reject(&:drag_through?).map(
+        @non_relevant_expiry_dates ||= disclosure_checks.reject(&:no_drag_through?).map(
           &method(:expiry_date_for)
         )
       end

app/services/calculators/sentence_calculator.rb

@@ -1,60 +1,46 @@
 module Calculators
   class SentenceCalculator < BaseCalculator
-    NEVER_SPENT_THRESHOLD = 48
+    UPPER_LIMIT_MONTHS = Float::INFINITY
     BAIL_OFFSET = -1.0
 
-    # If conviction length is 6 months or less: start date + length + 18 months
-    # If conviction length is over 6 months and less than or equal to 30 months: start date + length + 2 years
-    # If conviction length is over 30 months and less than or equal to 4 years: start date + length + 3.5 years
-    # If conviction length is over 4 years: never spent
-    #
     class Detention < SentenceCalculator
-      UPPER_LIMIT = Float::INFINITY
-
-      REHABILITATION_1 = { months: 18 }.freeze
-      REHABILITATION_2 = { months: 24 }.freeze
-      REHABILITATION_3 = { months: 42 }.freeze
+      def rehabilitation_period
+        case conviction_length_in_months
+        when 0..12
+          { months: 6 }
+        when 12..48
+          { months: 24 }
+        else
+          { months: 42 }
+        end
+      end
     end
 
-    # If conviction length is 6 months or less: start date + length + 18 months
-    # If conviction length is over 6 months and less than or equal to 24 months: start date + length + 2 years
-    # If conviction length is over 24 months, it is considered invalid
-    #
-    class DetentionTraining < SentenceCalculator
-      UPPER_LIMIT = 24
-
-      REHABILITATION_1 = { months: 18 }.freeze
-      REHABILITATION_2 = { months: 24 }.freeze
+    class DetentionTraining < Detention
+      UPPER_LIMIT_MONTHS = 24
     end
 
-    # If conviction length is 6 months or less: start date + length + 2 years
-    # If conviction length is over 6 months and less than or equal to 30 months: start date + length + 4 years
-    # If conviction length is over 30 months and less than or equal to 4 years: start date + length + 7 years
-    # If conviction length is over 4 years: never spent
-    #
     class Prison < SentenceCalculator
-      UPPER_LIMIT = Float::INFINITY
-
-      REHABILITATION_1 = { months: 24 }.freeze
-      REHABILITATION_2 = { months: 48 }.freeze
-      REHABILITATION_3 = { months: 84 }.freeze
+      def rehabilitation_period
+        case conviction_length_in_months
+        when 0..12
+          { years: 1 }
+        when 12..48
+          { years: 4 }
+        else
+          { years: 7 }
+        end
+      end
     end
 
-    # If conviction length is 6 months or less: start date + length + 2 years
-    # If conviction length is over 6 months and less than or equal to 24 months: start date + length + 4 years
-    # If conviction length is over 24 months, it is considered invalid
-    #
-    class SuspendedPrison < SentenceCalculator
-      UPPER_LIMIT = 24
-
-      REHABILITATION_1 = { months: 24 }.freeze
-      REHABILITATION_2 = { months: 48 }.freeze
+    class SuspendedPrison < Prison
+      UPPER_LIMIT_MONTHS = 24
     end
 
     def expiry_date
       raise InvalidCalculation unless valid?
 
-      if conviction_length_in_months > NEVER_SPENT_THRESHOLD
+      if disclosure_check.schedule18_over_4_years?
         ResultsVariant::NEVER_SPENT
       else
         conviction_end_date.advance(rehabilitation_period).advance(bail_offset)
@@ -65,22 +51,11 @@ def expiry_date
     # a maximum number of months in the sentence length.
     #
     def valid?
-      conviction_length_in_months <= self.class::UPPER_LIMIT
+      conviction_length_in_months <= self.class::UPPER_LIMIT_MONTHS
     end
 
   private
 
-    def rehabilitation_period
-      case conviction_length_in_months
-      when 0..6
-        self.class::REHABILITATION_1
-      when 6..30
-        self.class::REHABILITATION_2
-      else
-        self.class::REHABILITATION_3
-      end
-    end
-
     # The day before the end date, thus we subtract 1 day.
     def conviction_end_date
       super.advance(days: -1)

app/services/conviction_decision_tree.rb

@@ -19,7 +19,15 @@ def destination
       after_conviction_length_type
     when :compensation_paid
       after_compensation_paid
-    when :conviction_length, :compensation_payment_date
+    when :conviction_length
+      after_conviction_length
+    when :conviction_schedule18
+      after_conviction_schedule18
+    when :conviction_multiple_sentences
+      after_conviction_multiple_sentences
+    when :single_sentence_over4
+      check_your_answers
+    when :compensation_payment_date
       check_your_answers
     else
       raise InvalidStep, "Invalid step '#{as || step_params}'"
@@ -28,6 +36,27 @@ def destination
 
 private
 
+  def after_conviction_multiple_sentences
+    return edit(:single_sentence_over4) if step_value(:conviction_multiple_sentences).inquiry.yes?
+
+    check_your_answers
+  end
+
+  def after_conviction_schedule18
+    return edit(:conviction_multiple_sentences) if step_value(:conviction_schedule18).inquiry.yes?
+
+    check_your_answers
+  end
+
+  def after_conviction_length
+    conviction_length = disclosure_check.conviction_length_in_years(step_value(:conviction_length).to_i)
+    schedule_18_applicable = ConvictionType.new(disclosure_check.conviction_subtype).schedule_18_applicable?
+
+    return check_your_answers if conviction_length <= 4 || !schedule_18_applicable
+
+    edit(:conviction_schedule18)
+  end
+
   def after_conviction_subtype
     return edit(:conviction_bail)      if conviction.bailable_offense?
     return edit(:compensation_paid)    if conviction.compensation?