Merge pull request #6298 from ministryofjustice/mw/restore-extensions

Restore `IntegerExtension` and `NilExtension`

app/interfaces/api/entities/cclf/base_claim.rb

@@ -30,7 +30,7 @@ class BaseClaim < API::Entities::BaseEntity
         private
 
         def actual_trial_length_or_one
-          object.actual_trial_length || 1
+          object.actual_trial_length.or_one
         end
 
         # case type adapter requires access to claim object

app/interfaces/api/entities/ccr/base_claim.rb

@@ -36,19 +36,19 @@ def defendants_with_main_first
         end
 
         def estimated_trial_length_or_one
-          object.estimated_trial_length || 1
+          object.estimated_trial_length.or_one
         end
 
         def actual_trial_length_or_one
-          object.actual_trial_length || 1
+          object.actual_trial_length.or_one
         end
 
         def retrial_actual_length_or_one
-          object.retrial_actual_length || 1
+          object.retrial_actual_length.or_one
         end
 
         def retrial_estimated_length_or_one
-          object.retrial_estimated_length || 1
+          object.retrial_estimated_length.or_one
         end
 
         def adapted_advocate_category

config/initializers/00_extensions.rb

@@ -42,3 +42,10 @@ class FalseClass
   include Extensions::BooleanExtension::False
 end
 
+class Integer
+  include Extensions::IntegerExtension
+end
+
+class NilClass
+  include Extensions::NilExtension
+end

lib/extensions/integer_extension.rb

@@ -0,0 +1,7 @@
+module Extensions
+  module IntegerExtension
+    def or_one
+      [self, 1].compact.max
+    end
+  end
+end

lib/extensions/nil_extension.rb

@@ -0,0 +1,7 @@
+module Extensions
+  module NilExtension
+    def or_one
+      1
+    end
+  end
+end