CDPT-1049 Fix drag through calculations (#697)

Author: vertism

app/services/calculators/multiples/multiple_offenses_calculator.rb

@@ -55,7 +55,11 @@ def spent_date_for(proceeding)
             proceeding, spent_date, other_conviction_date, other_spent_date
           )
 
-          next if conviction_date > other_conviction_date
+          # indefinite spent dates are only expected with a relevant order
+          next if other_spent_date == ResultsVariant::INDEFINITE
+
+          # Drag through for "never spent" convictions only applies to previous convictions
+          next if other_spent_date == ResultsVariant::NEVER_SPENT && conviction_date > other_conviction_date
 
           # This comparison determines wether the relevant order spent date is the longest
           # within the same conviction and also when compared to another conviction spent date.
@@ -79,7 +83,7 @@ def all_spent?
     private
 
       def within_other_conviction_date_and_spent_date?(proceeding, spent_date, other_conviction_date, other_spent_date)
-        # We should first check wether the proceeding spent date has been affected
+        # We should first check whether the proceeding spent date has been affected
         # by previous comparisons, if so, we should use the value assigned to _spent_date_
         # otherwise we continue to compare spent dates with _spent_date_without_relevant_orders_
 

app/value_objects/conviction_type.rb

@@ -84,7 +84,7 @@ def initialize(raw_value, params = {})
     ADULT_RESTRAINING_ORDER             = new(:adult_restraining_order,            parent: ADULT_COMMUNITY_REPARATION, relevant_order: true, drag_through: true, calculator_class: Calculators::AdditionCalculator::PlusZeroMonths),
     ADULT_SERIOUS_CRIME_PREVENTION      = new(:adult_serious_crime_prevention,     parent: ADULT_COMMUNITY_REPARATION, relevant_order: true, drag_through: true, calculator_class: Calculators::AdditionCalculator::PlusZeroMonths),
     ADULT_SEXUAL_HARM_PREVENTION_ORDER  = new(:adult_sexual_harm_prevention_order, parent: ADULT_COMMUNITY_REPARATION, relevant_order: true, drag_through: true, calculator_class: Calculators::AdditionCalculator::PlusZeroMonths),
-    ADULT_OTHER_REQUIREMENT_ORDER       = new(:adult_other_requirement_order,      parent: ADULT_COMMUNITY_REPARATION, relevant_order: true, calculator_class: Calculators::AdditionCalculator::PlusTwelveMonths),
+    ADULT_OTHER_REQUIREMENT_ORDER       = new(:adult_other_requirement_order,      parent: ADULT_COMMUNITY_REPARATION, relevant_order: true, drag_through: true, calculator_class: Calculators::AdditionCalculator::PlusTwelveMonths),
 
     ADULT_BIND_OVER                     = new(:adult_bind_over,                    parent: ADULT_DISCHARGE, relevant_order: true, calculator_class: Calculators::AdditionCalculator::PlusZeroMonths),
     ADULT_ABSOLUTE_DISCHARGE            = new(:adult_absolute_discharge,           parent: ADULT_DISCHARGE, skip_length: true, calculator_class: Calculators::ImmediatelyCalculator),

spec/services/calculators/multiples/multiple_offenses_calculator_spec.rb

@@ -211,29 +211,58 @@
 
       context "when all sentences are dates" do
         context "and there is overlapping of rehabilitation periods" do
-          let(:conviction_1) do
-            instance_double(
-              Calculators::Multiples::Proceedings,
-              conviction?: true,
-              conviction_date: Date.new(2020, 1, 1),
-              spent_date: Date.new(2022, 1, 1),
-              spent_date_without_relevant_orders: Date.new(2022, 1, 1),
-            )
-          end
-
-          let(:conviction_2) do
-            instance_double(
-              Calculators::Multiples::Proceedings,
-              conviction?: true,
-              conviction_date: Date.new(2021, 1, 1),
-              spent_date: Date.new(2025, 1, 1),
-              spent_date_without_relevant_orders: Date.new(2025, 1, 1),
-            )
+          context "when 2nd sentence causes drag through" do
+            let(:conviction_1) do
+              instance_double(
+                Calculators::Multiples::Proceedings,
+                conviction?: true,
+                conviction_date: Date.new(2020, 1, 1),
+                spent_date: Date.new(2022, 1, 1),
+                spent_date_without_relevant_orders: Date.new(2022, 1, 1),
+              )
+            end
+
+            let(:conviction_2) do
+              instance_double(
+                Calculators::Multiples::Proceedings,
+                conviction?: true,
+                conviction_date: Date.new(2021, 1, 1),
+                spent_date: Date.new(2025, 1, 1),
+                spent_date_without_relevant_orders: Date.new(2025, 1, 1),
+              )
+            end
+
+            it "returns the spent date for the matching check group" do
+              expect(calculator.spent_date_for(conviction_1)).to eq(Date.new(2025, 1, 1))
+              expect(calculator.spent_date_for(conviction_2)).to eq(Date.new(2025, 1, 1))
+            end
           end
 
-          it "returns the spent date for the matching check group" do
-            expect(calculator.spent_date_for(conviction_1)).to eq(Date.new(2025, 1, 1))
-            expect(calculator.spent_date_for(conviction_2)).to eq(Date.new(2025, 1, 1))
+          context "when 1st sentence causes drag through" do
+            let(:conviction_1) do
+              instance_double(
+                Calculators::Multiples::Proceedings,
+                conviction?: true,
+                conviction_date: Date.new(2019, 4, 23),
+                spent_date: Date.new(2030, 4, 22),
+                spent_date_without_relevant_orders: Date.new(2030, 4, 22),
+              )
+            end
+
+            let(:conviction_2) do
+              instance_double(
+                Calculators::Multiples::Proceedings,
+                conviction?: true,
+                conviction_date: Date.new(2023, 9, 23),
+                spent_date: Date.new(2026, 3, 22),
+                spent_date_without_relevant_orders: Date.new(2026, 3, 22),
+              )
+            end
+
+            it "returns the spent date for the matching check group" do
+              expect(calculator.spent_date_for(conviction_1)).to eq(Date.new(2030, 4, 22))
+              expect(calculator.spent_date_for(conviction_2)).to eq(Date.new(2030, 4, 22))
+            end
           end
         end
 
@@ -352,7 +381,7 @@
           let(:spent_date_2) { ResultsVariant::INDEFINITE }
 
           it "returns the spent date for the matching check group" do
-            expect(calculator.spent_date_for(conviction_1)).to eq(ResultsVariant::INDEFINITE)
+            expect(calculator.spent_date_for(conviction_1)).to eq(Date.new(2023, 1, 1))
             expect(calculator.spent_date_for(conviction_2)).to eq(ResultsVariant::INDEFINITE)
           end
         end

spec/spec_helper.rb

@@ -22,5 +22,4 @@
   end
 
   config.shared_context_metadata_behavior = :apply_to_host_groups
-  config.profile_examples = true
 end

spec/value_objects/conviction_type_spec.rb

@@ -430,7 +430,7 @@
 
       it { expect(conviction_type.skip_length?).to eq(false) }
       it { expect(conviction_type.relevant_order?).to eq(true) }
-      it { expect(conviction_type.drag_through?).to eq(false) }
+      it { expect(conviction_type.drag_through?).to eq(true) }
       it { expect(conviction_type.calculator_class).to eq(Calculators::AdditionCalculator::PlusTwelveMonths) }
     end