Merge pull request #7059 from ministryofjustice/ap-5235/sca-proceedin…

…g-filter AP-5235: SCA proceeding filter
ministryofjustice · Aug 22, 2024 · 06490f6 · 06490f6
2 parents cd2e68d + efa0fc3
commit 06490f6
Show file tree

Hide file tree

Showing 59 changed files with 7,686 additions and 18,072 deletions.
diff --git a/app/controllers/providers/proceedings_types_controller.rb b/app/controllers/providers/proceedings_types_controller.rb
@@ -39,7 +39,7 @@ def form_params
     end
 
     def proceeding_types
-      @proceeding_types ||= LegalFramework::ProceedingTypes::All.call(provider: current_provider)
+      @proceeding_types ||= LegalFramework::ProceedingTypes::All.call(legal_aid_application)
     end
 
     def excluded_codes

diff --git a/app/services/legal_framework/proceeding_types/all.rb b/app/services/legal_framework/proceeding_types/all.rb
@@ -15,32 +15,55 @@ def initialize(pt_hash)
           @sca_related = pt_hash["sca_related"]
         end
 
+        # TODO: remove the below when the SCA feature flag is removed
         def not_sca?
           [@sca_core, @sca_related].all?(false)
         end
       end
 
-      def initialize(params)
+      def self.call(legal_aid_application)
+        new(legal_aid_application).call
+      end
+
+      def initialize(legal_aid_application)
         super()
-        @provider = params[:provider]
+        @legal_aid_application = legal_aid_application
       end
 
       def call
-        Setting.special_childrens_act? ? unfiltered_payload : filtered_payload
+        result = JSON.parse(request.body).map { |pt_hash| ProceedingTypeStruct.new(pt_hash) }
+        # TODO: remove the below when the SCA feature flag is removed
+        # filter out SCA applications
+        result.select!(&:not_sca?) unless Setting.special_childrens_act?
+        result
       end
 
-      def path
-        "/proceeding_types/all"
+    private
+
+      def request_body
+        {
+          current_proceedings: @legal_aid_application.proceedings&.map(&:ccms_code)&.join(","),
+          allowed_categories: %w[MAT], # TODO: replace with details from new PDA, for now hardcoded to only current category type
+          search_term: "", # TODO: add optional parameter to the initializer, but for now leave always empty
+        }.to_json
       end
 
-    private
+      def request
+        conn.post do |request|
+          request.url url
+          request.headers["Content-Type"] = "application/json"
+          request.body = request_body
+        end
+      end
 
-      def unfiltered_payload
-        JSON.parse(request.body).map { |pt_hash| ProceedingTypeStruct.new(pt_hash) }
+      def path
+        "/proceeding_types/filter"
       end
 
-      def filtered_payload
-        unfiltered_payload.select(&:not_sca?)
+      def headers
+        {
+          "Content-Type" => "application/json",
+        }
       end
     end
   end

