VFMP - Added the ability for CST providers to upload supporting docs to existing cases

app/controllers/v0/benefits_claims_controller.rb

@@ -10,6 +10,7 @@
 require 'lighthouse/benefits_documents/update_documents_status_service'
 
 module V0
+  # rubocop:disable Metrics/ClassLength
   class BenefitsClaimsController < ApplicationController
     include InboundRequestLogging
     include V0::Concerns::MultiProviderSupport
@@ -28,6 +29,48 @@ class BenefitsClaimsController < ApplicationController
 
     FEATURE_USE_TITLE_GENERATOR_WEB = 'cst_use_claim_title_generator_web'
     FEATURE_MULTI_CLAIM_PROVIDER = 'cst_multi_claim_provider'
+    DEFAULT_UPLOAD_DESTINATION_KEY = 'benefits_claims'
+    IVC_CHAMPVA_UPLOAD_DESTINATION_KEY = 'ivc_champva_supporting_documents'
+    IVC_CHAMPVA_FINALIZE_DESTINATION_KEY = 'ivc_champva_docs_only_resubmission'
+
+    UPLOAD_DESTINATION_KEY_BY_PROVIDER = {
+      'lighthouse' => DEFAULT_UPLOAD_DESTINATION_KEY,
+      'ivc_champva' => IVC_CHAMPVA_UPLOAD_DESTINATION_KEY
+    }.freeze
+
+    IVC_CHAMPVA_FORM_ID_BY_CLAIM_TYPE = {
+      'CHAMPVA application' => '10-10D-EXTENDED',
+      'Other Health Insurance' => '10-7959C',
+      'Foreign Medical Program registration' => '10-7959F-1',
+      'Foreign Medical Program claim' => '10-7959F-2',
+      'CHAMPVA claim' => '10-7959A'
+    }.freeze
+
+    IVC_CHAMPVA_10_10D_EXTENDED_DOCUMENT_TYPE_OPTIONS = [
+      'Court ordered adoption papers',
+      'Birth certificate',
+      'Certificate of civil union',
+      'Divorce decree',
+      'Marriage certificate',
+      'Front of Medicare Parts A or B card',
+      'Back of Medicare Parts A or B card',
+      'Front of Medicare Part C card',
+      'Back of Medicare Part C card',
+      'Front of Medicare Part D card',
+      'Back of Medicare Part D card',
+      'Front of health insurance card',
+      'Back of health insurance card',
+      'Other document',
+      'School enrollment certification form',
+      'Enrollment letter',
+      'Letter from the SSA'
+    ].map { |option| { 'value' => option, 'label' => option } }.freeze
+
+    IVC_CHAMPVA_DOCUMENT_TYPE_OPTIONS_BY_FORM_ID = {
+      '10-10D-EXTENDED' => IVC_CHAMPVA_10_10D_EXTENDED_DOCUMENT_TYPE_OPTIONS
+    }.freeze
+
+    IVC_CHAMPVA_ACCEPTED_FILE_TYPES = %w[pdf jpg jpeg png].freeze
 
     def index
       claims = if Flipper.enabled?(FEATURE_MULTI_CLAIM_PROVIDER, @current_user)
@@ -41,6 +84,7 @@ def index
 
       claims['data'].each do |claim|
         update_claim_type_language(claim)
+        add_upload_metadata(claim)
       end
 
       claim_ids = claims['data'].map { |claim| claim['id'] }
@@ -64,6 +108,7 @@ def show
                 get_legacy_claim(params[:id])
               end
       update_claim_type_language(claim['data'])
+      add_upload_metadata(claim['data'])
 
       # Document uploads to EVSS require a birls_id; This restriction should
       # be removed when we move to Lighthouse Benefits Documents for document uploads
@@ -180,6 +225,38 @@ def update_claim_type_language(claim)
       end
     end
 
