Ensure floats are used for calculations

Author: jadekstewart3

app/services/reports/adult_incontinence_report_service.rb

@@ -40,11 +40,11 @@ def total_supplies_distributed
     end
 
     def monthly_supplies
-      total_supplies_distributed / 12.0
+      total_supplies_distributed.to_f / 12.0
     end
 
     def supplies_per_adult_per_month
-      monthly_supplies / (adults_served_per_month.nonzero? || 1)
+      monthly_supplies.to_f / (adults_served_per_month.nonzero? || 1)
     end
 
     def types_of_supplies
@@ -55,14 +55,14 @@ def types_of_supplies
     def percent_donated
       return 0.0 if total_supplies.zero?
 
-      (donated_supplies / total_supplies.to_f) * 100
+      (donated_supplies.to_f / total_supplies.to_f) * 100.0
     end
 
     # @return [Float]
     def percent_bought
       return 0.0 if total_supplies.zero?
 
-      (purchased_supplies / total_supplies.to_f) * 100
+      (purchased_supplies.to_f / total_supplies.to_f) * 100.0
     end
 
     # @return [String]
@@ -82,7 +82,7 @@ def purchased_supplies
 
     # @return [Integer]
     def total_supplies
-      @total_supplies ||= purchased_supplies + donated_supplies
+      @total_supplies ||= purchased_supplies.to_f + donated_supplies.to_f
     end
 
     # @return [Integer]
@@ -117,7 +117,7 @@ def distributed_adult_incontinence_items_from_kits
 
       result = ActiveRecord::Base.connection.execute(sanitized_sql)
 
-      result.first['sum'].to_i
+      result.first['sum'].to_f
     end
 
     def adults_served_per_month
@@ -130,7 +130,7 @@ def total_people_served_with_loose_supplies_per_month
                         .for_year(year)
                         .joins(line_items: :item)
                         .merge(Item.adult_incontinence)
-                        .sum('line_items.quantity / COALESCE(items.distribution_quantity, 50)')
+                        .sum('line_items.quantity / COALESCE(items.distribution_quantity, 50.0)')
       total_quantity.to_f / 12.0
     end
 

spec/services/reports/adult_incontinence_report_service_spec.rb

@@ -10,7 +10,7 @@
     it 'should report zero values' do
       expect(report.report[:name]).to eq("Adult Incontinence")
       expect(report.report[:entries]).to match(hash_including({
-                                      "Adult incontinence supplies distributed" => "0",
+                                      "Adult incontinence supplies distributed" => "0.0",
                                       "Adults Assisted Per Month" => 0,
                                       "% adult incontinence bought" => "0%",
                                       "% adult incontinence supplies donated" => "0%",
@@ -152,7 +152,7 @@
                                           "% adult incontinence bought" => "60%",
                                           "% adult incontinence supplies donated" => "40%",
                                           "Adults Assisted Per Month" => 9,
-                                          "Adult incontinence supplies distributed" => "2,180",
+                                          "Adult incontinence supplies distributed" => "2,180.0",
                                           "Adult incontinence supplies per adult per month" => 21,
                                           "Money spent purchasing adult incontinence supplies" => "$30.00"
                                         }))
@@ -179,9 +179,9 @@
         expect(report.report[:entries]).to match(hash_including({
                                           "% adult incontinence bought" => "60%",
                                           "% adult incontinence supplies donated" => "40%",
-                                          "Adult incontinence supplies distributed" => "2,180",
+                                          "Adult incontinence supplies distributed" => "2,180.0",
                                           "Adults Assisted Per Month" => 4,
-                                          "Adult incontinence supplies per adult per month" => 51,
+                                          "Adult incontinence supplies per adult per month" => 50,
                                           "Money spent purchasing adult incontinence supplies" => "$30.00"
                                       }))
         expect(report.report[:entries]['Adult incontinence supplies'].split(', '))