diff --git a/...ttes/Applicant_details/Allows_return_to_and_proceed_from_Delegated_Function_date_view.yml b/...ttes/Applicant_details/Allows_return_to_and_proceed_from_Delegated_Function_date_view.yml
diff --git a/features/cassettes/Applicant_details/Completes_the_application_using_address_lookup.yml b/features/cassettes/Applicant_details/Completes_the_application_using_address_lookup.yml
diff --git a/...cant_details/Completes_the_application_using_address_lookup_with_building_number_name.yml b/...cant_details/Completes_the_application_using_address_lookup_with_building_number_name.yml
diff --git a/...cant_details/Completes_the_application_using_address_lookup_with_multiple_proceedings.yml b/...cant_details/Completes_the_application_using_address_lookup_with_multiple_proceedings.yml
diff --git a/features/cassettes/Applicant_details/Completes_the_application_using_manual_address.yml b/features/cassettes/Applicant_details/Completes_the_application_using_manual_address.yml
diff --git a/...es/cassettes/Applicant_details/I_can_see_that_the_applicant_does_not_receive_benefits.yml b/...es/cassettes/Applicant_details/I_can_see_that_the_applicant_does_not_receive_benefits.yml
diff --git a/features/cassettes/Applicant_details/I_can_see_that_the_applicant_receives_benefits.yml b/features/cassettes/Applicant_details/I_can_see_that_the_applicant_receives_benefits.yml
diff --git a/...nstructed_to_use_CCMS_when_applicant_was_under_16_on_earliest_delegated_function_date.yml b/...nstructed_to_use_CCMS_when_applicant_was_under_16_on_earliest_delegated_function_date.yml
diff --git a/...es/Checking_answers_for_linked_and_copied_cases/If_I_change_the_copied_from_Yes_to_No.yml b/...es/Checking_answers_for_linked_and_copied_cases/If_I_change_the_copied_from_Yes_to_No.yml
diff --git a/...Checking_answers_for_linked_and_copied_cases/If_I_change_the_linked_from_Family_to_No.yml b/...Checking_answers_for_linked_and_copied_cases/If_I_change_the_linked_from_Family_to_No.yml
diff --git a/...ds_and_forwards/I_want_to_change_the_proceeding_type_from_the_check_your_answers_page.yml b/...ds_and_forwards/I_want_to_change_the_proceeding_type_from_the_check_your_answers_page.yml
diff --git a/...hen_the_provider_changes_the_level_of_service_to_full_representation_from_the_default.yml b/...hen_the_provider_changes_the_level_of_service_to_full_representation_from_the_default.yml
diff --git a/...assettes/Copy_a_case_s_applicable_details/I_choose_not_to_copy_another_case_s_details.yml b/...assettes/Copy_a_case_s_applicable_details/I_choose_not_to_copy_another_case_s_details.yml
diff --git a/...tes/Create_application/Allows_return_to_and_proceed_from_Delegated_Function_date_view.yml b/...tes/Create_application/Allows_return_to_and_proceed_from_Delegated_Function_date_view.yml
diff --git a/features/cassettes/Create_application/Completes_the_application_using_address_lookup.yml b/features/cassettes/Create_application/Completes_the_application_using_address_lookup.yml
diff --git a/..._application/Completes_the_application_using_address_lookup_with_multiple_proceedings.yml b/..._application/Completes_the_application_using_address_lookup_with_multiple_proceedings.yml
diff --git a/features/cassettes/Create_application/Completes_the_application_using_manual_address.yml b/features/cassettes/Create_application/Completes_the_application_using_manual_address.yml
diff --git a/...ted_to_use_CCMS_on_the_passported_journey_with_an_applicant_does_not_receive_benefits.yml b/...ted_to_use_CCMS_on_the_passported_journey_with_an_applicant_does_not_receive_benefits.yml
diff --git a/...s/cassettes/Create_application/I_can_see_that_the_applicant_does_not_receive_benefits.yml b/...s/cassettes/Create_application/I_can_see_that_the_applicant_does_not_receive_benefits.yml
diff --git a/features/cassettes/Create_application/I_can_see_that_the_applicant_receives_benefits.yml b/features/cassettes/Create_application/I_can_see_that_the_applicant_receives_benefits.yml
diff --git a/...es/Emergency_cost_override/Provider_is_prompted_to_override_emergency_cost_limitation.yml b/...es/Emergency_cost_override/Provider_is_prompted_to_override_emergency_cost_limitation.yml
diff --git a/...ures/cassettes/Linking_cases_back_button_use/Complete_flow_reversion_with_back_button.yml b/...ures/cassettes/Linking_cases_back_button_use/Complete_flow_reversion_with_back_button.yml
diff --git a/...ng_one_application_to_another_application/I_choose_not_to_link_another_case_s_details.yml b/...ng_one_application_to_another_application/I_choose_not_to_link_another_case_s_details.yml
diff --git a/...ational_insurance_number_for_applicant/I_can_see_that_the_applicant_receives_benefits.yml b/...ational_insurance_number_for_applicant/I_can_see_that_the_applicant_receives_benefits.yml
diff --git a/...al_application_for_applicant_that_was_under_18_at_time_of_earliest_delegated_function.yml b/...al_application_for_applicant_that_was_under_18_at_time_of_earliest_delegated_function.yml
diff --git a/...t_use_of_delegation_functions/Completes_an_application_for_applicant_that_is_under_18.yml b/...t_use_of_delegation_functions/Completes_an_application_for_applicant_that_is_under_18.yml
diff --git a/...wers/I_go_back_and_change_the_proceedings_on_an_application_with_multiple_proceedings.yml b/...wers/I_go_back_and_change_the_proceedings_on_an_application_with_multiple_proceedings.yml
diff --git a/...multiple_proceedings_and_uses_the_back_button_scope_limitations_should_not_be_removed.yml b/...multiple_proceedings_and_uses_the_back_button_scope_limitations_should_not_be_removed.yml
diff --git a/...res/cassettes/Search_proceedings/I_am_able_to_clear_proceeding_on_the_proceeding_page.yml b/...res/cassettes/Search_proceedings/I_am_able_to_clear_proceeding_on_the_proceeding_page.yml
diff --git a/...ceedings/No_results_returned_is_seen_on_screen_when_invalid_proceeding_search_entered.yml b/...ceedings/No_results_returned_is_seen_on_screen_when_invalid_proceeding_search_entered.yml
diff --git a/...r_18_applicant_journey/Completes_a_minimal_application_for_applicant_that_is_under_18.yml b/...r_18_applicant_journey/Completes_a_minimal_application_for_applicant_that_is_under_18.yml
diff --git a/...oceedings_and_uses_the_back_button_they_should_route_to_the_list_of_proceedings_first.yml b/...oceedings_and_uses_the_back_button_they_should_route_to_the_list_of_proceedings_first.yml
diff --git a/...ferent_address/I_am_able_to_add_a_partner_with_a_different_address_from_the_applicant.yml b/...ferent_address/I_am_able_to_add_a_partner_with_a_different_address_from_the_applicant.yml
diff --git a/...a_shared_address/I_am_able_to_add_a_partner_with_an_address_shared_with_the_applicant.yml b/...a_shared_address/I_am_able_to_add_a_partner_with_an_address_shared_with_the_applicant.yml
diff --git a/...nknown_address/I_am_able_to_add_a_partner_with_a_different_address_from_the_applicant.yml b/...nknown_address/I_am_able_to_add_a_partner_with_a_different_address_from_the_applicant.yml
diff --git a/spec/cassettes/Backable/back_path/has_a_back_link_to_the_previous_page.yml b/spec/cassettes/Backable/back_path/has_a_back_link_to_the_previous_page.yml
diff --git a/spec/cassettes/Backable/back_path/when_we_go_back_once/has_a_link_to_the_previous_page.yml b/spec/cassettes/Backable/back_path/when_we_go_back_once/has_a_link_to_the_previous_page.yml
diff --git a/...ttes/Backable/back_path/when_we_go_back_once/redirects_to_same_page_without_the_param.yml b/...ttes/Backable/back_path/when_we_go_back_once/redirects_to_same_page_without_the_param.yml
diff --git a/...th/when_we_reload_the_current_page_several_times/has_a_back_link_to_the_previous_page.yml b/...th/when_we_reload_the_current_page_several_times/has_a_back_link_to_the_previous_page.yml
diff --git a/.../GET_an_action/when_the_provider_is_authenticated/records_the_current_controller_name.yml b/.../GET_an_action/when_the_provider_is_authenticated/records_the_current_controller_name.yml
diff --git a/...ationDependable/GET_an_action/when_the_provider_is_authenticated/returns_http_success.yml b/...ationDependable/GET_an_action/when_the_provider_is_authenticated/returns_http_success.yml
diff --git a/...en_the_provider_is_authenticated/changes_the_stage_back_to_entering_applicant_details.yml b/...en_the_provider_is_authenticated/changes_the_stage_back_to_entering_applicant_details.yml
diff --git a/...ion_id/check_provider_answers/reset/when_the_provider_is_authenticated/redirects_back.yml b/...ion_id/check_provider_answers/reset/when_the_provider_is_authenticated/redirects_back.yml
diff --git a/...T_/providers/applications/_legal_aid_application_id/proceedings_types/displays_errors.yml b/...T_/providers/applications/_legal_aid_application_id/proceedings_types/displays_errors.yml
diff --git a/...OST_/providers/applications/_legal_aid_application_id/proceedings_types/renders_index.yml b/...OST_/providers/applications/_legal_aid_application_id/proceedings_types/renders_index.yml
diff --git a/...id_application_id/proceedings_types/with_proceedings/calls_the_add_proceeding_service.yml b/...id_application_id/proceedings_types/with_proceedings/calls_the_add_proceeding_service.yml
diff --git a/...s/_legal_aid_application_id/proceedings_types/with_proceedings/redirects_to_next_step.yml b/...s/_legal_aid_application_id/proceedings_types/with_proceedings/redirects_to_next_step.yml
diff --git a/...eedings/when_LegalFramework_ProceedingTypesService_call_returns_false/displays_errors.yml b/...eedings/when_LegalFramework_ProceedingTypesService_call_returns_false/displays_errors.yml
diff --git a/...oceedings/when_LegalFramework_ProceedingTypesService_call_returns_false/renders_index.yml b/...oceedings/when_LegalFramework_ProceedingTypesService_call_returns_false/renders_index.yml
diff --git a/..._applicant_s_address_used_address_lookup_service/redirects_to_the_address_lookup_page.yml b/..._applicant_s_address_used_address_lookup_service/redirects_to_the_address_lookup_page.yml
diff --git a/...pplicant_s_address_used_manual_entry/redirects_to_the_manual_address_page_lookup_page.yml b/...pplicant_s_address_used_manual_entry/redirects_to_the_manual_address_page_lookup_page.yml
diff --git a/...pplication_id/proceedings_types/when_the_provider_is_authenticated/displays_no_errors.yml b/...pplication_id/proceedings_types/when_the_provider_is_authenticated/displays_no_errors.yml
diff --git a/...dings_types/when_the_provider_is_authenticated/does_not_displays_the_proceeding_types.yml b/...dings_types/when_the_provider_is_authenticated/does_not_displays_the_proceeding_types.yml
diff --git a/...lication_id/proceedings_types/when_the_provider_is_authenticated/returns_http_success.yml b/...lication_id/proceedings_types/when_the_provider_is_authenticated/returns_http_success.yml
diff --git a/...ed/when_the_application_is_a_Special_Childrens_Act_application/redirects_to_next_page.yml b/...ed/when_the_application_is_a_Special_Childrens_Act_application/redirects_to_next_page.yml
diff --git a/spec/requests/providers/proceedings_types_controller_spec.rb b/spec/requests/providers/proceedings_types_controller_spec.rb
@@ -95,7 +95,7 @@
                :with_proceedings,
                set_lead_proceeding: :da001)
       end