+    def add_upload_metadata(claim)
+      metadata = build_upload_metadata_for_claim(claim)
+      return if metadata.blank?
+
+      claim['attributes'] ||= {}
+      claim['attributes']['uploadMetadata'] = metadata
+    end
+
+    def build_upload_metadata_for_claim(claim)
+      claim_attributes = claim['attributes'] || {}
+      provider = claim_attributes['provider'].presence
+      destination_key = UPLOAD_DESTINATION_KEY_BY_PROVIDER.fetch(provider, DEFAULT_UPLOAD_DESTINATION_KEY)
+
+      metadata = { 'uploadDestinationKey' => destination_key }
+
+      if destination_key == IVC_CHAMPVA_UPLOAD_DESTINATION_KEY
+        form_id = IVC_CHAMPVA_FORM_ID_BY_CLAIM_TYPE[claim_attributes['claimType']]
+        metadata['formId'] = form_id if form_id.present?
+        metadata['acceptedFileTypes'] = IVC_CHAMPVA_ACCEPTED_FILE_TYPES
+        if form_id == '10-10D-EXTENDED' &&
+           Flipper.enabled?(:form1010d_enhanced_flow_enabled, @current_user)
+          metadata['finalizeDestinationKey'] = IVC_CHAMPVA_FINALIZE_DESTINATION_KEY
+          metadata['submissionType'] = 'existing'
+        end
+
+        document_type_options = IVC_CHAMPVA_DOCUMENT_TYPE_OPTIONS_BY_FORM_ID[form_id]
+        metadata['documentTypeOptions'] = document_type_options if document_type_options.present?
+      end
+
+      metadata
+    end
+
     def add_evidence_submissions(claim, evidence_submissions)
       non_duplicate_submissions = filter_duplicate_evidence_submissions(evidence_submissions, claim)
       tracked_items = claim['attributes']['trackedItems']
@@ -328,7 +405,10 @@ def report_evidence_submission_metrics(endpoint, evidence_submissions)
     end
 
     def fetch_evidence_submissions(claim_ids, endpoint)
-      EvidenceSubmission.where(claim_id: claim_ids)
+      query_ids = resolve_evidence_submission_claim_ids(claim_ids)
+      return EvidenceSubmission.none if query_ids.empty?
+
+      EvidenceSubmission.where(claim_id: query_ids)
     rescue => e
       ::Rails.logger.error(
         "BenefitsClaimsController##{endpoint} Error fetching evidence submissions",
@@ -342,6 +422,17 @@ def fetch_evidence_submissions(claim_ids, endpoint)
       EvidenceSubmission.none
     end
 
+    def resolve_evidence_submission_claim_ids(claim_ids)
+      identifiers = Array(claim_ids).compact.map(&:to_s)
+      return [] if identifiers.empty?
+
+      numeric_ids = identifiers.grep(/\A\d+\z/).map(&:to_i)
+      uuid_ids = identifiers.grep_v(/\A\d+\z/)
+      numeric_ids += IvcChampvaForm.where(form_uuid: uuid_ids).pluck(:id) if uuid_ids.any?
+
+      numeric_ids.uniq
+    end
+
     def update_evidence_submissions_for_claim(claim_id, evidence_submissions)
       # Get pending evidence submissions as an ActiveRecord relation
       # PENDING = successfully sent to Lighthouse with request_id, awaiting final status
@@ -438,20 +529,27 @@ def handle_error(claim_id, response, lighthouse_document_request_ids, error_sour
       )
     end
 
+    # rubocop:disable Metrics/MethodLength
     def add_evidence_submissions_to_claims(claims, all_evidence_submissions, endpoint)
       return if claims.empty?
 
-      # Group evidence submissions by claim_id for efficient lookup
-      evidence_submissions_by_claim = all_evidence_submissions.group_by(&:claim_id)
+      evidence_submissions_by_claim_id = all_evidence_submissions.group_by(&:claim_id)
+      ivc_form_ids_by_uuid = {}
 
-      # Add evidence submissions to each claim
       claims.each do |claim|
-        claim_id = claim['id'].to_i
-        evidence_submissions = evidence_submissions_by_claim[claim_id] || []
+        evidence_submissions = evidence_submissions_for_claim(
+          claim,
+          evidence_submissions_by_claim_id,
+          ivc_form_ids_by_uuid
+        )
 
         claim['attributes']['evidenceSubmissions'] =
           add_evidence_submissions(claim, evidence_submissions)
       end
+    rescue ArgumentError
+      claims.each do |claim|
+        claim['attributes']['evidenceSubmissions'] ||= []
+      end
     rescue => e
       # Log error but don't fail the request - graceful degradation
       # Frontend already handles missing evidenceSubmissions attribute
@@ -464,6 +562,21 @@ def add_evidence_submissions_to_claims(claims, all_evidence_submissions, endpoin
         }
       )
     end
