Include withdrawn consents in consent reporting breakdowns

Author: mikejamesthompson

app/controllers/api/reporting/totals_controller.rb

@@ -178,7 +178,6 @@ def latest_scoped_consents
         .where(team_id: @team&.id || current_user.team_ids)
         .where(academic_year: params[:academic_year])
         .not_invalidated
-        .not_withdrawn
         .response_provided
 
     if params[:programme].present?

spec/controllers/api/reporting/totals_controller_spec.rb

@@ -564,7 +564,7 @@
         expect(routes["self_consent"]).to eq(1)
       end
 
-      it "excludes invalidated and withdrawn consents" do
+      it "excludes invalidated consents but includes withdrawn consents" do
         patient = create(:patient, session:)
         parent_one = create(:parent)
         parent_two = create(:parent)
@@ -578,17 +578,18 @@
           programme:,
           team:,
           parent: parent_one,
-          reason_for_refusal: "medical_reasons"
+          reason_for_refusal: "medical_reasons",
+          route: "website"
         )
         create(
           :consent,
-          :refused,
           :withdrawn,
           patient:,
           programme:,
           team:,
           parent: parent_two,
-          reason_for_refusal: "personal_choice"
+          reason_for_refusal: "personal_choice",
+          route: "self_consent"
         )
         PatientStatusUpdater.call(patient:)
 
@@ -598,7 +599,11 @@
 
         reasons = parsed_response["consent_refusal_reasons"]
         expect(reasons["medical_reasons"]).to eq(0)
-        expect(reasons["personal_choice"]).to eq(0)
+        expect(reasons["personal_choice"]).to eq(1)
+
+        routes = parsed_response["consent_routes"]
+        expect(routes["website"]).to eq(0)
+        expect(routes["self_consent"]).to eq(1)
       end
     end
   end