-      let(:proceeding) { legal_aid_application.proceedings.find_by(ccms_code: "DA001") }
+      let(:proceeding) { create(:proceeding, :da004) }
       let(:params) do
         {
           id: proceeding.ccms_code,

diff --git a/spec/services/legal_framework/proceeding_types/all_spec.rb b/spec/services/legal_framework/proceeding_types/all_spec.rb
@@ -1,34 +1,33 @@
 require "rails_helper"
 
 RSpec.describe LegalFramework::ProceedingTypes::All do
-  subject(:all) { described_class }
+  subject(:all) { described_class.new(legal_aid_application) }
 
   before do
     allow(Setting).to receive(:special_childrens_act?).and_return(sca_enabled)
-    stub_request(:get, uri).to_return(body: all_proceeding_types_payload)
+    stub_request(:post, uri).to_return(body: all_proceeding_types_payload)
   end
 
-  let(:uri) { "#{Rails.configuration.x.legal_framework_api_host}/proceeding_types/all" }
+  let(:legal_aid_application) { create :legal_aid_application }
+  let(:uri) { "#{Rails.configuration.x.legal_framework_api_host}/proceeding_types/filter" }
 
   describe ".call" do
-    subject(:call) { all.call(provider:) }
+    subject(:call) { all.call }
 
     before { call }
 
-    let(:provider) { create(:provider) }
-
     context "when the special children act setting is on" do
       let(:sca_enabled) { true }
 
-      it "returns all the proceedings" do
+      it "returns the expected proceedings" do
         expect(call.map(&:ccms_code)).to match_array %w[DA001 SE097 DA003 SE016E DA006 PB003]
       end
     end
 
     context "when the special children act setting is off" do
       let(:sca_enabled) { false }
 
-      it "returns all the proceedings" do
+      it "returns the expected proceedings" do
         expect(call.map(&:ccms_code)).to match_array %w[DA001 SE097 DA003 SE016E DA006]
       end
     end
@@ -44,6 +43,7 @@ def all_proceeding_types_payload
         sca_core: false,
         sca_related: false,
         ccms_category_law: "Family",
+        ccms_category_law_code: "MAT",
         ccms_matter_code: "MINJN",
         ccms_matter: "Domestic abuse",
       },