+    # rubocop:enable Metrics/MethodLength
+
+    def evidence_submissions_for_claim(claim, evidence_submissions_by_claim_id, ivc_form_ids_by_uuid)
+      provider = claim.dig('attributes', 'provider')
+      claim_id = claim['id'].to_s
+      return non_champva_evidence_submissions(claim_id, evidence_submissions_by_claim_id) if provider != 'ivc_champva'
+
+      ivc_form_ids_by_uuid[claim_id] ||= IvcChampvaForm.where(form_uuid: claim_id).pluck(:id)
+      ivc_form_ids_by_uuid[claim_id].flat_map { |form_id| evidence_submissions_by_claim_id[form_id] || [] }
+    end
+
+    def non_champva_evidence_submissions(claim_id, evidence_submissions_by_claim_id)
+      numeric_claim_id = Integer(claim_id, 10)
+      evidence_submissions_by_claim_id[numeric_claim_id] || []
+    end
 
     def recently_polled_request_ids?(claim_id, request_ids)
       cache_record = EvidenceSubmissionPollStore.find(claim_id.to_s)
@@ -500,4 +613,5 @@ def cache_polled_request_ids(claim_id, request_ids)
       )
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

app/swagger/swagger/schemas/benefits_claims.rb

@@ -89,6 +89,31 @@ class BenefitsClaims
             key :description, 'Base claim type used for title generation'
             key :example, 'Compensation'
           end
+          property :uploadMetadata do
+            key :type, :object
+            key :description, 'Upload routing metadata used by clients to choose upload destination and payload'
+            property :uploadDestinationKey, type: :string, example: 'benefits_claims'
+            property :formId, type: %i[string null], example: '10-10D-EXTENDED'
+            property :finalizeDestinationKey, type: %i[string null], example: 'ivc_champva_docs_only_resubmission'
+            property :submissionType, type: %i[string null], example: 'existing'
+            property :acceptedFileTypes do
+              key :type, :array
+              key :description, 'Optional list of accepted file extensions for this upload destination'
+              items do
+                key :type, :string
+                key :example, 'pdf'
+              end
+            end
+            property :documentTypeOptions do
+              key :type, :array
+              key :description, 'Optional list of provider-specific document type choices for uploader dropdowns'
+              items do
+                key :type, :object
+                property :value, type: :string, example: 'Birth certificate'
+                property :label, type: :string, example: 'Birth certificate'
+              end
+            end
+          end
 
           property :supportingDocuments do
             key :type, :array

config/benefits_claims/claim_status_meta/ivc_champva/default.json

@@ -12,7 +12,7 @@
     "emptyState": "You don't need to do anything right now. If there's an update, we'll mail you a letter."
   },
   "files": {
-    "simpleLayout": true,
+    "simpleLayout": false,
     "headerTitle": "Application files",
     "description": "If you need to add information or update your documents, you can print a copy of each document and send them by mail or fax.",
     "sectionTitle": "Application files",

config/features.yml

@@ -455,6 +455,9 @@ features:
   champva_convert_to_pdf_on_upload:
     actor_type: user
     description: Converts supporting documents to PDF at upload time instead of final submission to improve submit latency
+  form1010d_enhanced_flow_enabled:
+    actor_type: user
+    description: Enables enhanced docs-only resubmission flow for CHAMPVA 10-10D-EXTENDED submissions
   champva_stamper_logging:
     actor_type: user
     description: Enables logging of the desired stamp text