Merge branch 'master' into API-42609-health-checks-new-services

app/models/saved_claim.rb

@@ -99,6 +99,8 @@ def form_matches_schema
     unless validation_errors.empty?
       Rails.logger.error('SavedClaim form did not pass validation', { guid:, errors: validation_errors })
     end
+
+    schema_errors.empty? && validation_errors.empty?
   end
 
   def to_pdf(file_name = nil)
@@ -147,14 +149,57 @@ def va_notification?(email_template_id)
 
   private
 
+  # Depending on the feature flipper, validate the *entire schema*
+  # via either the json_schema or json_schemer gem.
+  # This is tied to vets-api #19684
   def validate_schema(schema)
+    if Flipper.enabled?(:validate_saved_claims_with_json_schemer)
+      validate_schema_with_json_schemer(schema)
+    else
+      validate_schema_with_json_schema(schema)
+    end
+  end
+
+  # Depending on the feature flipper, validate the *parsed form*
+  # via either the json_schema or the json_schemer gem.
+  # This is tied to vets-api #19684
+  def validate_form(schema, clear_cache)
+    if Flipper.enabled?(:validate_saved_claims_with_json_schemer)
+      validate_form_with_json_schemer(schema)
+    else
+      validate_form_with_json_schema(schema, clear_cache)
+    end
+  end
+
+  # For json_schemer, the default behavior is not to raise an exception
+  # on validation, so we return an array of errors if they exist.
+  # This method validates the *entire schema*.
+  def validate_schema_with_json_schemer(schema)
+    errors = JSONSchemer.validate_schema(schema).to_a
+    return [] if errors.empty?
+
+    reformatted_schemer_errors(errors)
+  end
+
+  # For json_schema, validation errors raise an exception.
+  # This method validates the *entire schema*.
+  def validate_schema_with_json_schema(schema)
     JSON::Validator.fully_validate_schema(schema, { errors_as_objects: true })
   rescue => e
     Rails.logger.error('Error during schema validation!', { error: e.message, backtrace: e.backtrace, schema: })
     raise
   end
 
-  def validate_form(schema, clear_cache)
+  # This method validates the *parsed form* with json_schemer.
+  def validate_form_with_json_schemer(schema)
+    errors = JSONSchemer.schema(schema).validate(parsed_form).to_a
+    return [] if errors.empty?
+
+    reformatted_schemer_errors(errors)
+  end
+
+  # This method validates the *parsed form* with json_schema.
+  def validate_form_with_json_schema(schema, clear_cache)
     JSON::Validator.fully_validate(schema, parsed_form, { errors_as_objects: true, clear_cache: })
   rescue => e
     PersonalInformationLog.create(data: { schema:, parsed_form:, params: { errors_as_objects: true, clear_cache: } },
@@ -164,6 +209,18 @@ def validate_form(schema, clear_cache)
     raise
   end
 
+  # This method exists to change the json_schemer errors
+  # to be formatted like json_schema errors, which keeps
+  # the error logging smooth and identical for both options.
+  def reformatted_schemer_errors(errors)
+    errors.map!(&:symbolize_keys)
+    errors.each do |error|
+      error[:fragment] = error[:data_pointer]
+      error[:message] = error[:error]
+    end
+    errors
+  end
+
   def attachment_keys
     []
   end

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'

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

config/features.yml

@@ -1537,6 +1537,10 @@ features:
     actor_type: user
     description: When enabled, the VAProfile::V3::ContactInformation will be enabled
     enable_in_development: true
+  validate_saved_claims_with_json_schemer:
+    actor_type: user
+    description: When enabled, Saved Claims will be validated using the JSON Schemer gem rather than JSON Schema
+    enable_in_development: false
   veteran_onboarding_beta_flow:
     actor_type: user
     description: Conditionally display the new veteran onboarding flow to user

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

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

modules/pensions/spec/models/pensions/saved_claim_spec.rb

@@ -49,18 +49,45 @@
       )
     end
 
-    describe '#process_attachments!' do
-      it 'sets the attachments saved_claim_id' do
-        expect(Lighthouse::SubmitBenefitsIntakeClaim).not_to receive(:perform_async).with(claim.id)
-        claim.process_attachments!
-        expect(claim.persistent_attachments.size).to eq(2)
+    context 'using JSON Schema' do
+      before do
+        allow(Flipper).to receive(:enabled?).with(:validate_saved_claims_with_json_schemer).and_return(false)
+      end
+
+      describe '#process_attachments!' do
+        it 'sets the attachments saved_claim_id' do
+          expect(Lighthouse::SubmitBenefitsIntakeClaim).not_to receive(:perform_async).with(claim.id)
+          claim.process_attachments!
+          expect(claim.persistent_attachments.size).to eq(2)
+        end
+      end
+
+      describe '#destroy' do
+        it 'also destroys the persistent_attachments' do
+          claim.process_attachments!
+          expect { claim.destroy }.to change(PersistentAttachment, :count).by(-2)
+        end
       end
     end
 
-    describe '#destroy' do
-      it 'also destroys the persistent_attachments' do
-        claim.process_attachments!
-        expect { claim.destroy }.to change(PersistentAttachment, :count).by(-2)
+    context 'using JSON Schemer' do
+      before do
+        allow(Flipper).to receive(:enabled?).with(:validate_saved_claims_with_json_schemer).and_return(true)
+      end
+
+      describe '#process_attachments!' do
+        it 'sets the attachments saved_claim_id' do
+          expect(Lighthouse::SubmitBenefitsIntakeClaim).not_to receive(:perform_async).with(claim.id)
+          claim.process_attachments!
+          expect(claim.persistent_attachments.size).to eq(2)
+        end
+      end
+
+      describe '#destroy' do
+        it 'also destroys the persistent_attachments' do
+          claim.process_attachments!
+          expect { claim.destroy }.to change(PersistentAttachment, :count).by(-2)
+        end
       end
     end
   end

spec/factories/gids_response.rb

@@ -16,11 +16,11 @@
             versioned_school_certifying_officials: [
               {
                 priority: 'Primary',
-                email: 'test@edu_sample.com'
+                email: 'user@school.edu'
               },
               {
                 priority: 'Secondary',
-                email: 'test@edu_sample.com'
+                email: 'user@school.edu'
               }
             ]
           }

spec/factories/va10203.rb

@@ -18,7 +18,7 @@
         schoolCity: 'Test',
         schoolState: 'TN',
         schoolCountry: 'USA',
-        schoolEmailAddress: 'test@edu_sample.com',
+        schoolEmailAddress: 'user@school.edu',
         schoolStudentId: '01010101',
         isActiveDuty: true,
         veteranAddress: {
@@ -58,7 +58,7 @@
         schoolCity: 'Test 2',
         schoolState: 'SC',
         schoolCountry: 'USA',
-        schoolEmailAddress: 'test@edu_sample.com',
+        schoolEmailAddress: 'user@school.edu',
         schoolStudentId: '01010101',
         isActiveDuty: true,
         veteranAddress: {
@@ -98,7 +98,7 @@
         schoolCity: 'Test 2',
         schoolState: 'SC',
         schoolCountry: 'USA',
-        schoolEmailAddress: 'test@edu_sample.com',
+        schoolEmailAddress: 'user@school.edu',
         schoolStudentId: '01010101',
         isActiveDuty: true,
         veteranAddress: {

spec/lib/va_notify/notification_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) }