Merge branch 'master' into API-40862-dynamic-email-report-preview

merges master

.github/CODEOWNERS

@@ -594,6 +594,7 @@ app/uploaders/uploader_virus_scan.rb @department-of-veterans-affairs/va-api-engi
 app/uploaders/validate_pdf.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 app/uploaders/vets_shrine.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 app/validators/token_util.rb @department-of-veterans-affairs/backend-review-group
+app/uploaders/simple_forms_api/ @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 app/uploaders/veteran_facing_forms_remediation_uploader.rb @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 app/sidekiq/account_login_statistics_job.rb @department-of-veterans-affairs/octo-identity
 app/sidekiq/benefits_intake_remediation_status_job.rb @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
@@ -645,6 +646,7 @@ app/sidekiq/lighthouse/create_intent_to_file_job.rb @department-of-veterans-affa
 app/sidekiq/lighthouse/income_and_assets_intake_job.rb @department-of-veterans-affairs/pensions @department-of-veterans-affairs/backend-review-group
 app/sidekiq/load_average_days_for_claim_completion_job.rb @department-of-veterans-affairs/benefits-microservices @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 app/sidekiq/mhv @department-of-veterans-affairs/vfs-mhv-medical-records @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
+app/sidekiq/mhv/account_creator_job.rb @department-of-veterans-affairs/octo-identity
 app/sidekiq/pager_duty @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 app/sidekiq/preneeds @department-of-veterans-affairs/mbs-core-team @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 app/sidekiq/schema_contract @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
@@ -978,6 +980,7 @@ lib/sidekiq/semantic_logging.rb @department-of-veterans-affairs/backend-review-g
 lib/sidekiq/set_request_attributes.rb @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers
 lib/sidekiq/set_request_id.rb @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers
 lib/sign_in @department-of-veterans-affairs/octo-identity
+lib/simple_forms_api/ @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 lib/simple_forms_api_submission @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 lib/slack @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 lib/sm @department-of-veterans-affairs/vfs-mhv-secure-messaging @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
@@ -1341,6 +1344,7 @@ spec/sidekiq/kms_key_rotation @department-of-veterans-affairs/va-api-engineers @
 spec/sidekiq/lighthouse @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 spec/sidekiq/load_average_days_for_claim_completion_job_spec.rb @department-of-veterans-affairs/benefits-microservices @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 spec/sidekiq/mhv @department-of-veterans-affairs/vfs-mhv-medical-records @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
+spec/sidekiq/mhv/account_creator_job_spec.rb @department-of-veterans-affairs/octo-identity
 spec/sidekiq/pager_duty @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 spec/sidekiq/preneeds @department-of-veterans-affairs/mbs-core-team @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 spec/sidekiq/schema_contract @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group

Gemfile.lock

@@ -74,10 +74,10 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/vets-json-schema
-  revision: 998cfd9d48db75a5533e33785d6523933f7e9b36
+  revision: be610f6623ef1fac432e5616372d4a5eadb93773
   branch: master
   specs:
-    vets_json_schema (24.2.9)
+    vets_json_schema (24.4.0)
       multi_json (~> 1.0)
       script_utils (= 0.0.4)
 
@@ -718,7 +718,7 @@ GEM
     ostruct (0.6.0)
     ox (2.14.18)
     parallel (1.26.3)
-    parallel_tests (4.7.1)
+    parallel_tests (4.7.2)
       parallel
     parser (3.3.5.0)
       ast (~> 2.4.1)
@@ -978,7 +978,7 @@ GEM
       rake (>= 10.0)
     semantic_logger (4.16.0)
       concurrent-ruby (~> 1.0)
