Resolves merge conflict

Gemfile.lock

@@ -206,7 +206,7 @@ GEM
       activemodel (= 7.2.2.1)
       activesupport (= 7.2.2.1)
       timeout (>= 0.4.0)
-    activerecord-import (1.8.1)
+    activerecord-import (2.0.0)
       activerecord (>= 4.2)
     activerecord-postgis-adapter (10.0.1)
       activerecord (~> 7.2.0)
@@ -237,7 +237,8 @@ GEM
       base64
       gyoku (>= 0.4.0)
       nokogiri
-    argon2-kdf (0.2.0)
+    argon2-kdf (0.3.0)
+      fiddle
     ast (2.4.2)
     attr_extras (7.1.0)
     awesome_print (1.9.2)
@@ -325,7 +326,7 @@ GEM
     config (5.5.2)
       deep_merge (~> 1.2, >= 1.2.1)
       ostruct
-    connection_pool (2.4.1)
+    connection_pool (2.5.0)
     content_disposition (1.0.0)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -385,14 +386,16 @@ GEM
     dry-configurable (1.1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-core (1.0.1)
+    dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
+      logger
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
+    dry-inflector (1.2.0)
     dry-initializer (3.1.1)
-    dry-logic (1.5.0)
+    dry-logic (1.6.0)
+      bigdecimal
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
     dry-schema (1.13.4)
       concurrent-ruby (~> 1.0)
@@ -402,12 +405,12 @@ GEM
       dry-logic (>= 1.4, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
-    dry-struct (1.6.0)
-      dry-core (~> 1.0, < 2)
-      dry-types (>= 1.7, < 2)
+    dry-struct (1.7.0)
+      dry-core (~> 1.1)
+      dry-types (~> 1.8)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-types (1.7.2)
+    dry-types (1.8.0)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
@@ -442,8 +445,8 @@ GEM
       faraday (>= 0.8)
     faraday-httpclient (2.0.1)
       httpclient (>= 2.2)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (3.1.1)
       net-http
     faraday-retry (2.2.1)
@@ -474,6 +477,7 @@ GEM
       date_time_precision (>= 0.8)
       mime-types (>= 3.0)
       nokogiri (>= 1.11.4)
+    fiddle (1.1.6)
     fitbit_api (1.0.0)
       oauth2 (~> 2.0)
     flipper (1.3.2)
@@ -601,8 +605,9 @@ GEM
     jruby-openssl (0.15.2-java)
     json (2.9.1)
     json (2.9.1-java)
-    json-schema (5.1.0)
+    json-schema (5.1.1)
       addressable (~> 2.8)
+      bigdecimal (~> 3.1)
     json_schema (0.21.0)
     json_schemer (2.3.0)
       bigdecimal
@@ -613,7 +618,7 @@ GEM
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
     jwe (0.4.0)
-    jwt (2.9.3)
+    jwt (2.10.1)
       base64
     kms_encrypted (1.6.0)
       activesupport (>= 6.1)
@@ -721,7 +726,7 @@ GEM
     octokit (9.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    oj (3.16.7)
+    oj (3.16.9)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     okcomputer (1.18.5)
@@ -737,7 +742,8 @@ GEM
     optimist (3.2.0)
     os (1.1.4)
     ostruct (0.6.1)
-    ox (2.14.18)
+    ox (2.14.19)
+      bigdecimal (>= 3.0)
     parallel (1.26.3)
     parallel_tests (4.7.2)
       parallel
@@ -770,7 +776,7 @@ GEM
       matrix (~> 0.4)
       pdf-core (~> 0.10.0)
       ttfunk (~> 1.8)
-    prawn-markup (1.0.0)
+    prawn-markup (1.0.1)
       nokogiri
       prawn
       prawn-table

app/models/application_record.rb

@@ -24,7 +24,7 @@ def self.descendants_using_encryption
 
   def timestamp_attributes_for_update_in_model
     kms_key_changed = changed? && changed.include?('encrypted_kms_key')
-    called_from_kms_encrypted = caller_locations(1, 1)[0].label == 'encrypt_kms_keys'
+    called_from_kms_encrypted = caller_locations(1, 1)[0].base_label == 'encrypt_kms_keys'
 
     # If update is due to kms key, don't update updated_at
     kms_key_changed || called_from_kms_encrypted ? [] : super

app/models/health_care_application.rb

@@ -6,6 +6,7 @@
 require 'hca/enrollment_eligibility/service'
 require 'hca/enrollment_eligibility/status_matcher'
 require 'mpi/service'
+require 'hca/overrides_parser'
 
 class HealthCareApplication < ApplicationRecord
   include SentryLogging
@@ -71,7 +72,7 @@ def send_failure_email?
   end
 
   def submit_sync
-    @parsed_form = override_parsed_form(parsed_form)
+    @parsed_form = HCA::OverridesParser.new(parsed_form).override
 
     result = begin
       HCA::Service.new(user).submit_form(parsed_form)
@@ -240,7 +241,7 @@ def prefill_fields
 
   def submit_async
     submission_job = email.present? ? 'SubmissionJob' : 'AnonSubmissionJob'
-    @parsed_form = override_parsed_form(parsed_form)
+    @parsed_form = HCA::OverridesParser.new(parsed_form).override
 
     "HCA::#{submission_job}".constantize.perform_async(
       self.class.get_user_identifier(user),

config/betamocks/services_config.yml

@@ -9,25 +9,37 @@
       :path: <%= "/#{Settings.ask_va_api.crm_api.veis_api_path}/ping" %>
       :file_path: "/ask_va/dynamics_api"
       :response_delay: 15
-    - :method: :get
-      :path: "/veis/api/btsss/travelclaim/api/v1/Sample/ping"
-      :file_path: "/travel_pay/ping/default"
-      :response_delay: 0.3
-    - :method: :get
-      :path: "/veis/api/btsss/travelclaim/api/v1/Sample/authorized-ping"
-      :file_path: "/travel_pay/ping/default"
+    - :method: :post
+      :path: <%= "/#{Settings.ask_va_api.crm_api.veis_api_path}/inquiries/new" %>
+      :file_path: "/ask_va/crm_api/post_inquiries/default"
       :response_delay: 0.3
+    ## Travel Pay
     - :method: :post
-      :path: "/veis/api/btsss/travelclaim/api/v1/Auth/access-token"
+      :path: "/veis/api/btsss/travelclaim/api/v1.2/Auth/access-token"
       :file_path: "/travel_pay/btsss_token/default"
       :response_delay: 0.3
     - :method: :get
-      :path: "/veis/api/btsss/travelclaim/api/v1/claims"
-      :file_path: "/travel_pay/claims/default"
+      :path: "/veis/api/btsss/travelclaim/api/v1.2/claims"
+      :file_path: "/travel_pay/claims/index/default"
+      :response_delay: 0.3
+    - :method: :get
+      :path: "/veis/api/btsss/travelclaim/api/v1.2/appointments"
+      :file_path: "/travel_pay/appointments/default"
       :response_delay: 0.3
+    - :method: :patch
+      :path: "/veis/api/btsss/travelclaim/api/v1.2/claims/*/submit"
+      :file_path: "/travel_pay/claims/submit"
+      :response_delay: 0.3
+      :cache_multiple_responses:
+        :uid_location: url
+        :uid_locator: '\/veis\/api\/btsss\/travelclaim\/api\/v1\.2\/claims\/(.+)\/submit'
     - :method: :post
-      :path: <%= "/#{Settings.ask_va_api.crm_api.veis_api_path}/inquiries/new" %>
-      :file_path: "/ask_va/crm_api/post_inquiries/default"
+      :path: "/veis/api/btsss/travelclaim/api/v1.2/claims"
+      :file_path: "/travel_pay/claims/create/default"
+      :response_delay: 0.3
+    - :method: :post
+      :path: "/veis/api/btsss/travelclaim/api/v1.2/expenses/mileage"
+      :file_path: "/travel_pay/expenses/default"
       :response_delay: 0.3
 
 #CRM Token post

config/features.yml

@@ -1839,6 +1839,10 @@ features:
   burial_form_enabled:
     actor_type: user
     description: Enable the burial form
+  burial_module_enabled:
+    actor_type: user
+    description: Enables new Burial module
+    enable_in_development: true
   burial_document_upload_update:
     actor_type: user
     description: Show updated document upload page

db/migrate/20241218183417_add_proc_id_index_to_claims_api_power_of_attorney_requests.rb

@@ -0,0 +1,7 @@
+class AddProcIdIndexToClaimsApiPowerOfAttorneyRequests < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :claims_api_power_of_attorney_requests, :proc_id, algorithm: :concurrently
+  end
+end

db/migrate/20241231213045_drop_va_forms_forms.rb

@@ -0,0 +1,5 @@
+class DropVAFormsForms < ActiveRecord::Migration[7.2]
+  def change
+    drop_table :va_forms_forms, if_exists: true
+  end
+end

lib/common/client/concerns/monitoring.rb

@@ -7,7 +7,7 @@ module Monitoring
         extend ActiveSupport::Concern
 
         def with_monitoring(trace_location = 1)
-          caller = caller_locations(trace_location, 1)[0].label
+          caller = caller_locations(trace_location, 1)[0].base_label
           yield
         rescue => e
           increment_failure(caller, e)

lib/form1010_ezr/service.rb

@@ -5,6 +5,7 @@
 require 'hca/configuration'
 require 'hca/ezr_postfill'
 require 'va1010_forms/utils'
+require 'hca/overrides_parser'
 
 module Form1010Ezr
   class Service < Common::Client::Base
@@ -155,7 +156,7 @@ def configure_and_validate_form(parsed_form)
       post_fill_fields(parsed_form)
       validate_form(parsed_form)
       # Due to overriding the JSON form schema, we need to do so after the form has been validated
-      override_parsed_form(parsed_form)
+      HCA::OverridesParser.new(parsed_form).override
       add_financial_flag(parsed_form)
     end
 

lib/hca/enrollment_system.rb

@@ -865,18 +865,18 @@ def add_attachment(file, id, is_dd214)
     end
 
     # @param [Hash] veteran data in JSON format
-    # @param [Account] current_user
+    # @param [Hash] user_identifier
     # @param [String] form_id
     def veteran_to_save_submit_form(
       veteran,
-      current_user,
+      user_identifier,
       form_id
     )
       return {} if veteran.blank?
 
       copy_spouse_address!(veteran)
 
-      request = build_form_for_user(current_user, form_id)
+      request = build_form_for_user(user_identifier, form_id)
 
       veteran['attachments']&.each_with_index do |attachment, i|
         guid = attachment['confirmationCode']