Merge branch 'master' into VPG-302

department-of-veterans-affairs · Dec 19, 2024 · c8d1221 · c8d1221
2 parents 09a9865 + d870a13
commit c8d1221
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 22 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -604,11 +604,11 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.8.0)
     io-console (0.8.0-java)
-    irb (1.14.1)
+    irb (1.14.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso_country_codes (0.7.8)
-    jar-dependencies (0.5.0)
+    jar-dependencies (0.5.1)
     jmespath (1.6.2)
     jruby-openssl (0.15.1-java)
     json (2.9.0)
@@ -653,7 +653,7 @@ GEM
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     lockbox (2.0.0)
-    logger (1.6.2)
+    logger (1.6.3)
     loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -793,10 +793,10 @@ GEM
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
     pstore (0.1.3)
-    psych (5.2.1)
+    psych (5.2.2)
       date
       stringio
-    psych (5.2.1-java)
+    psych (5.2.2-java)
       date
       jar-dependencies (>= 0.1.7)
     public_suffix (6.0.1)
@@ -845,7 +845,7 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.1)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-session_cookie (0.3.0)
@@ -868,7 +868,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    rdoc (6.8.1)
+    rdoc (6.9.1)
       psych (>= 4.0.0)
     redis (5.3.0)
       redis-client (>= 0.22.0)
@@ -877,7 +877,7 @@ GEM
     redis-namespace (1.11.0)
       redis (>= 4)
     regexp_parser (2.9.3)
-    reline (0.5.12)
+    reline (0.6.0)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -923,7 +923,7 @@ GEM
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.0.1)
+    rspec-rails (7.1.0)
       actionpack (>= 7.0)
       activesupport (>= 7.0)
       railties (>= 7.0)
@@ -938,7 +938,7 @@ GEM
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rswag-specs (2.16.0)
@@ -1006,7 +1006,7 @@ GEM
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     script_utils (0.0.4)
-    securerandom (0.4.0)
+    securerandom (0.4.1)
     seedbank (0.5.0)
       rake (>= 10.0)
     semantic_logger (4.16.0)

diff --git a/app/controllers/v0/disability_compensation_forms_controller.rb b/app/controllers/v0/disability_compensation_forms_controller.rb
@@ -123,7 +123,7 @@ def create_submission(saved_claim)
         saved_claim_id: saved_claim.id,
         auth_headers_json: auth_headers.to_json,
         form_json: saved_claim.to_submission_data(@current_user),
-        submit_endpoint: includes_toxic_exposure? ? 'claims_api' : 'evss'
+        submit_endpoint: 'claims_api'
       ) { |sub| sub.add_birls_ids @current_user.birls_id }
 
       if missing_disabilities?(submission)
@@ -162,11 +162,6 @@ def stats_key
       'api.disability_compensation'
     end
 
-    def includes_toxic_exposure?
-      # any form that has a startedFormVersion (whether it is '2019' or '2022') will go through the Toxic Exposure flow
-      form_content['form526']['startedFormVersion']
-    end
-
     def missing_disabilities?(submission)
       if submission.form['form526']['form526']['disabilities'].none?
         StatsD.increment("#{stats_key}.failure")

diff --git a/app/sidekiq/benefits_intake_status_job.rb b/app/sidekiq/benefits_intake_status_job.rb
@@ -4,7 +4,7 @@
 require 'lighthouse/benefits_intake/service'
 require 'pensions/monitor'
 require 'pensions/notification_email'
-require 'va_notify/notification_email/burial'
+require 'burials/notification_email'
 require 'pcpg/monitor'
 require 'dependents/monitor'
 require 'vre/monitor'

diff --git a/app/sidekiq/lighthouse/submit_benefits_intake_claim.rb b/app/sidekiq/lighthouse/submit_benefits_intake_claim.rb
@@ -4,11 +4,11 @@
 require 'pdf_utilities/datestamp_pdf'
 require 'pension_burial/tag_sentry'
 require 'burials/monitor'
+require 'burials/notification_email'
 require 'pcpg/monitor'
 require 'benefits_intake_service/service'
 require 'simple_forms_api_submission/metadata_validator'
 require 'pdf_info'
-require 'va_notify/notification_email/burial'
 
 module Lighthouse
   class SubmitBenefitsIntakeClaim

diff --git a/lib/burials/monitor.rb b/lib/burials/monitor.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'va_notify/notification_email/burial'
+require 'burials/notification_email'
 require 'zero_silent_failures/monitor'
 
 module Burials

diff --git a/lib/va_notify/notification_email/burial.rb → lib/burials/notification_email.rb b/lib/va_notify/notification_email/burial.rb → lib/burials/notification_email.rb
diff --git a/modules/burials/lib/benefits_intake/submission_handler.rb b/modules/burials/lib/benefits_intake/submission_handler.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'lighthouse/benefits_intake/submission_handler/saved_claim'
-require 'va_notify/notification_email/burial'
 require 'burials/monitor'
+require 'burials/notification_email'
 
 module Burials
   module BenefitsIntake

diff --git a/..._email/burials/notification_email_spec.rb → spec/lib/burials/notification_email_spec.rb b/..._email/burials/notification_email_spec.rb → spec/lib/burials/notification_email_spec.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+# lib
+require 'burials/notification_email'
+
+# spec
 require 'rails_helper'
-require 'va_notify/notification_email/burial'
 
 RSpec.describe Burials::NotificationEmail do
   let(:claim) { build(:burial_claim) }