Merge pull request #5456 from ministryofjustice/ap-4266/remove-partne…

…r-address AP-4266: Remove partner address
ministryofjustice · Jul 7, 2023 · 60d36ac · 60d36ac
2 parents 3b96a8a + 1b7aa32
commit 60d36ac
Show file tree

Hide file tree

Showing 43 changed files with 35 additions and 1,562 deletions.
diff --git a/app/controllers/concerns/providers/draftable.rb b/app/controllers/concerns/providers/draftable.rb
@@ -27,17 +27,6 @@ def draft_target_endpoint
       ENDPOINT
     end
 
-    def save_run_continue_or_draft(form, run_method, **args)
-      # This can be used to run a method on the form_for target model
-      # after validating and saving, but before redirecting. it will
-      # raise a NoMethodError if the run_method does not exist
-      draft_selected? ? form.save_as_draft : form.save
-      return false if form.invalid?
-
-      form.model.public_send(run_method) unless run_method.nil?
-      continue_or_draft(**args)
-    end
-
     def save_continue_or_draft(form, **args)
       draft_selected? ? form.save_as_draft : form.save
       return false if form.invalid?

diff --git a/app/controllers/providers/partners/address_lookups_controller.rb b/app/controllers/providers/partners/address_lookups_controller.rb
diff --git a/app/controllers/providers/partners/address_selections_controller.rb b/app/controllers/providers/partners/address_selections_controller.rb
diff --git a/app/controllers/providers/partners/addresses_controller.rb b/app/controllers/providers/partners/addresses_controller.rb
diff --git a/app/controllers/providers/partners/shared_addresses_controller.rb b/app/controllers/providers/partners/shared_addresses_controller.rb
diff --git a/app/forms/addresses/partner_address_form.rb b/app/forms/addresses/partner_address_form.rb
diff --git a/app/forms/addresses/partner_address_lookup_form.rb b/app/forms/addresses/partner_address_lookup_form.rb
diff --git a/app/forms/addresses/partner_address_selection_form.rb b/app/forms/addresses/partner_address_selection_form.rb
diff --git a/app/forms/partners/shared_address_form.rb b/app/forms/partners/shared_address_form.rb
diff --git a/app/models/partner.rb b/app/models/partner.rb
@@ -2,40 +2,4 @@ class Partner < ApplicationRecord
   belongs_to :legal_aid_application, dependent: :destroy
   has_many :hmrc_responses, class_name: "HMRC::Response", as: :owner
   has_many :employments, as: :owner
-
-  def pretty_postcode
-    pretty_postcode? ? postcode : postcode.insert(-4, " ")
-  end
-
-  def pretty_postcode?
-    postcode[-4] == " "
-  end
-
-  def duplicate_applicants_address
-    update!(
-      address_line_one: applicants_address.address_line_one,
-      address_line_two: applicants_address.address_line_two,
-      city: applicants_address.city,
-      county: applicants_address.county,
-      postcode: applicants_address.postcode,
-      organisation: applicants_address.organisation,
-    )
-  end
-
-  def clear_stored_address
-    update!(
-      address_line_one: nil,
-      address_line_two: nil,
-      city: nil,
-      county: nil,
-      postcode: nil,
-      organisation: nil,
-    )
-  end
-
-private
-
-  def applicants_address
-    @applicants_address ||= legal_aid_application.applicant.address
-  end
 end
diff --git a/app/services/flow/flows/provider_partner.rb b/app/services/flow/flows/provider_partner.rb
@@ -18,39 +18,11 @@ class ProviderPartner < FlowSteps
             if application.overriding_dwp_result?
               :check_client_details
             else
-              :shared_addresses
-            end
-          end,
-          check_answers: :check_provider_answers,
-          carry_on_sub_flow: false,
-        },
-        shared_addresses: {
-          path: ->(application) { urls.providers_legal_aid_application_shared_address_path(application) },
-          forward: lambda do |_application, options|
-            if options[:shared_address]
               :check_provider_answers
-            else
-              :partner_address_lookups
             end
           end,
           check_answers: :check_provider_answers,
-          carry_on_sub_flow: ->(application) { !application&.partner&.shared_address_with_client? },
-        },
-        partner_address_lookups: {
-          path: ->(application) { urls.providers_legal_aid_application_partners_address_lookup_path(application) },
-          forward: :partner_address_selections,
-          check_answers: :check_provider_answers,
-          carry_on_sub_flow: true,
-        },
-        partner_address_selections: {
-          path: ->(application) { urls.providers_legal_aid_application_partners_address_selection_path(application) },
-          forward: :check_provider_answers,
-          check_answers: :check_provider_answers,
-        },
-        partner_addresses: {
-          path: ->(application) { urls.providers_legal_aid_application_partners_address_path(application) },
-          forward: :check_provider_answers,
-          check_answers: :check_provider_answers,
+          carry_on_sub_flow: false,
         },
         partner_employed: {
           path: ->(application) { urls.providers_legal_aid_application_partners_employed_index_path(application) },

diff --git a/app/views/providers/check_provider_answers/_shared.html.erb b/app/views/providers/check_provider_answers/_shared.html.erb
@@ -11,7 +11,7 @@
   <% if @legal_aid_application.applicant_has_partner? %>
     <%= render(
           "shared/check_answers/partner_details",
-          attributes: %i[first_name last_name date_of_birth national_insurance_number address],
+          attributes: %i[first_name last_name date_of_birth national_insurance_number],
           partner: @partner,
           read_only: @read_only,
         ) %>

diff --git a/app/views/providers/means_reports/show.html.erb b/app/views/providers/means_reports/show.html.erb
@@ -17,7 +17,7 @@
   <% if @legal_aid_application.applicant_has_partner? %>
     <%= render(
           "shared/check_answers/partner_details",
-          attributes: %i[first_name last_name date_of_birth national_insurance_number address],
+          attributes: %i[first_name last_name date_of_birth national_insurance_number],
           partner: @legal_aid_application.partner,
           read_only: true,
         ) %>

diff --git a/app/views/providers/merits_reports/show.html.erb b/app/views/providers/merits_reports/show.html.erb
@@ -15,7 +15,7 @@
   <% if @legal_aid_application.applicant_has_partner? %>
     <%= render(
           "shared/check_answers/partner_details",
-          attributes: %i[first_name last_name date_of_birth national_insurance_number address],
+          attributes: %i[first_name last_name date_of_birth national_insurance_number],
           partner: @legal_aid_application.partner,
           read_only: true,
         ) %>

diff --git a/app/views/providers/partners/address_lookups/show.html.erb b/app/views/providers/partners/address_lookups/show.html.erb
diff --git a/app/views/providers/partners/address_selections/show.html.erb b/app/views/providers/partners/address_selections/show.html.erb