Make minor changes to ensure floats and integers are being returned as expected

Author: jadekstewart3

app/services/reports/adult_incontinence_report_service.rb

@@ -15,8 +15,8 @@ def report
       @report ||= { name: 'Adult Incontinence',
                     entries: {
                       'Adult incontinence supplies distributed' => number_with_delimiter(total_supplies_distributed),
-                      'Adults Assisted Per Month' => adults_served_per_month.round,
-                      'Adult incontinence supplies per adult per month' => supplies_per_adult_per_month.round,
+                      'Adults Assisted Per Month' => adults_served_per_month.round(2),
+                      'Adult incontinence supplies per adult per month' => supplies_per_adult_per_month.round(2),
                       'Adult incontinence supplies' => types_of_supplies,
                       '% adult incontinence supplies donated' => "#{percent_donated.round}%",
                       '% adult incontinence bought' => "#{percent_bought.round}%",
@@ -36,7 +36,7 @@ def distributed_loose_supplies
 
     # @return [Integer]
     def total_supplies_distributed
-      distributed_loose_supplies + distributed_adult_incontinence_items_from_kits
+     (distributed_loose_supplies + distributed_adult_incontinence_items_from_kits).to_i
     end
 
     def monthly_supplies

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.0",
+                                      "Adult incontinence supplies distributed" => "0",
                                       "Adults Assisted Per Month" => 0,
                                       "% adult incontinence bought" => "0%",
                                       "% adult incontinence supplies donated" => "0%",
@@ -159,9 +159,9 @@
         expect(report.report[:entries]).to match(hash_including({
                                           "% adult incontinence bought" => "60%",
                                           "% adult incontinence supplies donated" => "40%",
-                                          "Adults Assisted Per Month" => 234,
-                                          "Adult incontinence supplies distributed" => "51,800.0",
-                                          "Adult incontinence supplies per adult per month" => 18,
+                                          "Adults Assisted Per Month" => 233.83,
+                                          "Adult incontinence supplies distributed" => "51,800",
+                                          "Adult incontinence supplies per adult per month" => 18.46,
                                           "Money spent purchasing adult incontinence supplies" => "$30.00"
                                         }))
         expect(report.report[:entries]['Adult incontinence supplies'].split(', '))
@@ -187,9 +187,9 @@
         expect(report.report[:entries]).to match(hash_including({
                                           "% adult incontinence bought" => "60%",
                                           "% adult incontinence supplies donated" => "40%",
-                                          "Adult incontinence supplies distributed" => "51,800.0",
-                                          "Adults Assisted Per Month" => 109,
-                                          "Adult incontinence supplies per adult per month" => 40,
+                                          "Adult incontinence supplies distributed" => "51,800",
+                                          "Adults Assisted Per Month" => 108.83,
+                                          "Adult incontinence supplies per adult per month" => 39.66,
                                           "Money spent purchasing adult incontinence supplies" => "$30.00"
                                       }))
         expect(report.report[:entries]['Adult incontinence supplies'].split(', '))