From fc3ec9e750efa182fd44c1d4f2ddb379e2578ce3 Mon Sep 17 00:00:00 2001 From: Josh Fike Date: Wed, 16 Oct 2024 16:19:53 -0500 Subject: [PATCH] [WIP] Trying to query veterans_organizations table --- .../v0/pdf_generator_2122_controller.rb | 6 ++---- .../v0/pdf_generator_2122a_controller.rb | 10 ---------- .../v0/pdf_generator_base_controller.rb | 12 ++++++++++++ .../v0/pdf_generator_2122_spec.rb | 5 ++++- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_2122_controller.rb b/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_2122_controller.rb index f7bbcde899f..698f98dfa01 100644 --- a/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_2122_controller.rb +++ b/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_2122_controller.rb @@ -25,14 +25,12 @@ def create private def form_params - params.require(:pdf_generator2122).permit( - params_permitted.unshift(:organization_name) - ) + params.require(:pdf_generator2122).permit(params_permitted) end def flatten_form_params { - organization_name: form_params[:organization_name], + organization_name: form_params[:representative][:organization_name], record_consent: form_params[:record_consent], consent_limits: form_params[:consent_limits], consent_address_change: form_params[:consent_address_change] diff --git a/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_2122a_controller.rb b/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_2122a_controller.rb index fb85a0971fe..10ff74418d5 100644 --- a/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_2122a_controller.rb +++ b/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_2122a_controller.rb @@ -30,16 +30,6 @@ def form_params ) end - def representative_params_permitted - [ - :type, - :phone, - :email, - { name: name_params_permitted, - address: address_params_permitted } - ] - end - def flatten_form_params { record_consent: form_params[:record_consent], diff --git a/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_base_controller.rb b/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_base_controller.rb index 3a636b216f7..558f6aa121c 100644 --- a/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_base_controller.rb +++ b/modules/representation_management/app/controllers/representation_management/v0/pdf_generator_base_controller.rb @@ -16,6 +16,7 @@ def params_permitted { consent_limits: [], conditions_of_appointment: [], claimant: claimant_params_permitted, + representative: representative_params_permitted, veteran: veteran_params_permitted } ] end @@ -31,6 +32,17 @@ def claimant_params_permitted ] end + def representative_params_permitted + [ + :organization_name, + :type, + :phone, + :email, + { name: name_params_permitted, + address: address_params_permitted } + ] + end + def veteran_params_permitted [ :ssn, diff --git a/modules/representation_management/spec/requests/representation_management/v0/pdf_generator_2122_spec.rb b/modules/representation_management/spec/requests/representation_management/v0/pdf_generator_2122_spec.rb index cd14491454e..23b0aeb3e78 100644 --- a/modules/representation_management/spec/requests/representation_management/v0/pdf_generator_2122_spec.rb +++ b/modules/representation_management/spec/requests/representation_management/v0/pdf_generator_2122_spec.rb @@ -5,10 +5,10 @@ RSpec.describe 'RepresentationManagement::V0::PdfGenerator2122', type: :request do describe 'POST #create' do let(:base_path) { '/representation_management/v0/pdf_generator2122' } + let(:organization) { create(:organization) } let(:params) do { pdf_generator2122: { - organization_name: 'My Organization', record_consent: '', consent_address_change: '', consent_limits: [], @@ -55,6 +55,9 @@ zip_code: '98765', zip_code_suffix: '4321' } + }, + representative: { + organization_name: organization.id } } }