@@ -55,6 +55,7 @@ def all_proceeding_types_payload
         sca_core: false,
         sca_related: false,
         ccms_category_law: "Family",
+        ccms_category_law_code: "MAT",
         ccms_matter_code: "KSEC8",
         ccms_matter: "Children - section 8",
       },
@@ -66,6 +67,7 @@ def all_proceeding_types_payload
         sca_core: false,
         sca_related: false,
         ccms_category_law: "Family",
+        ccms_category_law_code: "MAT",
         ccms_matter_code: "MINJN",
         ccms_matter: "Domestic abuse",
       },
@@ -77,6 +79,7 @@ def all_proceeding_types_payload
         sca_core: false,
         sca_related: false,
         ccms_category_law: "Family",
+        ccms_category_law_code: "MAT",
         ccms_matter_code: "KSEC8",
         ccms_matter: "Children - section 8",
       },
@@ -88,6 +91,7 @@ def all_proceeding_types_payload
         sca_core: false,
         sca_related: false,
         ccms_category_law: "Family",
+        ccms_category_law_code: "MAT",
         ccms_matter_code: "MINJN",
         ccms_matter: "Domestic abuse",
       },
@@ -99,6 +103,7 @@ def all_proceeding_types_payload
         sca_core: true,
         sca_related: false,
         ccms_category_law: "Family",
+        ccms_category_law_code: "MAT",
         ccms_matter_code: "KPBLW",
         ccms_matter: "Special Children Act",
       },