form 21-2680 controller refactor and tests (#25320)

* form 21-2680 controller refactor and tests

smaller change, better test

undo conflicting changes

refactor 21-2680 controller

update comment

Fix spec

* fix lint

* PR feedback

---------

Co-authored-by: Justin Linn <justin@linnjs.com>
Co-authored-by: Anna Carey <acarey@gmail.com>

Author: 3 people

app/controllers/v0/form212680_controller.rb

@@ -3,78 +3,69 @@
 module V0
   class Form212680Controller < ApplicationController
     include RetriableConcern
-    include PdfFill::Forms::FormHelper
-
     service_tag 'form-21-2680'
-    skip_before_action :authenticate, only: %i[download_pdf]
+    skip_before_action :authenticate
     before_action :load_user
     before_action :check_feature_enabled
 
-    # POST /v0/form212680/download_pdf
+    def create
+      claim = saved_claim_class.new(form: filtered_params)
+      Rails.logger.info "Begin ClaimGUID=#{claim.guid} Form=#{claim.class::FORM} UserID=#{current_user&.uuid}"
+      if claim.save
+        # NOTE: we are not calling process_attachments! because we are not submitting yet
+        StatsD.increment("#{stats_key}.success")
+        Rails.logger.info "Submitted job ClaimID=#{claim.confirmation_number} Form=#{claim.class::FORM} " \
+                          "UserID=#{current_user&.uuid}"
+        render json: SavedClaimSerializer.new(claim)
+      else
+        StatsD.increment("#{stats_key}.failure")
+        raise Common::Exceptions::ValidationErrors, claim
+      end
+    rescue JSON::ParserError
+      raise Common::Exceptions::ParameterMissing, 'form'
+    end
+
+    # get /v0/form212680/download_pdf/{guid}
     # Generate and download a pre-filled PDF with veteran sections (I-V) completed
     # Physician sections (VI-VIII) are left blank for manual completion
+    #
     def download_pdf
-      # using request.raw_post to avoid the middleware that transforms the JSON keys to snake case
-      pdf_path = nil
-      parsed_body = JSON.parse(request.raw_post)
-      form_data = parsed_body['form']
-
-      raise Common::Exceptions::ParameterMissing, 'form' unless form_data
-
-      # Transform 3-character country codes to 2-character codes for PDF compatibility
-      transform_country_codes!(form_data)
+      claim = saved_claim_class.find_by!(guid: params[:guid])
+      source_file_path = with_retries('Generate 21-2680 PDF') do
+        claim.generate_prefilled_pdf
+      end
+      raise Common::Exceptions::InternalServerError, 'Failed to generate PDF' unless source_file_path
 
-      claim = create_claim_from_form_data(form_data)
-      pdf_path = generate_and_send_pdf(claim)
-    rescue JSON::ParserError
-      raise Common::Exceptions::ParameterMissing, 'form'
+      send_data File.read(source_file_path),
+                filename: download_file_name(claim),
+                type: 'application/pdf',
+                disposition: 'attachment'
+    rescue ActiveRecord::RecordNotFound
+      raise Common::Exceptions::RecordNotFound, params[:guid]
     ensure
-      # Delete the temporary PDF file
-      begin
-        File.delete(pdf_path) if pdf_path
-      rescue Errno::ENOENT
-        # Ignore if file doesn't exist
-      end
+      File.delete(source_file_path) if defined?(source_file_path) && source_file_path && File.exist?(source_file_path)
     end
 
     private
 
-    def transform_country_codes!(form_data)
-      # Transform claimant address country code
-      claimant_address = form_data.dig('claimantInformation', 'address')
-      if claimant_address&.key?('country')
-        transformed_country = extract_country(claimant_address)
-        claimant_address['country'] = transformed_country if transformed_country
-      end
-
-      # Transform hospital address country code
-      hospital_address = form_data.dig('additionalInformation', 'hospitalAddress')
-      if hospital_address&.key?('country')
-        transformed_country = extract_country(hospital_address)
-        hospital_address['country'] = transformed_country if transformed_country
-      end
+    def short_name
+      'house_bound_status_claim'
     end
 
-    def create_claim_from_form_data(form_data)
-      form_body = form_data.to_json
-      claim = SavedClaim::Form212680.new(form: form_body)
-      raise(Common::Exceptions::ValidationErrors, claim) unless claim.save
-
-      claim
+    def filtered_params
+      params.require(:form)
     end
 
-    def generate_and_send_pdf(claim)
-      pdf_path = with_retries('Generate 21-2680 PDF') do
-        claim.generate_prefilled_pdf
-      end
-      file_data = File.read(pdf_path)
+    def download_file_name(claim)
+      "21-2680_#{claim.veteran_first_last_name.gsub(' ', '_')}.pdf"
+    end
 
-      send_data file_data,
-                filename: "VA_Form_21-2680_#{Time.current.strftime('%Y%m%d_%H%M%S')}.pdf",
-                type: 'application/pdf',
-                disposition: 'attachment'
+    def saved_claim_class
+      SavedClaim::Form212680
+    end
 
-      pdf_path
+    def stats_key
+      'api.form212680'
     end
 
     def check_feature_enabled

app/models/saved_claim/form212680.rb

@@ -28,7 +28,7 @@ def document_type
 
   # Generate pre-filled PDF with veteran sections
   def generate_prefilled_pdf
-    pdf_path = to_pdf(SecureRandom.uuid)
+    pdf_path = to_pdf
 
     # Update metadata to track PDF generation
     update_metadata_with_pdf_generation
@@ -60,6 +60,13 @@ def attachment_keys
     [].freeze
   end
 
+  def veteran_first_last_name
+    full_name = parsed_form.dig('veteranInformation', 'fullName')
+    return 'Veteran' unless full_name.is_a?(Hash)
+
+    "#{full_name['first']} #{full_name['last']}"
+  end
+
   private
 
   def update_metadata_with_pdf_generation

app/swagger/swagger/requests/form212680.rb

@@ -6,30 +6,53 @@ class Form212680
       include Swagger::Blocks
       FORM_ID = '21-2680'
 
-      swagger_path '/v0/form212680/download_pdf' do
+      swagger_path '/v0/form212680' do
         operation :post do
-          extend Swagger::Responses::ValidationError
-          extend Swagger::Responses::UnprocessableEntityError
-          extend Swagger::Responses::InternalServerError
           extend Swagger::Responses::BadRequestError
           extend Swagger::Responses::RecordNotFoundError
+          extend Swagger::Responses::SavedForm
+          extend Swagger::Responses::UnprocessableEntityError
+          extend Swagger::Responses::ValidationError
 
           key :description,
-              'Generate and download a pre-filled 21-2680 PDF form ' \
-              '(Examination for Housebound Status or Permanent Need for Regular Aid and Attendance)'
-          key :operationId, 'downloadForm212680Pdf'
+              "Create a SavedClaim for #{FORM_ID}" \
+              '(Examination for Housebound Status or Permanent Need for Regular Aid and Attendance),' \
+              'to be used later for PDF generation'
+          key :operationId, 'createForm212680Pdf'
           key :tags, %w[benefits_forms]
-          key :produces, ['application/pdf', 'application/json']
+          key :produces, ['application/json']
           parameter :optional_authorization
+
           parameter do
             key :name, :form
             key :in, :body
-            key :description, 'Form 21-2680 data for PDF generation'
+            key :description, "Form #{FORM_ID} submission data"
             key :required, true
             schema do
               VetsJsonSchema::SCHEMAS[FORM_ID]['properties']
             end
           end
+        end
+      end
+
+      swagger_path '/v0/form212680/download_pdf/{guid}' do
+        operation :get do
+          extend Swagger::Responses::RecordNotFoundError
+
+          key :description, "Download the submitted #{FORM_ID} PDF form"
+          key :operationId, 'downloadForm212680Pdf'
+          key :tags, %w[benefits_forms]
+          key :produces, ['application/pdf', 'application/json']
+
+          parameter :optional_authorization
+
+          parameter do
+            key :name, 'guid'
+            key :in, :path
+            key :description, 'the guid from the form submission response'
+            key :required, true
+            key :type, :string
+          end
 
           response 200 do
             key :description, 'PDF file successfully generated and ready for download'

config/routes.rb

@@ -72,9 +72,9 @@
       end
     end
 
-    resources :form212680, only: [] do
+    resources :form212680, only: [:create] do
       collection do
-        post :download_pdf
+        get('download_pdf/:guid', action: :download_pdf, as: :download_pdf)
       end
     end