-    sentry-ruby (5.19.0)
+    sentry-ruby (5.21.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shellany (0.0.1)

app/controllers/v0/profile/service_histories_controller.rb

@@ -43,7 +43,7 @@ def get_military_info
         handle_errors!(response.episodes)
         report_results(response.episodes)
 
-        service_history_json = JSON.parse(response.episodes.to_json, symbolize_names: true)
+        service_history_json = JSON.parse(response.to_json, symbolize_names: true)
         options = { is_collection: false }
 
         render json: ServiceHistorySerializer.new(service_history_json, options), status: response.status

app/models/form_profiles/va_21p530v2.rb

@@ -28,6 +28,6 @@ def prefill
 
   def convert_to_iso2(country_code)
     code = IsoCountryCodes.find(country_code)
-    code.alpha2
+    code.alpha3
   end
 end

app/models/form_profiles/va_526ez.rb

@@ -73,6 +73,7 @@ class Form526Prefill
     include Virtus.model
 
     attribute :started_form_version, String
+    attribute :sync_modern_0781_flow, Boolean
   end
 end
 
@@ -168,7 +169,8 @@ def initialize_form526_prefill
     VA526ez::Form526Prefill.new(
       # any form that has a startedFormVersion (whether it is '2019' or '2022') will go through the Toxic Exposure flow
       # '2022' means the Toxic Exposure 1.0 flag.
-      started_form_version: Flipper.enabled?(:disability_526_toxic_exposure, user) ? '2022' : nil
+      started_form_version: Flipper.enabled?(:disability_526_toxic_exposure, user) ? '2022' : nil,
+      sync_modern_0781_flow: Flipper.enabled?(:disability_compensation_sync_modern_0781_flow, user)
     )
   end
 

app/models/form_submission.rb

@@ -51,10 +51,6 @@ def with_form_types(form_types)
     end
   end
 
-  def form_data
-    super || '{}'
-  end
-
   def latest_pending_attempt
     form_submission_attempts.where(aasm_state: 'pending').order(created_at: :asc).last
   end

app/models/form_submission_attempt.rb

@@ -79,8 +79,10 @@ def log_status_change
   private
 
   def enqueue_result_email(notification_type)
+    raw_form_data = form_submission.form_data || '{}'
+    form_data = JSON.parse(raw_form_data)
     config = {
-      form_data: JSON.parse(form_submission.form_data),
+      form_data:,
       form_number: form_submission.form_type,
       confirmation_number: form_submission.benefits_intake_uuid,
       date_submitted: created_at.strftime('%B %d, %Y'),
@@ -95,7 +97,7 @@ def enqueue_result_email(notification_type)
   end
 
   def time_to_send
-    now = Time.zone.now
+    now = Time.now.in_time_zone('Eastern Time (US & Canada)')
     if now.hour < HOUR_TO_SEND_NOTIFICATIONS
       now.change(hour: HOUR_TO_SEND_NOTIFICATIONS,
                  min: 0)

app/serializers/service_history_serializer.rb

@@ -6,6 +6,10 @@ class ServiceHistorySerializer
   set_id { '' }
 
   attributes :service_history do |object|
-    object
+    object[:episodes]
+  end
+
+  attributes :vet_status_eligibility do |object|
+    object[:vet_status_eligibility]
   end
 end

app/sidekiq/copay_notifications/new_statement_notification_job.rb

@@ -29,7 +29,8 @@ class NewStatementNotificationJob
     end
 
     sidekiq_retries_exhausted do |_msg, ex|
-      StatsD.increment("#{STATSD_KEY_PREFIX}.failure")
+      StatsD.increment("#{STATSD_KEY_PREFIX}.failure") # remove when we get more data into the retries_exhausted below
+      StatsD.increment("#{STATSD_KEY_PREFIX}.retries_exhausted")
       Rails.logger.error <<~LOG
         NewStatementNotificationJob retries exhausted:
         Exception: #{ex.class} - #{ex.message}

app/sidekiq/copay_notifications/parse_new_statements_job.rb

@@ -10,9 +10,19 @@ class ParseNewStatementsJob
     JOB_INTERVAL = Settings.mcp.notifications.job_interval
     # number of jobs to perform at next interval
     BATCH_SIZE = Settings.mcp.notifications.batch_size
+    STATSD_KEY_PREFIX = 'api.copay_notifications.json_file'
+
+    sidekiq_retries_exhausted do |_msg, ex|
+      StatsD.increment("#{STATSD_KEY_PREFIX}.retries_exhausted")
+      Rails.logger.error <<~LOG
+        CopayNotifications::ParseNewStatementsJob retries exhausted:
+        Exception: #{ex.class} - #{ex.message}
+        Backtrace: #{ex.backtrace.join("\n")}
+      LOG
+    end
 
     def perform(statements_json_byte)
-      StatsD.increment('api.copay_notifications.json_file.total')
+      StatsD.increment("#{STATSD_KEY_PREFIX}.total")
       # Decode and parse large json file (~60-90k objects)
       statements_json = Oj.load(Base64.decode64(statements_json_byte))
       unique_statements = statements_json.uniq { |statement| statement['veteranIdentifier'] }

app/sidekiq/mhv/account_creator_job.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'mhv/user_account/creator'
+
+module MHV
+  class AccountCreatorJob
+    include Sidekiq::Job
+
+    sidekiq_options retry: false
+
+    def perform(id)
+      user_verification = UserVerification.find(id)
+      MHV::UserAccount::Creator.new(user_verification:, break_cache: true).perform
+    rescue ActiveRecord::RecordNotFound
+      Rails.logger.error("MHV AccountCreatorJob failed: UserVerification not found for id #{id}")
+    end
+  end
+end

app/swagger/swagger/requests/profile.rb

@@ -933,6 +933,13 @@ class Profile
                       property :character_of_discharge_code, type: :string, example: 'DVN', description: 'The abbreviated code used to reference the status of a Servicemember upon termination of an episode'
                     end
                   end
+                  property :vet_status_eligibility do
+                    key :type, :object
+                    items do
+                      property :confirmed, type: :boolean
+                      property :message, type: :array
+                    end
+                  end
                 end
               end
             end

config/features.yml

@@ -473,6 +473,10 @@ features:
     actor_type: user
     description: enable to test the backup submission path. DO NOT TOGGLE THIS FLAG UNLESS YOU ARE A MEMBER OF DISABILITY BENEFITS EXPERIENCE TEAM.
     enable_in_development: true
+  disability_compensation_sync_modern_0781_flow:
+    actor_type: user
+    description: enables a new form flow for 0781 and 0781a in the 526 submission workflow
+    enable_in_development: true
   education_reports_cleanup:
     actor_type: user
     description: Updates to the daily education reports to remove old data that isn't needed in the new fiscal year
@@ -790,6 +794,10 @@ features:
     actor_type: user
     description: Enable/disable dependent claimant support for POA requests
     enable_in_development: true
+  lighthouse_claims_api_v2_poa_va_notify:
+    actor_type: user
+    description: Enable/disable the VA ntofication emails in V2 POA
+    enable_in_development: false
   lighthouse_claims_v2_poa_requests_skip_bgs:
     actor_type: user
     description: Enable/disable skipping BGS calls for POA Requests
@@ -1038,9 +1046,9 @@ features:
   profile_show_quick_submit_notification_setting:
     actor_type: user
     description: Show/Hide the quick submit section of notification settings in profile
-  profile_show_proof_of_veteran_status:
+  profile_show_proof_of_veteran_status_eligible:
     actor_type: user
-    description: Show/Hide the proof of veteran status page and links
+    description: Include/exclude the proof of veteran status eligibility in service_history response
   profile_use_experimental:
     description: Use experimental features for Profile application - Do not remove
     enable_in_development: true
@@ -1307,6 +1315,10 @@ features:
     actor_type: user
     enable_in_development: true
     description: Toggle for tickets with the label vaos-v2-next will be behind this flag
+  va_online_scheduling_vaos_alternate_route:
+    actor_type: user
+    enable_in_development: false
+    description: Toggle for the vaos module to use an alternate vaos-service route
   va_online_scheduling_clinic_filter:
     actor_type: user
     enable_in_development: true

config/form_profile_mappings/21-526EZ.yml

@@ -7,4 +7,5 @@ bankAccountType: [payment_information, account_type]
 bankAccountNumber: [payment_information, account_number]
 bankRoutingNumber: [payment_information, routing_number]
 bankName: [payment_information, bank_name]
-startedFormVersion: [prefill_526, started_form_version]
+startedFormVersion: [prefill_526, started_form_version]
+syncModern0781Flow: [prefill_526, sync_modern_0781_flow]

config/settings.yml

@@ -676,6 +676,12 @@ claims_api:
     use_mocks: false
   poa_v2:
     disable_jobs: false
+  vanotify:
+    representative_template_id: ~
+    service_organization_template_id: ~
+    services:
+      lighthouse:
+        api_key: ~
 
 connected_apps_api:
   connected_apps:

config/settings/test.yml

@@ -414,7 +414,14 @@ claims_api:
         client_id: fakekeyvaluehere
         secret_key: path/to/fake/key.pem
         aud_claim_url: https://fakeurlhere/fake/path/here
-
+  vanotify:
+    client_url: https://fakeurl/with/path/here
+    representative_template_id: xxxxxx-zzzz-aaaa-bbbb-cccccccc
+    service_organization_template_id: xxxxxx-zzzz-aaaa-bbbb-cccccccc
+    services:
+      lighthouse:
+        api_key: fake-xxxxxx-zzzz-aaaa-bbbb-cccccccc-xxxxxx-zzzz-aaaa-bbbb-cccccccc
+
 ask_va:
   crm_api:
     auth_url: https://login.microsoftonline.us

lib/disability_compensation/providers/document_upload/evss_supplemental_document_upload_provider.rb

@@ -47,22 +47,66 @@ def validate_upload_document(evss_claim_document)
   #
   # @return [Faraday::Response] The EVSS::DocumentsService API calls are implemented with Faraday
   def submit_upload_document(evss_claim_document, file_body)
+    log_upload_attempt
+
     client = EVSS::DocumentsService.new(@form526_submission.auth_headers)
     client.upload(file_body, evss_claim_document)
 
-    StatsD.increment("#{@statsd_metric_prefix}.#{STATSD_PROVIDER_METRIC}.#{STATSD_SUCCESS_METRIC}")
+    # EVSS::DocumentsService uploads throw a EVSS::ErrorMiddleware::EVSSError if they fail
+    # If no exception is raised, log a success response
+    log_upload_success
+  rescue EVSS::ErrorMiddleware::EVSSError => e
+    # If exception is raised, log and re-raise the error
+    log_upload_failure
+    raise e
   end
 
-  def log_upload_failure(error_class, error_message)
-    StatsD.increment("#{@statsd_metric_prefix}.#{STATSD_PROVIDER_METRIC}.#{STATSD_FAILED_METRIC}")
-
+  # To call in the sidekiq_retries_exhausted block of the including job
+  # This is meant to log an upload attempt that was retried and eventually given up on,
+  # so we can investigate the failure in Datadog
+  #
+  # @param uploading_job_class [String] the job where we are uploading the EVSSClaimDocument
+  # (e.g. UploadBDDInstructions)
+  # @param error_class [String] the Error class of the exception that exhausted the upload job
+  # @param error_message [String] the message in the exception that exhausted the upload job
+  def log_uploading_job_failure(uploading_job_class, error_class, error_message)
     Rails.logger.error(
-      'EVSSSupplementalDocumentUploadProvider upload failure',
+      "#{uploading_job_class} EVSSSupplementalDocumentUploadProvider Failure",
       {
-        class: 'EVSSSupplementalDocumentUploadProvider',
+        **base_logging_info,
+        uploading_job_class:,
         error_class:,
         error_message:
       }
     )
+
+    StatsD.increment("#{@statsd_metric_prefix}.#{STATSD_PROVIDER_METRIC}.#{STASTD_UPLOAD_JOB_FAILED_METRIC}")
+  end
+
+  private
+
+  def base_logging_info
+    {
+      class: 'EVSSSupplementalDocumentUploadProvider',
+      submission_id: @form526_submission.submitted_claim_id,
+      user_uuid: @form526_submission.user_uuid,
+      va_document_type_code: @va_document_type,
+      primary_form: 'Form526'
+    }
+  end
+
+  def log_upload_attempt
+    Rails.logger.info('EVSSSupplementalDocumentUploadProvider upload attempted', base_logging_info)
+    StatsD.increment("#{@statsd_metric_prefix}.#{STATSD_PROVIDER_METRIC}.#{STATSD_ATTEMPT_METRIC}")
+  end
+
+  def log_upload_success
+    Rails.logger.info('EVSSSupplementalDocumentUploadProvider upload successful', base_logging_info)
+    StatsD.increment("#{@statsd_metric_prefix}.#{STATSD_PROVIDER_METRIC}.#{STATSD_SUCCESS_METRIC}")
+  end
+
+  def log_upload_failure
+    Rails.logger.error('EVSSSupplementalDocumentUploadProvider upload failed', base_logging_info)
+    StatsD.increment("#{@statsd_metric_prefix}.#{STATSD_PROVIDER_METRIC}.#{STATSD_FAILED_METRIC}")
   end
 end