From 3c45da517b4303ddd77139e2552e31e85e301475 Mon Sep 17 00:00:00 2001 From: Rebecca Tolmach <10993987+rmtolmach@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:57:10 -0400 Subject: [PATCH 01/27] don't retry specs (#18520) --- .github/workflows/code_checks.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml index f09f68ce39..2c333da3b6 100644 --- a/.github/workflows/code_checks.yml +++ b/.github/workflows/code_checks.yml @@ -135,14 +135,9 @@ jobs: - name: Run Specs timeout-minutes: 20 - uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0 - with: - timeout_minutes: 20 - retry_wait_seconds: 3 # Seconds - max_attempts: 3 - command: | - docker compose -f docker-compose.test.yml run web bash \ - -c "CI=true DISABLE_BOOTSNAP=true bundle exec parallel_rspec spec/ modules/ -n 13 -o '--color --tty'" + run: | + docker compose -f docker-compose.test.yml run web bash \ + -c "CI=true DISABLE_BOOTSNAP=true bundle exec parallel_rspec spec/ modules/ -n 13 -o '--color --tty'" - name: Upload Coverage Report uses: actions/upload-artifact@v4 From 27dc0fefa04da37fe5b398272df5d22d617a6516 Mon Sep 17 00:00:00 2001 From: Rachal Cassity Date: Thu, 19 Sep 2024 13:42:20 -0500 Subject: [PATCH 02/27] Revert ContactInfoRedis spec (#18526) --- .../contact_information_spec.rb | 130 ++++++------------ 1 file changed, 41 insertions(+), 89 deletions(-) diff --git a/spec/models/va_profile_redis/contact_information_spec.rb b/spec/models/va_profile_redis/contact_information_spec.rb index d6b39a0382..9d61595bd7 100644 --- a/spec/models/va_profile_redis/contact_information_spec.rb +++ b/spec/models/va_profile_redis/contact_information_spec.rb @@ -4,38 +4,14 @@ describe VAProfileRedis::ContactInformation do let(:user) { build :user, :loa3 } - - let(:service) do - if Flipper.enabled?(:va_v3_contact_information_service) - VAProfile::V2::ContactInformation::Service - else - VAProfile::ContactInformation::Service - end - end - - let(:contact_person_response) do - if Flipper.enabled?(:va_v3_contact_information_service) - VAProfile::V2::ContactInformation::PersonResponse - else - VAProfile::ContactInformation::PersonResponse - end - end - - let(:contact_info) { VAProfileRedis::ContactInformation.for_user(user) } - - let(:person) do - if Flipper.enabled?(:va_v3_contact_information_service) - build :person_v2, telephones: - else - build :person, telephones:, permissions: - end - end - + Flipper.disable(:va_v3_contact_information_service) let(:person_response) do raw_response = OpenStruct.new(status: 200, body: { 'bio' => person.to_hash }) - contact_person_response.from(raw_response) - end + VAProfile::ContactInformation::PersonResponse.from(raw_response) + end + let(:contact_info) { VAProfileRedis::ContactInformation.for_user(user) } + let(:person) { build :person, telephones:, permissions: } let(:telephones) do [ build(:telephone), @@ -61,12 +37,13 @@ before do allow(VAProfile::Configuration::SETTINGS.contact_information).to receive(:cache_enabled).and_return(true) - double_service = double - allow(service).to receive(:new).with(user).and_return(double_service) - expect(double_service).to receive(:get_person).public_send( + + service = double + allow(VAProfile::ContactInformation::Service).to receive(:new).with(user).and_return(service) + expect(service).to receive(:get_person).public_send( get_person_calls ).and_return( - contact_person_response.new(status, person: nil) + VAProfile::ContactInformation::PersonResponse.new(status, person: nil) ) end @@ -98,13 +75,13 @@ context 'when the cache is empty' do it 'caches and return the response', :aggregate_failures do allow_any_instance_of( - service + VAProfile::ContactInformation::Service ).to receive(:get_person).and_return(person_response) if VAProfile::Configuration::SETTINGS.contact_information.cache_enabled expect(contact_info.redis_namespace).to receive(:set).once end - expect_any_instance_of(service).to receive(:get_person).twice + expect_any_instance_of(VAProfile::ContactInformation::Service).to receive(:get_person).twice expect(contact_info.status).to eq 200 expect(contact_info.response.person).to have_deep_attributes(person) end @@ -114,7 +91,7 @@ it 'returns the cached data', :aggregate_failures do contact_info.cache(user.uuid, person_response) - expect_any_instance_of(service).not_to receive(:get_person) + expect_any_instance_of(VAProfile::ContactInformation::Service).not_to receive(:get_person) expect(contact_info.response.person).to have_deep_attributes(person) end end @@ -125,7 +102,7 @@ before do allow(VAProfile::Models::Person).to receive(:build_from).and_return(person) allow_any_instance_of( - service + VAProfile::ContactInformation::Service ).to receive(:get_person).and_return(person_response) end @@ -136,41 +113,21 @@ end end - unless Flipper.enabled?(:va_v3_contact_information_service) - describe '#residential_address' do - it 'returns the users residential address object', :aggregate_failures do - residence = address_for VAProfile::Models::Address::RESIDENCE - - expect(contact_info.residential_address).to eq residence - expect(contact_info.residential_address.class).to eq VAProfile::Models::Address - end - end - - describe '#mailing_address' do - it 'returns the users mailing address object', :aggregate_failures do - residence = address_for VAProfile::Models::Address::CORRESPONDENCE + describe '#residential_address' do + it 'returns the users residential address object', :aggregate_failures do + residence = address_for VAProfile::Models::Address::RESIDENCE - expect(contact_info.mailing_address).to eq residence - expect(contact_info.mailing_address.class).to eq VAProfile::Models::Address - end + expect(contact_info.residential_address).to eq residence + expect(contact_info.residential_address.class).to eq VAProfile::Models::Address end end - if Flipper.enabled?(:va_v3_contact_information_service) - describe '#residential_address' do - it 'returns the users residential address object', :aggregate_failures do - residence = address_for VAProfile::Models::V2::Address::RESIDENCE - expect(contact_info.residential_address).to eq residence - # expect(contact_info.residential_address.class).to eq VAProfile::Models::V2::Address - end - end - describe '#mailing_address' do - it 'returns the users mailing address object', :aggregate_failures do - residence = address_for VAProfile::Models::V2::Address::CORRESPONDENCE + describe '#mailing_address' do + it 'returns the users mailing address object', :aggregate_failures do + residence = address_for VAProfile::Models::Address::CORRESPONDENCE - expect(contact_info.mailing_address).to eq residence - # expect(contact_info.mailing_address.class).to eq VAProfile::Models::V2::Address - end + expect(contact_info.mailing_address).to eq residence + expect(contact_info.mailing_address.class).to eq VAProfile::Models::Address end end @@ -213,26 +170,25 @@ describe '#fax_number' do it 'returns the users FAX object', :aggregate_failures do phone = phone_for VAProfile::Models::Telephone::FAX + expect(contact_info.fax_number).to eq phone expect(contact_info.fax_number.class).to eq VAProfile::Models::Telephone end end - unless Flipper.enabled?(:va_v3_contact_information_service) - describe '#text_permission' do - it 'returns the users text permission object', :aggregate_failures do - permission = permission_for VAProfile::Models::Permission::TEXT + describe '#text_permission' do + it 'returns the users text permission object', :aggregate_failures do + permission = permission_for VAProfile::Models::Permission::TEXT - expect(contact_info.text_permission).to eq permission - expect(contact_info.text_permission.class).to eq VAProfile::Models::Permission - end + expect(contact_info.text_permission).to eq permission + expect(contact_info.text_permission.class).to eq VAProfile::Models::Permission end end end context 'with an error response' do before do - allow_any_instance_of(service).to receive(:get_person).and_raise( + allow_any_instance_of(VAProfile::ContactInformation::Service).to receive(:get_person).and_raise( Common::Exceptions::BackendServiceException ) end @@ -301,13 +257,11 @@ end end - unless Flipper.enabled?(:va_v3_contact_information_service) - describe '#text_permission' do - it 'raises a Common::Exceptions::BackendServiceException error' do - expect { contact_info.text_permission }.to raise_error( - Common::Exceptions::BackendServiceException - ) - end + describe '#text_permission' do + it 'raises a Common::Exceptions::BackendServiceException error' do + expect { contact_info.text_permission }.to raise_error( + Common::Exceptions::BackendServiceException + ) end end end @@ -316,13 +270,13 @@ let(:empty_response) do raw_response = OpenStruct.new(status: 500, body: nil) - contact_person_response.from(raw_response) + VAProfile::ContactInformation::PersonResponse.from(raw_response) end before do allow(VAProfile::Models::Person).to receive(:build_from).and_return(nil) allow_any_instance_of( - service + VAProfile::ContactInformation::Service ).to receive(:get_person).and_return(empty_response) end @@ -374,11 +328,9 @@ end end - unless Flipper.enabled?(:va_v3_contact_information_service) - describe '#text_permission' do - it 'returns nil' do - expect(contact_info.text_permission).to be_nil - end + describe '#text_permission' do + it 'returns nil' do + expect(contact_info.text_permission).to be_nil end end end From 0a759a030d310cb1613389b3671cf3fa731ce0b6 Mon Sep 17 00:00:00 2001 From: Richard Davis Date: Thu, 19 Sep 2024 15:38:24 -0400 Subject: [PATCH 03/27] Removes unused code for intergrating with the VA Profile Health Benefit Service (#18503) --- .github/CODEOWNERS | 5 -- config/initializers/breakers.rb | 2 - config/settings.yml | 2 - .../associated_persons_response.rb | 21 ------ .../health_benefit/configuration.rb | 21 ------ lib/va_profile/health_benefit/service.rb | 68 ------------------ .../health_benefit_v1_associated_persons.json | 71 ------------------- .../va_profile/health_benefit/service_spec.rb | 57 --------------- 8 files changed, 247 deletions(-) delete mode 100644 lib/va_profile/health_benefit/associated_persons_response.rb delete mode 100644 lib/va_profile/health_benefit/configuration.rb delete mode 100644 lib/va_profile/health_benefit/service.rb delete mode 100644 spec/fixtures/va_profile/health_benefit_v1_associated_persons.json delete mode 100644 spec/lib/va_profile/health_benefit/service_spec.rb diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index dd8bb20699..536bfee49a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2106,15 +2106,10 @@ app/controllers/v0/profile/contacts_controller.rb @department-of-veterans-affair app/serializers/contact_serializer.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/swagger/swagger/requests/profile.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/swagger/swagger/schemas/contacts.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group -lib/va_profile/health_benefit/associated_persons_response.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group -lib/va_profile/health_benefit/configuration.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group -lib/va_profile/health_benefit/service.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group lib/va_profile/models/associated_person.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group lib/va_profile/profile/v3/health_benefit_bio_response.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group lib/va_profile/profile/v3/service.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group spec/controllers/v0/profile/contacts_controller_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group -spec/fixtures/va_profile/health_benefit_v1_associated_persons.json @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group -spec/lib/va_profile/health_benefit/service_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group spec/lib/va_profile/profile/v3/service_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group lib/logging/third_party_transaction.rb @department-of-veterans-affairs/backend-review-group spec/lib/logging/third_party_transaction_spec.rb @department-of-veterans-affairs/backend-review-group diff --git a/config/initializers/breakers.rb b/config/initializers/breakers.rb index b479598875..998e6cc1f2 100644 --- a/config/initializers/breakers.rb +++ b/config/initializers/breakers.rb @@ -33,7 +33,6 @@ require 'va_profile/v2/contact_information/configuration' require 'va_profile/communication/configuration' require 'va_profile/demographics/configuration' -require 'va_profile/health_benefit/configuration' require 'va_profile/military_personnel/configuration' require 'va_profile/veteran_status/configuration' require 'iam_ssoe_oauth/configuration' @@ -71,7 +70,6 @@ VAProfile::V2::ContactInformation::Configuration.instance.breakers_service, VAProfile::Communication::Configuration.instance.breakers_service, VAProfile::Demographics::Configuration.instance.breakers_service, - VAProfile::HealthBenefit::Configuration.instance.breakers_service, VAProfile::MilitaryPersonnel::Configuration.instance.breakers_service, VAProfile::VeteranStatus::Configuration.instance.breakers_service, Search::Configuration.instance.breakers_service, diff --git a/config/settings.yml b/config/settings.yml index 4ab3960804..1cc10b7c9b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -282,8 +282,6 @@ vet360: address_validation: hostname: "sandbox-api.va.gov" api_key: "" - health_benefit: - mock: true profile_information: enabled: true timeout: 30 diff --git a/lib/va_profile/health_benefit/associated_persons_response.rb b/lib/va_profile/health_benefit/associated_persons_response.rb deleted file mode 100644 index 325525894a..0000000000 --- a/lib/va_profile/health_benefit/associated_persons_response.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -require 'va_profile/response' -require 'va_profile/models/associated_person' -require 'va_profile/models/message' - -module VAProfile - module HealthBenefit - class AssociatedPersonsResponse < VAProfile::Response - attribute :associated_persons, Array[VAProfile::Models::AssociatedPerson] - attribute :messages, Array[VAProfile::Models::Message] - - def initialize(response) - resource = JSON.parse(response.body) - associated_persons = resource['associated_persons'] - messages = resource['messages'] - super(response.status, { associated_persons:, messages: }) - end - end - end -end diff --git a/lib/va_profile/health_benefit/configuration.rb b/lib/va_profile/health_benefit/configuration.rb deleted file mode 100644 index 55a3631d43..0000000000 --- a/lib/va_profile/health_benefit/configuration.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -require 'va_profile/configuration' - -module VAProfile - module HealthBenefit - class Configuration < VAProfile::Configuration - def base_path - "#{Settings.vet360.url}/health-benefit/health-benefit" - end - - def service_name - 'VAProfile/HealhtBenefit' - end - - def mock_enabled? - Settings.vet360&.health_benefit&.mock || false - end - end - end -end diff --git a/lib/va_profile/health_benefit/service.rb b/lib/va_profile/health_benefit/service.rb deleted file mode 100644 index 04ad3c5a55..0000000000 --- a/lib/va_profile/health_benefit/service.rb +++ /dev/null @@ -1,68 +0,0 @@ -# frozen_string_literal: true - -require 'common/client/concerns/monitoring' -require 'va_profile/health_benefit/configuration' -require 'va_profile/health_benefit/associated_persons_response' -require 'va_profile/models/associated_person' -require 'va_profile/stats' - -module VAProfile - module HealthBenefit - class Service < VAProfile::Service - include Common::Client::Concerns::Monitoring - - STATSD_KEY_PREFIX = "#{VAProfile::Service::STATSD_KEY_PREFIX}.health_benefit".freeze - configuration VAProfile::HealthBenefit::Configuration - - OID = '1.2.3' # placeholder - - attr_reader :user - - def get_associated_persons - return mock_get_associated_persons if config.mock_enabled? - - with_monitoring do - response = perform(:get, v1_read_path) - VAProfile::HealthBenefit::AssociatedPersonsResponse.new(response) - end - rescue => e - handle_error(e) - end - - def mock_get_associated_persons - fixture_path = %w[spec fixtures va_profile health_benefit_v1_associated_persons.json] - body = Rails.root.join(*fixture_path).read - response = OpenStruct.new(status: 200, body:) - VAProfile::HealthBenefit::AssociatedPersonsResponse.new(response) - end - - private - - ID_ME_AAID = '^PN^200VIDM^USDVA' - LOGIN_GOV_AAID = '^PN^200VLGN^USDVA' - - def csp_id - user&.idme_uuid || user&.logingov_uuid - end - - def aaid - return ID_ME_AAID if user&.idme_uuid.present? - - LOGIN_GOV_AAID if user&.logingov_uuid.present? - end - - def id_with_aaid - "#{csp_id}#{aaid}" - end - - def identity_path - encoded_id_with_aaid = ERB::Util.url_encode(id_with_aaid) - "#{OID}/#{encoded_id_with_aaid}" - end - - def v1_read_path - "#{config.base_path}/v1/#{identity_path}/read" - end - end - end -end diff --git a/spec/fixtures/va_profile/health_benefit_v1_associated_persons.json b/spec/fixtures/va_profile/health_benefit_v1_associated_persons.json deleted file mode 100644 index 3331a8f328..0000000000 --- a/spec/fixtures/va_profile/health_benefit_v1_associated_persons.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "messages": [ - { - "code": "string", - "key": "string", - "text": "string", - "severity": "info", - "potentially_self_correcting_on_retry": true - } - ], - "associated_persons": [ - { - "create_date": "2023-09-07T13:00:00.001Z", - "update_date": "2023-09-07T13:00:00.001Z", - "tx_audit_id": "dbbf9a58-41e5-40c0-bdb5-fc1407aa1f05", - "source_system": "string", - "source_date": "2023-09-07T13:00:00.001Z", - "originating_source_system": "string", - "source_system_user": "string", - "contact_type": "Emergency Contact", - "prefix": "string", - "given_name": "Sam", - "middle_name": "string", - "family_name": "Smith", - "suffix": "string", - "relationship": "string", - "address_line1": "string", - "address_line2": "string", - "address_line3": "string", - "city": "string", - "state": "string", - "zip_code": "string", - "zip_plus4": "string", - "postal_code": "string", - "province_code": "string", - "country": "string", - "primary_phone": "321-555-1111", - "alternate_phone": "string", - "effective_end_date": "2023-09-07T13:00:00.001Z" - }, - { - "create_date": "2023-09-07T13:00:00.001Z", - "update_date": "2023-09-07T13:00:00.001Z", - "tx_audit_id": "040fb2e0-9d60-45ef-a5a9-18beda8c3dd3", - "source_system": "string", - "source_date": "2023-09-07T13:00:00.001Z", - "originating_source_system": "string", - "source_system_user": "string", - "contact_type": "Primary Next of Kin", - "prefix": "string", - "given_name": "Paul", - "middle_name": "string", - "family_name": "Revere", - "suffix": "string", - "relationship": "Brother/Sibling", - "address_line1": "19 N Square", - "address_line2": "Apt 2", - "address_line3": "", - "city": "Boston", - "state": "MA", - "zip_code": "02113", - "zip_plus4": "string", - "postal_code": "string", - "province_code": "string", - "country": "string", - "primary_phone": "321-555-1212", - "alternate_phone": "string", - "effective_end_date": "2023-09-07T13:00:00.001Z" - } - ] -} diff --git a/spec/lib/va_profile/health_benefit/service_spec.rb b/spec/lib/va_profile/health_benefit/service_spec.rb deleted file mode 100644 index 09b506aae3..0000000000 --- a/spec/lib/va_profile/health_benefit/service_spec.rb +++ /dev/null @@ -1,57 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' -require 'va_profile/health_benefit/service' -require 'va_profile/health_benefit/configuration' -require 'va_profile/health_benefit/associated_persons_response' -require 'va_profile/models/associated_person' - -describe VAProfile::HealthBenefit::Service do - let(:user) { build(:user, :loa3) } - let(:idme_uuid) { SecureRandom.uuid } - let(:service) { described_class.new(user) } - let(:fixture_path) { %w[spec fixtures va_profile health_benefit_v1_associated_persons.json] } - let(:response_body) { Rails.root.join(*fixture_path).read } - - before do - allow(user).to receive(:idme_uuid).and_return(idme_uuid) - end - - around do |example| - # using webmock & json fixtures instead of VCR until VA Profile API access is granted - VCR.turned_off do - # disable data mocking for the VA Profile Health Benefit API - with_settings(Settings.vet360.health_benefit, mock: false) do - example.run - end - end - end - - describe '#get_associated_persons' do - let(:resource) { service.send(:v1_read_path) } - - context 'when request is successful' do - it "returns an AssociatedPersonsResponse with status 'ok'" do - stub_request(:get, resource).to_return(body: response_body) - result = service.get_associated_persons - expect(result.ok?).to be(true) - expect(result).to be_a(VAProfile::HealthBenefit::AssociatedPersonsResponse) - expect(result.associated_persons.size).to eq(2) - end - end - - context 'when resource is not found' do - it 'raises a BackendServiceException' do - stub_request(:get, resource).to_return(status: 404) - expect { service.get_associated_persons }.to raise_error Common::Exceptions::BackendServiceException - end - end - - context 'when the service experiences an error' do - it 'raises a BackendServiceException' do - stub_request(:get, resource).to_return(status: 500) - expect { service.get_associated_persons }.to raise_error Common::Exceptions::BackendServiceException - end - end - end -end From b0d48b74dbffee88d9b1fb1af20e81b4a8ea223e Mon Sep 17 00:00:00 2001 From: Gregg P <117232882+GcioGregg@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:14:20 -0700 Subject: [PATCH 04/27] Vebt 616 - VYE - fix verifications in the BDN egress by replacing ssn with td number (#18529) * template * fix to put that last 2 digits of ssn in the first 2 positions as per bdn reqs * remove unneeded comment --------- Co-authored-by: Vanson Samuel <37637+binq@users.noreply.github.com> Co-authored-by: nfstern02 Co-authored-by: nfstern02 <72567812+nfstern02@users.noreply.github.com> --- modules/vye/app/models/vye/user_info.rb | 7 ++++++ modules/vye/app/models/vye/verification.rb | 4 ++-- modules/vye/spec/factories/vye/user_infos.rb | 23 +++++++++++++++++++ .../vye/spec/factories/vye/user_profiles.rb | 6 +++++ modules/vye/spec/models/vye/user_info_spec.rb | 16 +++++++++++++ .../vye/spec/models/vye/verification_spec.rb | 10 ++++++++ 6 files changed, 64 insertions(+), 2 deletions(-) diff --git a/modules/vye/app/models/vye/user_info.rb b/modules/vye/app/models/vye/user_info.rb index 56f21eccc5..b81dee180f 100644 --- a/modules/vye/app/models/vye/user_info.rb +++ b/modules/vye/app/models/vye/user_info.rb @@ -30,6 +30,13 @@ class Vye::UserInfo < ApplicationRecord presence: true ) + def td_number + return nil unless ssn + + ssn_str = ssn.rjust(9, '0') + (ssn_str[-2..] + ssn_str[0...-2]) + end + def backend_address = address_changes.backend.first def latest_address = address_changes.latest.first def zip_code = backend_address&.zip_code&.slice(0, 5) diff --git a/modules/vye/app/models/vye/verification.rb b/modules/vye/app/models/vye/verification.rb index 81cad758f2..e10cbfc487 100644 --- a/modules/vye/app/models/vye/verification.rb +++ b/modules/vye/app/models/vye/verification.rb @@ -30,7 +30,7 @@ def self.each_report_row yield({ stub_nm: user_info.stub_nm, - ssn: user_info.ssn, + td_number: user_info.td_number, transact_date: record.transact_date.strftime('%Y%m%d'), rpo_code: user_info.rpo_code, indicator: user_info.indicator, @@ -44,7 +44,7 @@ def self.each_report_row YAML.load(<<-END_OF_TEMPLATE).gsub(/\n/, '') |- %-7s - %-9s + %-9s %-8s %-3s %-1s diff --git a/modules/vye/spec/factories/vye/user_infos.rb b/modules/vye/spec/factories/vye/user_infos.rb index a14ec54f41..acbe2458d3 100644 --- a/modules/vye/spec/factories/vye/user_infos.rb +++ b/modules/vye/spec/factories/vye/user_infos.rb @@ -47,4 +47,27 @@ end end end + + factory :vye_user_info_td_number, class: 'Vye::UserInfo' do + association :bdn_clone, factory: :vye_bdn_clone + association :user_profile, factory: :vye_user_profile_td_number + + file_number { (1..9).map(&digit).join } + dob { Faker::Date.birthday } + stub_nm { format("#{Faker::Name.first_name[0, 1].upcase} #{Faker::Name.last_name[0, 3].upcase}") } + mr_status { 'A' } + rem_ent do + months = (36 * rand).floor + days = (rand * 100_000).floor + format('%02u%05u', months:, days:) + end + cert_issue_date { Faker::Date.between(from: 10.years.ago, to: 2.years.ago) } + del_date { Faker::Date.between(from: 4.months.since, to: 2.years.since) } + date_last_certified { Faker::Date.between(from: 3.months.ago, to: 5.days.ago) } + rpo_code { Faker::Number.number(digits: 4) } + fac_code { Faker::Lorem.word } + payment_amt { Faker::Number.decimal(l_digits: 4, r_digits: 2) } + indicator { 'A' } + bdn_clone_active { true } + end end diff --git a/modules/vye/spec/factories/vye/user_profiles.rb b/modules/vye/spec/factories/vye/user_profiles.rb index a4698304de..2bca3fddff 100644 --- a/modules/vye/spec/factories/vye/user_profiles.rb +++ b/modules/vye/spec/factories/vye/user_profiles.rb @@ -18,4 +18,10 @@ file_number { (1..9).map(&digit).join } icn { SecureRandom.uuid } end + + factory :vye_user_profile_td_number, class: 'Vye::UserProfile' do + ssn { '123456789' } + file_number { '123456789' } + icn { SecureRandom.uuid } + end end diff --git a/modules/vye/spec/models/vye/user_info_spec.rb b/modules/vye/spec/models/vye/user_info_spec.rb index 2322b74b93..c6d2ddb3b0 100644 --- a/modules/vye/spec/models/vye/user_info_spec.rb +++ b/modules/vye/spec/models/vye/user_info_spec.rb @@ -317,5 +317,21 @@ expect(pending_verifications.first.trace).to eq('case9') end end + + describe '#td_number' do + let(:mpi_profile) { double('MpiProfile') } + let!(:user_info) do + create(:vye_user_info_td_number) + end + + before do + allow(user_info).to receive(:mpi_profile).and_return(mpi_profile) + allow(mpi_profile).to receive(:ssn).and_return('123456789') + end + + it 'moves the last two digits of the ssn to the front' do + expect(user_info.td_number).to eq('891234567') + end + end end end diff --git a/modules/vye/spec/models/vye/verification_spec.rb b/modules/vye/spec/models/vye/verification_spec.rb index 90eec30158..3d31b80347 100644 --- a/modules/vye/spec/models/vye/verification_spec.rb +++ b/modules/vye/spec/models/vye/verification_spec.rb @@ -52,5 +52,15 @@ expect(stub_nm_list.all? { |x| x.start_with?(/\S/) }).to be(true) end + + it 'writes out the ssn with the last 2 digits in front of the first 7' do + io = StringIO.new + + described_class.write_report(io) + + stub_td_list = io.string.split(/[\n]/).map { |x| x.slice(7, 9) }.flatten + + expect(stub_td_list.all? { |x| x.eql?('891234567') }).to be(true) + end end end From b818f92bfe34ccbc374db9feb0f26b2fa329481f Mon Sep 17 00:00:00 2001 From: Jacob Penner <161746194+pennja@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:37:26 -0400 Subject: [PATCH 05/27] skip flaky tests (#18535) --- .../spec/services/s3/submission_archive_builder_spec.rb | 2 +- .../spec/services/s3/submission_archiver_spec.rb | 2 +- .../spec/services/s3/submission_builder_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/simple_forms_api/spec/services/s3/submission_archive_builder_spec.rb b/modules/simple_forms_api/spec/services/s3/submission_archive_builder_spec.rb index ed583f1f8f..da95d50aef 100644 --- a/modules/simple_forms_api/spec/services/s3/submission_archive_builder_spec.rb +++ b/modules/simple_forms_api/spec/services/s3/submission_archive_builder_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' require SimpleFormsApi::Engine.root.join('spec', 'spec_helper.rb') -RSpec.describe SimpleFormsApi::S3::SubmissionArchiveBuilder do +RSpec.describe SimpleFormsApi::S3::SubmissionArchiveBuilder, skip: 'These are flaky, need to be fixed.' do let(:form_id) { '21-10210' } let(:form_data) { File.read("modules/simple_forms_api/spec/fixtures/form_json/vba_#{form_id.gsub('-', '_')}.json") } let(:submission) { create(:form_submission, :pending, form_type: form_id, form_data:) } diff --git a/modules/simple_forms_api/spec/services/s3/submission_archiver_spec.rb b/modules/simple_forms_api/spec/services/s3/submission_archiver_spec.rb index 12eae8c98c..fbacafe57c 100644 --- a/modules/simple_forms_api/spec/services/s3/submission_archiver_spec.rb +++ b/modules/simple_forms_api/spec/services/s3/submission_archiver_spec.rb @@ -4,7 +4,7 @@ require SimpleFormsApi::Engine.root.join('spec', 'spec_helper.rb') # rubocop:disable RSpec/SubjectStub -RSpec.describe SimpleFormsApi::S3::SubmissionArchiver do +RSpec.describe SimpleFormsApi::S3::SubmissionArchiver, skip: 'These are flaky, need to be fixed.' do let(:form_type) { '21-10210' } let(:form_data) { File.read("modules/simple_forms_api/spec/fixtures/form_json/vba_#{form_type.gsub('-', '_')}.json") } let(:submission) { create(:form_submission, :pending, form_type:, form_data:) } diff --git a/modules/simple_forms_api/spec/services/s3/submission_builder_spec.rb b/modules/simple_forms_api/spec/services/s3/submission_builder_spec.rb index 6bd5ef4b03..2540a5cc54 100644 --- a/modules/simple_forms_api/spec/services/s3/submission_builder_spec.rb +++ b/modules/simple_forms_api/spec/services/s3/submission_builder_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' require SimpleFormsApi::Engine.root.join('spec', 'spec_helper.rb') -RSpec.describe SimpleFormsApi::S3::SubmissionBuilder do +RSpec.describe SimpleFormsApi::S3::SubmissionBuilder, skip: 'These are flaky, need to be fixed.' do let(:form_type) { '21-10210' } let(:form_doc) { "vba_#{form_type.gsub('-', '_')}.json" } let(:form_data) do From 64bbc65411644732a63aacf75ba7c278c161bfd9 Mon Sep 17 00:00:00 2001 From: Wayne Weibel Date: Fri, 20 Sep 2024 09:11:11 -0400 Subject: [PATCH 06/27] Pension 93186 Remediation Report Updates (#18522) --- .../benefits_intake_remediation_status_job.rb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/sidekiq/benefits_intake_remediation_status_job.rb b/app/sidekiq/benefits_intake_remediation_status_job.rb index 3d7c304ab5..f92a317b62 100644 --- a/app/sidekiq/benefits_intake_remediation_status_job.rb +++ b/app/sidekiq/benefits_intake_remediation_status_job.rb @@ -24,12 +24,15 @@ def initialize(batch_size: BATCH_SIZE) # search all submissions for outstanding failures # poll LH endpoint to see if status has changed (case if endpoint had an error initially) # report stats on submissions, grouped by form-type - def perform + def perform(form_id = nil) Rails.logger.info('BenefitsIntakeRemediationStatusJob started') form_submissions = FormSubmission.includes(:form_submission_attempts) failures = outstanding_failures(form_submissions.all) + @form_id = form_id + failures.select! { |f| f.form_type == form_id } if form_id + batch_process(failures) unless failures.empty? submission_audit @@ -39,7 +42,7 @@ def perform private - attr_reader :batch_size, :total_handled + attr_reader :batch_size, :total_handled, :form_id # determine if a claim has an outstanding failure # each claim can have multiple FormSubmission, which can have multiple FormSubmissionAttempt @@ -118,10 +121,12 @@ def submission_audit form_submissions = FormSubmission.includes(:form_submission_attempts) form_submission_groups = form_submissions.all.group_by(&:form_type) - form_submission_groups.each do |form_id, submissions| + form_submission_groups.each do |form_type, submissions| + next if form_id && form_id != form_type + fs_saved_claim_ids = submissions.map(&:saved_claim_id).uniq - claims = SavedClaim.where(form_id:).where('id >= ?', fs_saved_claim_ids.min) + claims = SavedClaim.where(form_id: form_type).where('id >= ?', fs_saved_claim_ids.min) claim_ids = claims.map(&:id).uniq unsubmitted = claim_ids - fs_saved_claim_ids @@ -133,9 +138,9 @@ def submission_audit { claim_id: fs.saved_claim_id, uuid: fs.benefits_intake_uuid, error_message: last_attempt.error_message } end - StatsD.set("#{STATS_KEY}.#{form_id}.unsubmitted_claims", unsubmitted.length) - StatsD.set("#{STATS_KEY}.#{form_id}.orphaned_submissions", orphaned.length) - StatsD.set("#{STATS_KEY}.#{form_id}.outstanding_failures", failures.length) + StatsD.gauge("#{STATS_KEY}.unsubmitted_claims", unsubmitted.length, tags: ["form_id:#{form_type}"]) + StatsD.gauge("#{STATS_KEY}.orphaned_submissions", orphaned.length, tags: ["form_id:#{form_type}"]) + StatsD.gauge("#{STATS_KEY}.outstanding_failures", failures.length, tags: ["form_id:#{form_type}"]) Rails.logger.info("BenefitsIntakeRemediationStatusJob submission audit #{form_id}", form_id:, unsubmitted:, orphaned:, failures:) end From a69d979ad88606d4e4f49a3e41d3d15b6a04513c Mon Sep 17 00:00:00 2001 From: Isaac Gallup <142249919+IGallupSoCo@users.noreply.github.com> Date: Fri, 20 Sep 2024 10:51:28 -0500 Subject: [PATCH 07/27] Helm test postman docker image (#18536) * initial dockerfile * docker image that successfully runs Newman with the collection * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * removing authenticated endpoint tests * build Docker image, publish and set up postman test job * file and directory reorgainzation * fixed missing empty line * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * build Docker image, publish and set up postman test job * postman test * replaced collection after removing flaky endpoints * postman test * change to Preview Environment service URL * Adjust codeowners --------- Co-authored-by: patrick-black-oddball Co-authored-by: pjhill <52456633+pjhill@users.noreply.github.com> --- .github/CODEOWNERS | 3 +- .github/workflows/build-and-publish.yaml | 12 +- .github/workflows/build.yml | 13 +- .../vets-api/templates/postman-test.yaml | 16 ++ helmCharts/vets-api/values.yaml | 1 + postman/Dockerfile | 9 + .../vets-api.pm-collection.json | 250 +----------------- 7 files changed, 51 insertions(+), 253 deletions(-) create mode 100644 helmCharts/vets-api/templates/postman-test.yaml create mode 100644 postman/Dockerfile rename vets-api.pm-collection.json => postman/vets-api.pm-collection.json (80%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 536bfee49a..4aed040782 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2126,4 +2126,5 @@ README.md @department-of-veterans-affairs/backend-review-group modules/accredited_representative_portal/spec/services/accredited_representative_portal/representative_user_loader_spec.rb @department-of-veterans-affairs/octo-identity modules/accredited_representative_portal/app/services/accredited_representative_portal/representative_user_loader.rb @department-of-veterans-affairs/octo-identity config/form_profile_mappings/FORM-MOCK-AE-DESIGN-PATTERNS.yml @department-of-veterans-affairs/tmf-auth-exp-design-patterns @department-of-veterans-affairs/backend-review-group -vets-api.pm-collection.json @department-of-veterans-affairs/backend-review-group +postman/vets-api.pm-collection.json @department-of-veterans-affairs/backend-review-group +postman/Dockerfile @department-of-veterans-affairs/backend-review-group diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml index 296cf3f273..70dfa19411 100644 --- a/.github/workflows/build-and-publish.yaml +++ b/.github/workflows/build-and-publish.yaml @@ -33,7 +33,17 @@ jobs: uses: aws-actions/amazon-ecr-login@v2.0.1 with: mask-password: true - - name: Build Docker Image + - name: Build Postman Image + uses: docker/build-push-action@v6 + env: + DOCKER_BUILD_SUMMARY: false + with: + context: ./postman + file: ./postman/Dockerfile + push: true + tags: | + ${{ steps.ecr-login.outputs.registry }}/dsva/vets-api-postman:${{ steps.version.outputs.version }} + - name: Build vets-api Docker Image uses: docker/build-push-action@v6 env: DOCKER_BUILD_SUMMARY: false diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 452b541e5f..8d2e829b59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,8 +30,17 @@ jobs: - name: Login to ECR id: login-ecr uses: aws-actions/amazon-ecr-login@v2 - - - name: Build Docker Image + - name: Build Postman Docker Image + uses: docker/build-push-action@v6 + env: + DOCKER_BUILD_SUMMARY: false + with: + context: ./postman + file: ./postman/Dockerfile + push: true + tags: | + ${{ steps.login-ecr.outputs.registry }}/dsva/vets-api-postman:${{ github.sha }} + - name: Build vets-api Docker Image uses: docker/build-push-action@v6 env: DOCKER_BUILD_SUMMARY: false diff --git a/helmCharts/vets-api/templates/postman-test.yaml b/helmCharts/vets-api/templates/postman-test.yaml new file mode 100644 index 0000000000..cad4b6ebae --- /dev/null +++ b/helmCharts/vets-api/templates/postman-test.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "vets-api-postman-test" + annotations: + "helm.sh/hook": post-install,post-upgrade,test +spec: + containers: + - name: postman + image: "{{ .Values.image.testRepository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: "API_URL" + value: "http://vets-api-service" + restartPolicy: Never + \ No newline at end of file diff --git a/helmCharts/vets-api/values.yaml b/helmCharts/vets-api/values.yaml index 0a15f72668..c4e5e9c448 100644 --- a/helmCharts/vets-api/values.yaml +++ b/helmCharts/vets-api/values.yaml @@ -3,5 +3,6 @@ replicaCount: 1 image: repository: 008577686731.dkr.ecr.us-gov-west-1.amazonaws.com/dsva/preview-environment/vets-api + testRepository: 008577686731.dkr.ecr.us-gov-west-1.amazonaws.com/dsva/vets-api-postman pullPolicy: IfNotPresent tag: "0.0.1" diff --git a/postman/Dockerfile b/postman/Dockerfile new file mode 100644 index 0000000000..53538a6d59 --- /dev/null +++ b/postman/Dockerfile @@ -0,0 +1,9 @@ +FROM postman/newman:alpine + +ENV API_URL=http://localhost:3000/ + +WORKDIR /etc/newman + +COPY vets-api.pm-collection.json vets-api.pm-collection.json + +ENTRYPOINT newman run vets-api.pm-collection.json --env-var envUnderTest=$API_URL diff --git a/vets-api.pm-collection.json b/postman/vets-api.pm-collection.json similarity index 80% rename from vets-api.pm-collection.json rename to postman/vets-api.pm-collection.json index 065e8a37d9..036eba50d0 100644 --- a/vets-api.pm-collection.json +++ b/postman/vets-api.pm-collection.json @@ -683,173 +683,6 @@ }, "response": [] }, - { - "name": "/services/fhir/v01/r4/metadata", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Response status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Response has the expected schema\", function () {", - " const responseData = pm.response.json();", - "", - " pm.expect(responseData).to.be.an('object');", - " pm.expect(responseData).to.have.property('resourceType');", - " pm.expect(responseData).to.have.property('id');", - " pm.expect(responseData).to.have.property('version');", - " pm.expect(responseData).to.have.property('name');", - " pm.expect(responseData).to.have.property('status');", - " pm.expect(responseData).to.have.property('date');", - " pm.expect(responseData).to.have.property('publisher');", - " pm.expect(responseData).to.have.property('contact');", - " pm.expect(responseData).to.have.property('description');", - " pm.expect(responseData).to.have.property('kind');", - " pm.expect(responseData).to.have.property('instantiates');", - " pm.expect(responseData).to.have.property('software');", - " pm.expect(responseData).to.have.property('implementation');", - " pm.expect(responseData).to.have.property('fhirVersion');", - " pm.expect(responseData).to.have.property('format');", - " pm.expect(responseData).to.have.property('rest');", - "", - "});", - "" - ], - "type": "text/javascript", - "packages": {} - } - } - ], - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "{{vets_api_env}}/services/fhir/v0/r4/metadata", - "host": [ - "{{vets_api_env}}" - ], - "path": [ - "services", - "fhir", - "v0", - "r4", - "metadata" - ] - } - }, - "response": [] - }, - { - "name": "/services/fhir/v01/r4/openapi", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Response status code is 200\", function () {", - " pm.response.to.have.status(404);", - "});", - "", - "pm.test(\"Response has the expected schema\", function () {", - " const responseData = pm.response.json();", - "", - " pm.expect(responseData).to.be.an('object');", - "", - "});", - "" - ], - "type": "text/javascript", - "packages": {} - } - } - ], - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "{{vets_api_env}}/services/fhir/v0/r4/openapi", - "host": [ - "{{vets_api_env}}" - ], - "path": [ - "services", - "fhir", - "v0", - "r4", - "openapi" - ] - } - }, - "response": [] - }, - { - "name": "/services/fhir/v0/dstu2/metadata", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Response status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Response has the expected schema\", function () {", - " const responseData = pm.response.json();", - "", - " pm.expect(responseData).to.be.an('object');", - " pm.expect(responseData).to.have.property('resourceType');", - " pm.expect(responseData).to.have.property('id');", - " pm.expect(responseData).to.have.property('version');", - " pm.expect(responseData).to.have.property('name');", - " pm.expect(responseData).to.have.property('publisher');", - " pm.expect(responseData).to.have.property('contact');", - " pm.expect(responseData).to.have.property('date');", - " pm.expect(responseData).to.have.property('description');", - " pm.expect(responseData).to.have.property('kind');", - " pm.expect(responseData).to.have.property('software');", - " pm.expect(responseData).to.have.property('fhirVersion');", - " pm.expect(responseData).to.have.property('acceptUnknown');", - " pm.expect(responseData).to.have.property('format');", - " pm.expect(responseData).to.have.property('rest');", - "", - "});", - "", - "pm.test(\"Verify values are as expected\", function () {", - " const responseData = pm.response.json();", - "", - " pm.expect(responseData.contact[0].name).to.eql('API Support');", - " pm.expect(responseData.contact[0].telecom[0].system).to.eql('email');", - " pm.expect(responseData.contact[0].telecom[0].value).to.eql('api@va.gov');", - "});", - "" - ], - "type": "text/javascript", - "packages": {} - } - } - ], - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "{{vets_api_env}}/services/fhir/v0/dstu2/metadata", - "host": [ - "{{vets_api_env}}" - ], - "path": [ - "services", - "fhir", - "v0", - "dstu2", - "metadata" - ] - } - }, - "response": [] - }, { "name": "/services/address_validation/healthcheck", "event": [ @@ -900,87 +733,6 @@ }, "response": [] }, - { - "name": "/services/fhir/v0/dstu2/openapi", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "{{vets_api_env}}/services/fhir/v0/dstu2/openapi", - "host": [ - "{{vets_api_env}}" - ], - "path": [ - "services", - "fhir", - "v0", - "dstu2", - "openapi" - ] - } - }, - "response": [] - }, - { - "name": "/services/fhir/v0/argonaut/data-query/openapi", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Response status code is 200\", function () {", - " pm.expect(pm.response.code).to.equal(200);", - "});", - "", - "", - "pm.test(\"Response has the required schema\", function () {", - " const responseData = pm.response.json();", - " ", - " pm.expect(responseData).to.be.an('object');", - " pm.expect(responseData.message).to.exist.and.to.be.a('string');", - "});", - "", - "", - "pm.test(\"Message field is present in the response\", function () {", - " const responseData = pm.response.json();", - " pm.expect(responseData.message).to.exist;", - "});", - "", - "", - "pm.test(\"Message field is a non-empty string\", function () {", - " const responseData = pm.response.json();", - " ", - " pm.expect(responseData).to.be.an('object');", - " pm.expect(responseData.message).to.be.a('string').and.to.have.lengthOf.at.least(1, \"Message should be a non-empty string\");", - "});", - "" - ], - "type": "text/javascript", - "packages": {} - } - } - ], - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "{{vets_api_env}}/services/fhir/v0/argonaut/data-query/openapi/", - "host": [ - "{{vets_api_env}}" - ], - "path": [ - "services", - "fhir", - "v0", - "argonaut", - "data-query", - "openapi", - "" - ] - } - }, - "response": [] - }, { "name": "/services/appeals/v0/upstream_healthcheck", "event": [ @@ -1423,4 +1175,4 @@ "type": "string" } ] -} +} \ No newline at end of file From 94e7188fc8c0bc058f9da82eee4f972753a821ba Mon Sep 17 00:00:00 2001 From: Aurora <19178435+aurora-a-k-a-lightning@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:16:02 -0700 Subject: [PATCH 08/27] dbex/93079: uniqify multiple exposures (#18539) --- .../form526_to_lighthouse_transform.rb | 11 ++++++++ .../form526_to_lighthouse_transform_spec.rb | 27 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/lib/evss/disability_compensation_form/form526_to_lighthouse_transform.rb b/lib/evss/disability_compensation_form/form526_to_lighthouse_transform.rb index 2952d77410..222924e28c 100644 --- a/lib/evss/disability_compensation_form/form526_to_lighthouse_transform.rb +++ b/lib/evss/disability_compensation_form/form526_to_lighthouse_transform.rb @@ -291,6 +291,17 @@ def transform_toxic_exposure(toxic_exposure_source) # rubocop:disable Metrics/Me MULTIPLE_EXPOSURES_TYPE[:hazard]) end + # multiple exposures could have repeated values that LH will not accept in the primary path. + # remove them! + multiple_exposures.uniq! do |exposure| + [ + exposure.exposure_dates.begin_date, + exposure.exposure_dates.end_date, + exposure.exposure_location, + exposure.hazard_exposed_to + ] + end + toxic_exposure_target.multiple_exposures = multiple_exposures toxic_exposure_target diff --git a/spec/lib/evss/disability_compensation_form/form526_to_lighthouse_transform_spec.rb b/spec/lib/evss/disability_compensation_form/form526_to_lighthouse_transform_spec.rb index 86e29f9532..bd535a4a24 100644 --- a/spec/lib/evss/disability_compensation_form/form526_to_lighthouse_transform_spec.rb +++ b/spec/lib/evss/disability_compensation_form/form526_to_lighthouse_transform_spec.rb @@ -53,6 +53,33 @@ expect(result.toxic_exposure.multiple_exposures.class).to eq(Array) expect(result.claim_notes).to eq('some overflow text') end + + it 'sends uniq values in multiple exposures array' do + expect(transformer).to receive(:evss_claims_process_type) + .with(data['form526']) + .and_return('STANDARD_CLAIM_PROCESS') + # "airspace" is the repeated multiple exposure + data['form526']['toxicExposure'].merge!({ + 'gulfWar2001Details' => + { 'airspace' => { 'startDate' => '2014-01-26', + 'endDate' => '2014-02-28' }, + 'yemen' => { 'startDate' => '2014-01-26', + 'endDate' => '2014-02-28' }, + 'djibouti' => { 'startDate' => '2014-01-26', + 'endDate' => '2014-02-28' } }, + 'gulfWar2001' => { 'djibouti' => true, 'yemen' => true, + 'airspace' => true }, + 'gulfWar1990Details' => + { 'airspace' => { 'startDate' => '2014-01-26', 'endDate' => '2014-02-28' }, + 'somalia' => { 'startDate' => '2014-01-26', 'endDate' => '2014-02-28' }, + 'kuwait' => { 'startDate' => '2014-01-26', 'endDate' => '2014-02-28' } }, + 'gulfWar1990' => { 'kuwait' => true, 'somalia' => true, + 'airspace' => true } + }) + result = transformer.transform(data) + # since this is now a uniq list, it is now 12 items instead of 13 + expect(result.toxic_exposure.multiple_exposures.count).to eq(12) + end end describe 'optional request objects are correctly rendered' do From 4649e90b7e6607b2854bc46c0b3fff9587acc9cc Mon Sep 17 00:00:00 2001 From: Eric Tillberg Date: Fri, 20 Sep 2024 12:16:54 -0400 Subject: [PATCH 09/27] Fix data format for mailer (#18540) * Fix data format for mailer * fix tests --- app/models/form_submission_attempt.rb | 2 +- .../controllers/simple_forms_api/v1/uploads_controller.rb | 5 +++-- .../app/services/simple_forms_api/notification_email.rb | 7 ++++++- spec/factories/form_submissions.rb | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/models/form_submission_attempt.rb b/app/models/form_submission_attempt.rb index b670547ab9..b6319b5d3a 100644 --- a/app/models/form_submission_attempt.rb +++ b/app/models/form_submission_attempt.rb @@ -74,7 +74,7 @@ def log_status_change def enqueue_result_email(notification_type) config = { - form_data: form_submission.form_data, + form_data: JSON.parse(form_submission.form_data), form_number: form_submission.form_type, confirmation_number: form_submission.benefits_intake_uuid, date_submitted: created_at.strftime('%B %d, %Y'), diff --git a/modules/simple_forms_api/app/controllers/simple_forms_api/v1/uploads_controller.rb b/modules/simple_forms_api/app/controllers/simple_forms_api/v1/uploads_controller.rb index f6c9bd8882..3ded3c9983 100644 --- a/modules/simple_forms_api/app/controllers/simple_forms_api/v1/uploads_controller.rb +++ b/modules/simple_forms_api/app/controllers/simple_forms_api/v1/uploads_controller.rb @@ -270,11 +270,12 @@ def send_confirmation_email(parsed_form_data, form_id, confirmation_number) confirmation_number:, date_submitted: Time.zone.today.strftime('%B %d, %Y') } - SimpleFormsApi::NotificationEmail.new( + notification_email = SimpleFormsApi::NotificationEmail.new( config, notification_type: :confirmation, user: @current_user - ).send + ) + notification_email.send end end end diff --git a/modules/simple_forms_api/app/services/simple_forms_api/notification_email.rb b/modules/simple_forms_api/app/services/simple_forms_api/notification_email.rb index 5ed95ed5d7..605719daaa 100644 --- a/modules/simple_forms_api/app/services/simple_forms_api/notification_email.rb +++ b/modules/simple_forms_api/app/services/simple_forms_api/notification_email.rb @@ -25,7 +25,12 @@ def initialize(config, notification_type: :confirmation, user: nil) check_missing_keys(config) @form_data = config[:form_data] - @form_number = config[:form_number] + incoming_form_number = config[:form_number] + @form_number = if TEMPLATE_IDS.keys.include?(incoming_form_number) + incoming_form_number + else + SimpleFormsApi::V1::UploadsController::FORM_NUMBER_MAP[incoming_form_number] + end @confirmation_number = config[:confirmation_number] @date_submitted = config[:date_submitted] @lighthouse_updated_at = config[:lighthouse_updated_at] diff --git a/spec/factories/form_submissions.rb b/spec/factories/form_submissions.rb index fde3a9fc7e..4a66b44718 100644 --- a/spec/factories/form_submissions.rb +++ b/spec/factories/form_submissions.rb @@ -3,7 +3,7 @@ FactoryBot.define do factory :form_submission do form_type { '21-4142' } - form_data { '' } + form_data { '{}' } benefits_intake_uuid { SecureRandom.uuid } trait :pending do From a6a1e005285747075812969a324f8adf64f2f3a0 Mon Sep 17 00:00:00 2001 From: Sam Stuckey Date: Fri, 20 Sep 2024 10:29:16 -0600 Subject: [PATCH 10/27] [DBX-18456] break out failure snapshot (#18457) --- .github/CODEOWNERS | 6 +- .../form526_failure_state_snapshot_job.rb | 43 ++++ ...rm526_submission_processing_report_job.rb} | 45 +--- lib/periodic_jobs.rb | 7 +- lib/scopes/form526_submission_state.rb | 2 +- ...form526_failure_state_snapshot_job_spec.rb | 236 ++++++++++++++++++ ..._submission_processing_report_job_spec.rb} | 58 +---- 7 files changed, 295 insertions(+), 102 deletions(-) create mode 100644 app/sidekiq/form526_failure_state_snapshot_job.rb rename app/sidekiq/{form526_state_logging_job.rb => form526_submission_processing_report_job.rb} (66%) create mode 100644 spec/sidekiq/form526_failure_state_snapshot_job_spec.rb rename spec/sidekiq/{form526_state_logging_job_spec.rb => form526_submission_processing_report_job_spec.rb} (78%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4aed040782..9c5ea239e4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -642,10 +642,11 @@ app/sidekiq/feature_cleaner_job.rb @department-of-veterans-affairs/va-api-engine app/sidekiq/form1010cg @department-of-veterans-affairs/vfs-10-10 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/sidekiq/form1095 @department-of-veterans-affairs/vfs-1095-b @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/sidekiq/form526_confirmation_email_job.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group +app/sidekiq/form526_failure_state_snapshot_job.rb @department-of-veterans-affairs/disability-experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/sidekiq/form526_paranoid_success_polling_job.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group -app/sidekiq/form526_state_logging_job.rb @department-of-veterans-affairs/disability-experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/sidekiq/form526_status_polling_job.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/sidekiq/form526_submission_failed_email_job.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group +app/sidekiq/form526_submission_processing_report_job.rb @department-of-veterans-affairs/disability-experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/sidekiq/gi_bill_feedback_submission_job.rb @department-of-veterans-affairs/my-education-benefits @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/sidekiq/hca @department-of-veterans-affairs/vfs-10-10 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group app/sidekiq/identity @department-of-veterans-affairs/octo-identity @@ -1343,9 +1344,10 @@ spec/sidekiq/facilities @department-of-veterans-affairs/vfs-facilities-frontend spec/sidekiq/form1010cg @department-of-veterans-affairs/vfs-10-10 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group spec/sidekiq/form1095 @department-of-veterans-affairs/vfs-1095-b @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group spec/sidekiq/form526_confirmation_email_job_spec.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group +spec/sidekiq/form526_failure_state_snapshot_job_spec.rb @department-of-veterans-affairs/disability-experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group spec/sidekiq/form526_paranoid_success_polling_job_spec.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group -spec/sidekiq/form526_state_logging_job_spec.rb @department-of-veterans-affairs/disability-experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group spec/sidekiq/form526_status_polling_job_spec.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group +spec/sidekiq/form526_submission_processing_report_job_spec.rb @department-of-veterans-affairs/disability-experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group spec/sidekiq/form5655 @department-of-veterans-affairs/vsa-debt-resolution @department-of-veterans-affairs/backend-review-group spec/sidekiq/gi_bill_feedback_submission_job_spec.rb @department-of-veterans-affairs/my-education-benefits @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group spec/sidekiq/hca @department-of-veterans-affairs/vfs-10-10 @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers diff --git a/app/sidekiq/form526_failure_state_snapshot_job.rb b/app/sidekiq/form526_failure_state_snapshot_job.rb new file mode 100644 index 0000000000..ed895299ab --- /dev/null +++ b/app/sidekiq/form526_failure_state_snapshot_job.rb @@ -0,0 +1,43 @@ +# frozen_string_literal: true + +# Log information about Form526Submission state to populate an admin facing Datadog dashboard +class Form526FailureStateSnapshotJob + include Sidekiq::Job + sidekiq_options retry: false + + STATSD_PREFIX = 'form526.state.snapshot' + + def perform + write_failure_snapshot + rescue => e + Rails.logger.error('Error logging 526 state snapshot', + class: self.class.name, + message: e.try(:message)) + end + + def write_failure_snapshot + state_as_counts.each do |description, count| + StatsD.gauge("#{STATSD_PREFIX}.#{description}", count) + end + end + + def state_as_counts + @state_as_counts ||= {}.tap do |abbreviation| + snapshot_state.each do |dp, ids| + abbreviation[:"#{dp}_count"] = ids.count + end + end + end + + def snapshot_state + @snapshot_state ||= load_snapshot_state + end + + def load_snapshot_state + { + total_awaiting_backup_status: Form526Submission.pending_backup.pluck(:id).sort, + total_incomplete_type: Form526Submission.incomplete_type.pluck(:id).sort, + total_failure_type: Form526Submission.failure_type.pluck(:id).sort + } + end +end diff --git a/app/sidekiq/form526_state_logging_job.rb b/app/sidekiq/form526_submission_processing_report_job.rb similarity index 66% rename from app/sidekiq/form526_state_logging_job.rb rename to app/sidekiq/form526_submission_processing_report_job.rb index 6de183f937..a53623d357 100644 --- a/app/sidekiq/form526_state_logging_job.rb +++ b/app/sidekiq/form526_submission_processing_report_job.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Log information about Form526Submission state to populate an admin facing Datadog dashboard -class Form526StateLoggingJob +class Form526SubmissionProcessingReportJob include Sidekiq::Job sidekiq_options retry: false @@ -9,7 +9,6 @@ class Form526StateLoggingJob END_DATE = Time.zone.today.beginning_of_day START_DATE = END_DATE - 1.week - STATSD_PREFIX = 'form526.state' def initialize(start_date: START_DATE, end_date: END_DATE) @start_date = start_date @@ -17,7 +16,6 @@ def initialize(start_date: START_DATE, end_date: END_DATE) end def perform - write_as_gauges write_as_log rescue => e Rails.logger.error('Error logging 526 state data', @@ -29,43 +27,23 @@ def perform def write_as_log Rails.logger.info('Form 526 State Data', - state_log: counts_with_failures, + state_log: state_as_counts, start_date:, end_date:) end - def counts_with_failures - counts = state_as_counts - counts[:total_failure_type_ids] = total_failure_type - counts - end - - def base_state - @base_state ||= timeboxed_state.merge(all_time_state) - end - def state_as_counts @state_as_counts ||= {}.tap do |abbreviation| - base_state.each do |dp, ids| + timeboxed_state.each do |dp, ids| abbreviation[:"#{dp}_count"] = ids.count end end end - def write_as_gauges - state_as_counts.each do |description, count| - StatsD.gauge("#{STATSD_PREFIX}.#{description}", count) - end - end - def timeboxed_state @timeboxed_state ||= load_timeboxed_state end - def all_time_state - @all_time_state ||= load_all_time_state - end - def load_timeboxed_state { timeboxed: timeboxed_submissions.pluck(:id).sort, @@ -76,27 +54,10 @@ def load_timeboxed_state } end - def load_all_time_state - { - total_awaiting_backup_status: Form526Submission.pending_backup.pluck(:id).sort, - total_incomplete_type: Form526Submission.incomplete_type.pluck(:id).sort, - total_failure_type: - } - end - - def total_failure_type - @total_failure_type ||= Form526Submission.failure_type.pluck(:id).sort - end - def sub_arel @sub_arel ||= Form526Submission.arel_table end - def combined_pending_types_for(submissions) - submissions.incomplete.pluck(:id) + - submissions.in_process.pluck(:id) - end - def backup_submissions @backup_submissions ||= timeboxed_submissions .joins(:form526_job_statuses) diff --git a/lib/periodic_jobs.rb b/lib/periodic_jobs.rb index 828491aa91..e090cb8bf0 100644 --- a/lib/periodic_jobs.rb +++ b/lib/periodic_jobs.rb @@ -66,8 +66,11 @@ # Checks all 'success' type submissions in LH to ensure they haven't changed mgr.register('0 2 * * 0', 'Form526ParanoidSuccessPollingJob') - # Log the state of Form 526 submissions to hydrate Datadog monitor - mgr.register('0 3 * * *', 'Form526StateLoggingJob') + # Log a report of 526 submission processing for a given timebox + mgr.register('5 4 * * 7', 'Form526SubmissionProcessingReportJob') + + # Log a snapshot of everything in a full failure type state + mgr.register('5 * * * *', 'Form526FailureStateSnapshotJob') # Clear out processed 22-1990 applications that are older than 1 month mgr.register('0 0 * * *', 'EducationForm::DeleteOldApplications') diff --git a/lib/scopes/form526_submission_state.rb b/lib/scopes/form526_submission_state.rb index a0b4373ed8..141261c06d 100644 --- a/lib/scopes/form526_submission_state.rb +++ b/lib/scopes/form526_submission_state.rb @@ -112,7 +112,7 @@ module Form526SubmissionState scope :failure_type, lambda { # filtering in stages avoids timeouts. see doc for more info - allids = all.pluck(:id) + allids = where(submitted_claim_id: nil).pluck(:id) filter1 = where(id: allids - accepted_to_primary_path.pluck(:id)).pluck(:id) filter2 = where(id: filter1 - accepted_to_backup_path.pluck(:id)).pluck(:id) filter3 = where(id: filter2 - remediated.pluck(:id)).pluck(:id) diff --git a/spec/sidekiq/form526_failure_state_snapshot_job_spec.rb b/spec/sidekiq/form526_failure_state_snapshot_job_spec.rb new file mode 100644 index 0000000000..6ebb7e0064 --- /dev/null +++ b/spec/sidekiq/form526_failure_state_snapshot_job_spec.rb @@ -0,0 +1,236 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Form526FailureStateSnapshotJob, type: :worker do + before do + Sidekiq::Job.clear_all + end + + let!(:olden_times) { (Form526Submission::MAX_PENDING_TIME + 1.day).ago } + let!(:modern_times) { 2.days.ago } + let!(:end_date) { Time.zone.today.beginning_of_day } + let!(:start_date) { end_date - 1.week } + + describe '526 state logging' do + let!(:new_unprocessed) do + Timecop.freeze(modern_times) do + create(:form526_submission) + end + end + let!(:old_unprocessed) do + Timecop.freeze(olden_times) do + create(:form526_submission) + end + end + let!(:new_primary_success) do + Timecop.freeze(modern_times) do + create(:form526_submission, :with_submitted_claim_id, :with_one_succesful_job) + end + end + let!(:old_primary_success) do + Timecop.freeze(olden_times) do + create(:form526_submission, :with_submitted_claim_id, :with_one_succesful_job) + end + end + let!(:new_backup_pending) do + Timecop.freeze(modern_times) do + create(:form526_submission, :backup_path, :with_failed_primary_job) + end + end + let!(:old_backup_pending) do + Timecop.freeze(olden_times) do + create(:form526_submission, :backup_path, :with_failed_primary_job) + end + end + let!(:new_backup_success) do + Timecop.freeze(modern_times) do + create(:form526_submission, :backup_path, :paranoid_success, :with_failed_primary_job) + end + end + let!(:old_backup_success) do + Timecop.freeze(olden_times) do + create(:form526_submission, :backup_path, :paranoid_success, :with_failed_primary_job) + end + end + let!(:new_backup_vbms) do + Timecop.freeze(modern_times) do + create(:form526_submission, :backup_path, :backup_accepted, :with_failed_primary_job) + end + end + let!(:old_backup_vbms) do + Timecop.freeze(olden_times) do + create(:form526_submission, :backup_path, :backup_accepted, :with_failed_primary_job) + end + end + let!(:new_backup_rejected) do + Timecop.freeze(modern_times) do + create(:form526_submission, :backup_path, :backup_rejected, :with_failed_primary_job) + end + end + let!(:old_backup_rejected) do + Timecop.freeze(olden_times) do + create(:form526_submission, :backup_path, :backup_rejected, :with_failed_primary_job) + end + end + let!(:new_double_job_failure) do + Timecop.freeze(modern_times) do + create(:form526_submission, :with_failed_primary_job, :with_failed_backup_job) + end + end + let!(:old_double_job_failure) do + Timecop.freeze(olden_times) do + create(:form526_submission, :with_failed_primary_job, :with_failed_backup_job) + end + end + let!(:new_double_job_failure_remediated) do + Timecop.freeze(modern_times) do + create(:form526_submission, :with_failed_primary_job, :with_failed_backup_job, :remediated) + end + end + let!(:old_double_job_failure_remediated) do + Timecop.freeze(olden_times) do + create(:form526_submission, :with_failed_primary_job, :with_failed_backup_job, :remediated) + end + end + let!(:new_double_job_failure_de_remediated) do + Timecop.freeze(modern_times) do + create(:form526_submission, :with_failed_primary_job, :with_failed_backup_job, :no_longer_remediated) + end + end + let!(:old_double_job_failure_de_remediated) do + Timecop.freeze(olden_times) do + create(:form526_submission, :with_failed_primary_job, :with_failed_backup_job, :no_longer_remediated) + end + end + let!(:new_no_job_remediated) do + Timecop.freeze(modern_times) do + create(:form526_submission, :remediated) + end + end + let!(:old_no_job_remediated) do + Timecop.freeze(olden_times) do + create(:form526_submission, :remediated) + end + end + let!(:new_backup_paranoid) do + Timecop.freeze(modern_times) do + create(:form526_submission, :backup_path, :with_failed_primary_job, :paranoid_success) + end + end + let!(:old_backup_paranoid) do + Timecop.freeze(olden_times) do + create(:form526_submission, :backup_path, :with_failed_primary_job, :paranoid_success) + end + end + let!(:still_running_with_retryable_errors) do + Timecop.freeze(modern_times) do + create(:form526_submission, :with_one_failed_job) + end + end + # RARE EDGECASES + let!(:new_no_job_de_remediated) do + Timecop.freeze(modern_times) do + create(:form526_submission, :no_longer_remediated) + end + end + let!(:old_no_job_de_remediated) do + Timecop.freeze(olden_times) do + create(:form526_submission, :no_longer_remediated) + end + end + let!(:new_double_success) do + Timecop.freeze(modern_times) do + create(:form526_submission, :with_submitted_claim_id, :backup_path) + end + end + let!(:old_double_success) do + Timecop.freeze(olden_times) do + create(:form526_submission, :with_submitted_claim_id, :backup_path) + end + end + let!(:new_triple_success) do + Timecop.freeze(modern_times) do + create(:form526_submission, :with_submitted_claim_id, :backup_path, :remediated) + end + end + let!(:old_triple_success) do + Timecop.freeze(olden_times) do + create(:form526_submission, :with_submitted_claim_id, :backup_path, :remediated) + end + end + let!(:new_double_success_de_remediated) do + Timecop.freeze(modern_times) do + create(:form526_submission, :with_submitted_claim_id, :backup_path, :no_longer_remediated) + end + end + let!(:old_double_success_de_remediated) do + Timecop.freeze(olden_times) do + create(:form526_submission, :with_submitted_claim_id, :backup_path, :no_longer_remediated) + end + end + let!(:new_remediated_and_de_remediated) do + sub = Timecop.freeze(modern_times) do + create(:form526_submission, :remediated) + end + Timecop.freeze(modern_times + 1.hour) do + create(:form526_submission_remediation, + form526_submission: sub, + lifecycle: ['i am no longer remediated'], + success: false) + end + sub + end + let!(:old_remediated_and_de_remediated) do + sub = Timecop.freeze(olden_times) do + create(:form526_submission, :remediated) + end + Timecop.freeze(olden_times + 1.hour) do + create(:form526_submission_remediation, + form526_submission: sub, + lifecycle: ['i am no longer remediated'], + success: false) + end + sub + end + + it 'logs 526 state metrics correctly' do + expected_log = { + total_awaiting_backup_status: [ + new_backup_pending.id + ].sort, + total_incomplete_type: [ + still_running_with_retryable_errors.id, + new_unprocessed.id, + new_backup_pending.id, + new_no_job_de_remediated.id, + new_remediated_and_de_remediated.id + ].sort, + total_failure_type: [ + old_unprocessed.id, + old_backup_pending.id, + new_backup_rejected.id, + old_backup_rejected.id, + old_double_job_failure.id, + old_double_job_failure_de_remediated.id, + old_no_job_de_remediated.id, + old_remediated_and_de_remediated.id, + new_double_job_failure.id, + new_double_job_failure_de_remediated.id + ].sort + } + + expect(described_class.new.snapshot_state).to eq(expected_log) + end + + it 'writes counts as Stats D gauges' do + prefix = described_class::STATSD_PREFIX + + expect(StatsD).to receive(:gauge).with("#{prefix}.total_awaiting_backup_status_count", 1) + expect(StatsD).to receive(:gauge).with("#{prefix}.total_incomplete_type_count", 5) + expect(StatsD).to receive(:gauge).with("#{prefix}.total_failure_type_count", 10) + + described_class.new.perform + end + end +end diff --git a/spec/sidekiq/form526_state_logging_job_spec.rb b/spec/sidekiq/form526_submission_processing_report_job_spec.rb similarity index 78% rename from spec/sidekiq/form526_state_logging_job_spec.rb rename to spec/sidekiq/form526_submission_processing_report_job_spec.rb index cfb548c8b2..1d840ffb31 100644 --- a/spec/sidekiq/form526_state_logging_job_spec.rb +++ b/spec/sidekiq/form526_submission_processing_report_job_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Form526StateLoggingJob, type: :worker do +RSpec.describe Form526SubmissionProcessingReportJob, type: :worker do before do Sidekiq::Job.clear_all end @@ -242,32 +242,10 @@ new_backup_pending.id, new_remediated_and_de_remediated.id, new_no_job_de_remediated.id - ].sort, - total_awaiting_backup_status: [ - new_backup_pending.id - ].sort, - total_incomplete_type: [ - still_running_with_retryable_errors.id, - new_unprocessed.id, - new_backup_pending.id, - new_no_job_de_remediated.id, - new_remediated_and_de_remediated.id - ].sort, - total_failure_type: [ - old_unprocessed.id, - old_backup_pending.id, - new_backup_rejected.id, - old_backup_rejected.id, - old_double_job_failure.id, - old_double_job_failure_de_remediated.id, - old_no_job_de_remediated.id, - old_remediated_and_de_remediated.id, - new_double_job_failure.id, - new_double_job_failure_de_remediated.id ].sort } - expect(described_class.new.base_state).to eq(expected_log) + expect(described_class.new.timeboxed_state).to eq(expected_log) end it 'converts the logs to counts where prefered' do @@ -277,22 +255,7 @@ timeboxed_primary_successes_count: 4, timeboxed_exhausted_primary_job_count: 8, timeboxed_exhausted_backup_job_count: 3, - timeboxed_incomplete_type_count: 5, - total_awaiting_backup_status_count: 1, - total_incomplete_type_count: 5, - total_failure_type_count: 10, - total_failure_type_ids: [ - old_unprocessed.id, - old_backup_pending.id, - new_backup_rejected.id, - old_backup_rejected.id, - old_double_job_failure.id, - old_double_job_failure_de_remediated.id, - old_no_job_de_remediated.id, - old_remediated_and_de_remediated.id, - new_double_job_failure.id, - new_double_job_failure_de_remediated.id - ].sort + timeboxed_incomplete_type_count: 5 }, start_date:, end_date: @@ -304,20 +267,5 @@ end described_class.new.perform end - - it 'writes counts as Stats D gauges' do - prefix = described_class::STATSD_PREFIX - - expect(StatsD).to receive(:gauge).with("#{prefix}.timeboxed_count", 17) - expect(StatsD).to receive(:gauge).with("#{prefix}.timeboxed_primary_successes_count", 4) - expect(StatsD).to receive(:gauge).with("#{prefix}.timeboxed_exhausted_primary_job_count", 8) - expect(StatsD).to receive(:gauge).with("#{prefix}.timeboxed_exhausted_backup_job_count", 3) - expect(StatsD).to receive(:gauge).with("#{prefix}.timeboxed_incomplete_type_count", 5) - expect(StatsD).to receive(:gauge).with("#{prefix}.total_awaiting_backup_status_count", 1) - expect(StatsD).to receive(:gauge).with("#{prefix}.total_incomplete_type_count", 5) - expect(StatsD).to receive(:gauge).with("#{prefix}.total_failure_type_count", 10) - - described_class.new.perform - end end end From 4fb0ddb664721304e28cb8f5bb65ad0b2f14c08c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 10:34:27 -0600 Subject: [PATCH 11/27] Bump mock_redis from 0.44.0 to 0.45.0 (#18542) Bumps [mock_redis](https://github.com/sds/mock_redis) from 0.44.0 to 0.45.0. - [Release notes](https://github.com/sds/mock_redis/releases) - [Changelog](https://github.com/sds/mock_redis/blob/main/CHANGELOG.md) - [Commits](https://github.com/sds/mock_redis/compare/v0.44.0...v0.45.0) --- updated-dependencies: - dependency-name: mock_redis dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 689c092dac..e0a410e1d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -647,7 +647,7 @@ GEM mini_mime (1.1.5) mini_portile2 (2.8.7) minitest (5.25.1) - mock_redis (0.44.0) + mock_redis (0.45.0) msgpack (1.7.2) msgpack (1.7.2-java) multi_json (1.15.0) From 7fac3cb7bfeb7448fe85a0519c943e19ee25077b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 10:48:06 -0600 Subject: [PATCH 12/27] Bump puma from 6.4.2 to 6.4.3 (#18541) Bumps [puma](https://github.com/puma/puma) from 6.4.2 to 6.4.3. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.4.2...v6.4.3) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e0a410e1d4..80c8208c76 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -764,9 +764,9 @@ GEM psych (5.1.2-java) jar-dependencies (>= 0.1.7) public_suffix (6.0.1) - puma (6.4.2) + puma (6.4.3) nio4r (~> 2.0) - puma (6.4.2-java) + puma (6.4.3-java) nio4r (~> 2.0) pundit (2.4.0) activesupport (>= 3.0.0) From ef3fd26bfce49ec0003d36a2c36e815261e4a675 Mon Sep 17 00:00:00 2001 From: Alex Morgun <87077843+oleksii-morgun@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:51:35 -0400 Subject: [PATCH 13/27] MHV-62185 SM TG plain language feature flag (#18547) --- config/features.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/features.yml b/config/features.yml index dbff51ecca..7fcfa09cdc 100644 --- a/config/features.yml +++ b/config/features.yml @@ -830,6 +830,9 @@ features: mhv_secure_messaging_edit_contact_list: actor_type: user description: Disables/Enables Secure Messaging edit contact list page + mhv_secure_messaging_triage_group_plain_language: + actor_type: user + description: Disables/Enables Secure Messaging recipients group plain language design enable_in_development: true mhv_medical_records_allow_txt_downloads: actor_type: user From 7bbbff9d456f560a2879c669b31dd707b51cb651 Mon Sep 17 00:00:00 2001 From: asiisii <36644181+asiisii@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:22:36 -0600 Subject: [PATCH 14/27] 92457-89743: Remove Toggles for Direct Deposit Single Form (#18500) * 92457-89743:remove legacy direct deposit flippers * remove the fliper from the test --- config/features.yml | 12 ------------ .../v0/profile/direct_deposits_controller_spec.rb | 1 - 2 files changed, 13 deletions(-) diff --git a/config/features.yml b/config/features.yml index 7fcfa09cdc..51e45840ae 100644 --- a/config/features.yml +++ b/config/features.yml @@ -992,18 +992,6 @@ features: profile_show_credential_retirement_messaging: actor_type: user description: Show/hide MHV and DS Logon credential retirement messaging in profile - profile_show_direct_deposit_single_form: - actor_type: user - description: Show/hide the single direct deposit form in profile for all users - profile_show_direct_deposit_single_form_uat: - actor_type: user - description: Show/hide the single direct deposit form just for users during UAT only - profile_show_direct_deposit_single_form_alert: - actor_type: user - description: Show/hide an alert with information around migrating to a single direct deposit form in profile - profile_show_direct_deposit_single_form_edu_downtime: - actor_type: user - description: Show/hide the edu direct deposit form and instead display a downtime message in its place profile_show_payments_notification_setting: actor_type: user description: Show/Hide the payments section of notifications in profile diff --git a/spec/controllers/v0/profile/direct_deposits_controller_spec.rb b/spec/controllers/v0/profile/direct_deposits_controller_spec.rb index 66c15f1da6..c36d86898a 100644 --- a/spec/controllers/v0/profile/direct_deposits_controller_spec.rb +++ b/spec/controllers/v0/profile/direct_deposits_controller_spec.rb @@ -10,7 +10,6 @@ token = 'abcdefghijklmnop' allow_any_instance_of(DirectDeposit::Configuration).to receive(:access_token).and_return(token) allow(Rails.logger).to receive(:info) - Flipper.disable(:profile_show_direct_deposit_single_form) end describe '#show' do From 47e18a7e823c6ba07879884375f91847ec036fd5 Mon Sep 17 00:00:00 2001 From: Riley Anderson Date: Fri, 20 Sep 2024 12:33:51 -0600 Subject: [PATCH 15/27] MHV Account Creation Caching (#18523) --- app/services/mhv/user_account/creator.rb | 15 ++- lib/mhv/account_creation/service.rb | 21 +++- spec/lib/mhv/account_creation/service_spec.rb | 98 ++++++++++++++++--- .../services/mhv/user_account/creator_spec.rb | 32 ++++-- 4 files changed, 131 insertions(+), 35 deletions(-) diff --git a/app/services/mhv/user_account/creator.rb b/app/services/mhv/user_account/creator.rb index 4ae03b32ac..6e18cc43ea 100644 --- a/app/services/mhv/user_account/creator.rb +++ b/app/services/mhv/user_account/creator.rb @@ -5,11 +5,11 @@ module MHV module UserAccount class Creator - attr_reader :user_verification, :cached + attr_reader :user_verification, :break_cache - def initialize(user_verification:, cached: true) + def initialize(user_verification:, break_cache: false) @user_verification = user_verification - @cached = cached + @break_cache = break_cache end def perform @@ -33,8 +33,9 @@ def create_mhv_user_account! end def mhv_account_creation_response - MHV::AccountCreation::Service.new - .create_account(icn:, email:, tou_occurred_at: current_tou_agreement.created_at) + tou_occurred_at = current_tou_agreement.created_at + + mhv_client.create_account(icn:, email:, tou_occurred_at:, break_cache:) end def icn @@ -53,6 +54,10 @@ def user_account @user_account ||= user_verification.user_account end + def mhv_client + MHV::AccountCreation::Service.new + end + def validate! errors = [ ('ICN must be present' if icn.blank?), diff --git a/lib/mhv/account_creation/service.rb b/lib/mhv/account_creation/service.rb index 4251b1f0de..6128714188 100644 --- a/lib/mhv/account_creation/service.rb +++ b/lib/mhv/account_creation/service.rb @@ -7,13 +7,13 @@ module AccountCreation class Service < Common::Client::Base configuration Configuration - def create_account(icn:, email:, tou_occurred_at:) + def create_account(icn:, email:, tou_occurred_at:, break_cache: false) params = build_create_account_params(icn:, email:, tou_occurred_at:) - response = perform(:post, config.account_creation_path, params, authenticated_header(icn:)) - Rails.logger.info("#{config.logging_prefix} create_account success", icn:) - - normalize_response_body(response.body) + create_account_with_cache(icn:, force: break_cache, expires_in: 1.day) do + response = perform(:post, config.account_creation_path, params, authenticated_header(icn:)) + normalize_response_body(response.body) + end rescue Common::Client::Errors::ParsingError, Common::Client::Errors::ClientError => e Rails.logger.error("#{config.logging_prefix} create_account #{e.class.name.demodulize.underscore}", { error_message: e.message, body: e.body, icn: }) @@ -22,6 +22,17 @@ def create_account(icn:, email:, tou_occurred_at:) private + def create_account_with_cache(icn:, force:, expires_in:, &request) + cache_hit = true + account = Rails.cache.fetch("#{config.service_name}_#{icn}", force:, expires_in:) do + cache_hit = false + request.call + end + Rails.logger.info("#{config.logging_prefix} create_account success", { icn:, account:, from_cache: cache_hit }) + + account + end + def build_create_account_params(icn:, email:, tou_occurred_at:) { icn:, diff --git a/spec/lib/mhv/account_creation/service_spec.rb b/spec/lib/mhv/account_creation/service_spec.rb index 789760a586..7c4e46618a 100644 --- a/spec/lib/mhv/account_creation/service_spec.rb +++ b/spec/lib/mhv/account_creation/service_spec.rb @@ -5,7 +5,7 @@ describe MHV::AccountCreation::Service do describe '#create_account' do - subject { described_class.new.create_account(icn:, email:, tou_occurred_at:) } + subject { described_class.new.create_account(icn:, email:, tou_occurred_at:, break_cache:) } let(:icn) { '10101V964144' } let(:email) { 'some-email@email.com' } @@ -15,6 +15,7 @@ let(:log_prefix) { '[MHV][AccountCreation][Service]' } let(:account_creation_base_url) { 'https://apigw-intb.aws.myhealth.va.gov' } let(:account_creation_path) { 'v1/usermgmt/account-service/account' } + let(:break_cache) { false } before do allow(Rails.logger).to receive(:info) @@ -22,9 +23,21 @@ allow_any_instance_of(SignInService::Sts).to receive(:base_url).and_return('https://staging-api.va.gov') end + context 'when making a request' do + let(:expected_tou_datetime) { tou_occurred_at.iso8601 } + + it 'sends vaTermsOfUseDateTime in the correct format' do + VCR.use_cassette('mhv/account_creation/account_creation_service_200_response') do + subject + expect(a_request(:post, "#{account_creation_base_url}/#{account_creation_path}") + .with(body: /"vaTermsOfUseDateTime":"#{expected_tou_datetime}"/)).to have_been_made + end + end + end + context 'when the response is successful' do let(:expected_log_message) { "#{log_prefix} create_account success" } - let(:expected_log_payload) { { icn: } } + let(:expected_log_payload) { { icn:, account: expected_response_body, from_cache: expected_from_cache_log } } let(:expected_response_body) do { user_profile_id: '12345678', @@ -36,26 +49,79 @@ } end - let(:expected_tou_datetime) { tou_occurred_at.iso8601 } + shared_examples 'a successful external request' do + it 'makes a request to the account creation service' do + VCR.use_cassette('mhv/account_creation/account_creation_service_200_response') do + subject + expect(a_request(:post, "#{account_creation_base_url}/#{account_creation_path}")).to have_been_made + end + end - it 'sends vaTermsOfUseDateTime in the correct format' do - VCR.use_cassette('mhv/account_creation/account_creation_service_200_response') do - subject - expect(a_request(:post, "#{account_creation_base_url}/#{account_creation_path}") - .with(body: /"vaTermsOfUseDateTime":"#{expected_tou_datetime}"/)).to have_been_made + it 'logs the create account request' do + VCR.use_cassette('mhv/account_creation/account_creation_service_200_response') do + subject + expect(Rails.logger).to have_received(:info).with(expected_log_message, expected_log_payload) + end end - end - it 'logs the create account request' do - VCR.use_cassette('mhv/account_creation/account_creation_service_200_response') do - subject - expect(Rails.logger).to have_received(:info).with(expected_log_message, expected_log_payload) + it 'returns the expected response' do + VCR.use_cassette('mhv/account_creation/account_creation_service_200_response') do + expect(subject).to eq(expected_response_body) + end end end - it 'returns the expected response' do - VCR.use_cassette('mhv/account_creation/account_creation_service_200_response') do - expect(subject).to eq(expected_response_body) + context 'when the account is not in the cache' do + let(:expected_from_cache_log) { false } + + it_behaves_like 'a successful external request' + end + + context 'when the account is in the cache' do + let(:expected_from_cache_log) { true } + let(:expected_cache_key) { "mhv_account_creation_#{icn}" } + let(:expected_expires_in) { 1.day } + + context 'when break_cache is false' do + before do + allow(Rails.cache).to receive(:fetch) + .with(expected_cache_key, force: break_cache, expires_in: expected_expires_in) + .and_return(expected_response_body) + end + + it 'does not make a request to the account creation service' do + subject + expect(a_request(:post, "#{account_creation_base_url}/#{account_creation_path}")).not_to have_been_made + end + + it 'logs the create account request' do + subject + expect(Rails.logger).to have_received(:info).with(expected_log_message, expected_log_payload) + end + + it 'returns the expected response from the cache' do + expect(subject).to eq(expected_response_body) + end + end + + context 'when break_cache is true' do + let(:break_cache) { true } + let(:expected_from_cache_log) { false } + + before do + allow(Rails.cache).to receive(:fetch) + .with(expected_cache_key, force: break_cache, expires_in: expected_expires_in).and_call_original + end + + it 'calls Rails.cache.fetch with force: true' do + VCR.use_cassette('mhv/account_creation/account_creation_service_200_response') do + subject + expect(Rails.cache).to have_received(:fetch) + .with(expected_cache_key, force: true, expires_in: expected_expires_in) + end + end + + it_behaves_like 'a successful external request' end end end diff --git a/spec/services/mhv/user_account/creator_spec.rb b/spec/services/mhv/user_account/creator_spec.rb index 154b02539c..7f40166343 100644 --- a/spec/services/mhv/user_account/creator_spec.rb +++ b/spec/services/mhv/user_account/creator_spec.rb @@ -4,7 +4,7 @@ require 'mhv/account_creation/service' RSpec.describe MHV::UserAccount::Creator do - subject { described_class.new(user_verification:, cached:) } + subject { described_class.new(user_verification:, break_cache:) } let(:user_account) { create(:user_account, icn:) } let(:user_verification) { create(:user_verification, user_account:, user_credential_email:) } @@ -12,8 +12,8 @@ let!(:terms_of_use_agreement) { create(:terms_of_use_agreement, user_account:) } let(:icn) { '10101V964144' } let(:email) { 'some-email@email.com' } - let(:tou_occurred_at) { terms_of_use_agreement.created_at } - let(:cached) { true } + let(:tou_occurred_at) { terms_of_use_agreement&.created_at } + let(:break_cache) { false } let(:mhv_client) { instance_double(MHV::AccountCreation::Service) } let(:mhv_response_body) do { @@ -26,9 +26,12 @@ end before do - allow(MHV::AccountCreation::Service).to receive(:new).and_return(mhv_client) - allow(mhv_client).to receive(:create_account).and_return(mhv_response_body) allow(Rails.logger).to receive(:error) + + allow(MHV::AccountCreation::Service).to receive(:new).and_return(mhv_client) + allow(mhv_client).to receive(:create_account) + .with(icn:, email:, tou_occurred_at:, break_cache:) + .and_return(mhv_response_body) end describe '#perform' do @@ -73,10 +76,21 @@ it_behaves_like 'an invalid creator' end - context 'when icn, email, and tou_occurred_at are present' do - it 'calls MHV::AccountCreation::Service#create_account with the expected params' do - subject.perform - expect(mhv_client).to have_received(:create_account).with(icn:, email:, tou_occurred_at:) + context 'when icn, email, tou_occurred_at, tou accepted are valid' do + context 'when break_cache is false' do + it 'calls MHV::AccountCreation::Service#create_account with break_cache: false' do + subject.perform + expect(mhv_client).to have_received(:create_account).with(icn:, email:, tou_occurred_at:, break_cache: false) + end + end + + context 'when break_cache is true' do + let(:break_cache) { true } + + it 'calls MHV::AccountCreation::Service#create_account with break_cache: true' do + subject.perform + expect(mhv_client).to have_received(:create_account).with(icn:, email:, tou_occurred_at:, break_cache: true) + end end end end From f5cd5110f72d6139a10b9e535eca66923309cc63 Mon Sep 17 00:00:00 2001 From: Bryan Thompson Date: Fri, 20 Sep 2024 12:41:04 -0700 Subject: [PATCH 16/27] VACMS-18736 Use updated Search.gov url when flipper is enabled (#18450) * use updated search url when flipper is enabled * fix specs, add neccessary test envs and cassettes * add exceptions and error handling with new keys --- config/betamocks/services_config.yml | 9 ++ config/features.yml | 4 + config/locales/exceptions.en.yml | 24 +++ config/settings.yml | 5 +- config/settings/test.yml | 3 +- lib/search/configuration.rb | 11 +- lib/search/service.rb | 22 +-- spec/lib/search/configuration_spec.rb | 32 ++++ spec/lib/search/service_spec.rb | 79 +++++++++- spec/support/vcr_cassettes/search/503.yml | 32 ++++ spec/support/vcr_cassettes/search/504.yml | 32 ++++ .../vcr_cassettes/search/empty_query.yml | 56 +++++++ .../search/exceeds_rate_limit.yml | 56 +++++++ .../search/invalid_access_key.yml | 56 +++++++ .../search/invalid_affiliate.yml | 56 +++++++ .../vcr_cassettes/search/last_page.yml | 110 ++++++++++++++ spec/support/vcr_cassettes/search/page_1.yml | 140 ++++++++++++++++++ spec/support/vcr_cassettes/search/page_2.yml | 140 ++++++++++++++++++ spec/support/vcr_cassettes/search/success.yml | 56 +++++++ 19 files changed, 909 insertions(+), 14 deletions(-) diff --git a/config/betamocks/services_config.yml b/config/betamocks/services_config.yml index 08ee064747..b4bd3a9362 100644 --- a/config/betamocks/services_config.yml +++ b/config/betamocks/services_config.yml @@ -595,6 +595,15 @@ :path: "/api/v2/search/i14y" :file_path: "search/default" +# Search GSA +- :name: 'Search GSA' + :base_uri: <%= "#{URI(Settings.search.gsa_url).host}:#{URI(Settings.search.gsa_url).port}" %> + :endpoints: + # Search results + - :method: :get + :path: "/technology/searchgov/v2/results/i14y" + :file_path: "search/default" + #GIS - :name: 'GIS' :base_uri: <%= "#{URI(Settings.locators.gis_base_path).host}:#{URI(Settings.locators.gis_base_path).port}" %> diff --git a/config/features.yml b/config/features.yml index 51e45840ae..2805f6b2a4 100644 --- a/config/features.yml +++ b/config/features.yml @@ -1694,3 +1694,7 @@ features: mgib_verifications_maintenance: actor_type: user description: Used to show maintenance alert for MGIB Verifications + search_use_v2_gsa: + actor_type: cookie_id + description: Swaps the Search Service's configuration url with an updated api.gsa.gov address + enabled_in_development: true diff --git a/config/locales/exceptions.en.yml b/config/locales/exceptions.en.yml index e339cf4118..2c17524a93 100644 --- a/config/locales/exceptions.en.yml +++ b/config/locales/exceptions.en.yml @@ -798,6 +798,30 @@ en: code: 'SEARCH_504' detail: 'Did not receive a timely response from Search.gov' status: 504 + SEARCH_GSA_400: + <<: *external_defaults + title: Bad Request + code: 'SEARCH_GSA_400' + detail: 'api.gsa.gov service responded with a Bad Request' + status: 400 + SEARCH_GSA_429: + <<: *external_defaults + title: Exceeded rate limit + code: 'SEARCH_GSA_429' + detail: 'Exceeded api.gsa.gov rate limit' + status: 429 + SEARCH_GSA_503: + <<: *external_defaults + title: Service Unavailable + code: 'SEARCH_GSA_503' + detail: 'api.gsa.gov service is currently unavailable' + status: 503 + SEARCH_GSA_504: + <<: *external_defaults + title: Gateway Timeout + code: 'SEARCH_GSA_504' + detail: 'Did not receive a timely response from api.gsa.gov' + status: 504 SEARCH_TYPEAHEAD_400: <<: *external_defaults title: Bad Request diff --git a/config/settings.yml b/config/settings.yml index 1cc10b7c9b..001202f497 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -900,7 +900,8 @@ search: access_key: SEARCH_GOV_ACCESS_KEY affiliate: va mock_search: false - url: https://search.usa.gov/api/v2 + gsa_url: https://api.gsa.gov/technology/searchgov/v2/results/i14y + url: https://search.usa.gov/api/v2/search/i14y # Settings for search-typeahead search_typeahead: @@ -908,7 +909,7 @@ search_typeahead: name: va url: https://api.gsa.gov/technology/searchgov/v1 - # Settings for search-click-tracking +# Settings for search-click-tracking search_click_tracking: access_key: SEARCH_GOV_ACCESS_KEY affiliate: va diff --git a/config/settings/test.yml b/config/settings/test.yml index 36d2843c03..8bfb03d486 100644 --- a/config/settings/test.yml +++ b/config/settings/test.yml @@ -72,7 +72,8 @@ directory: search: access_key: TESTKEY affiliate: va - url: https://search.usa.gov/api/v2 + gsa_url: https://api.gsa.gov/technology/searchgov/v2/results/i14y + url: https://search.usa.gov/api/v2/search/i14y search_typeahead: api_key: TEST_KEY diff --git a/lib/search/configuration.rb b/lib/search/configuration.rb index ea80240687..e56178d8df 100644 --- a/lib/search/configuration.rb +++ b/lib/search/configuration.rb @@ -23,7 +23,16 @@ def mock_enabled? end def base_path - "#{Settings.search.url}/search/i14y" + flipper_enabled? ? Settings.search.gsa_url : Settings.search.url + end + + # Breakers initialization requires this configuration which means the #base_path + # is required when building the DBs in CI that flipper uses for checking toggles. + # The NoDatabaseError rescue handles times we're building new DBs. + def flipper_enabled? + Flipper.enabled?(:search_use_v2_gsa) + rescue ActiveRecord::NoDatabaseError + false end def service_name diff --git a/lib/search/service.rb b/lib/search/service.rb index 1b8d4ac018..876f6bae02 100644 --- a/lib/search/service.rb +++ b/lib/search/service.rb @@ -7,10 +7,11 @@ require 'search/configuration' module Search - # This class builds a wrapper around Search.gov web results API. Creating a new instance of class + # This class builds a wrapper around Search.gov or api.gsa.gov web results API. Creating a new instance of class # will and calling #results will return a ResultsResponse upon success or an exception upon failure. # # @see https://search.usa.gov/sites/7378/api_instructions + # @see https://open.gsa.gov/api/searchgov-results/ # class Service < Common::Client::Base include Common::Client::Concerns::Monitoring @@ -48,6 +49,7 @@ def results_url # Optional params [enable_highlighting, limit, offset, sort_by] # # @see https://search.usa.gov/sites/7378/api_instructions + # @see https://open.gsa.gov/api/searchgov-results/ # def query_params { @@ -92,7 +94,7 @@ def handle_error(error) message = parse_messages(error).first save_error_details(message) handle_429!(error) - raise_backend_exception('SEARCH_400', self.class, error) if error.status >= 400 + raise_backend_exception(error_code_name(400), self.class, error) if error.status >= 400 else raise error end @@ -114,20 +116,22 @@ def handle_429!(error) return unless error.status == 429 StatsD.increment("#{Search::Service::STATSD_KEY_PREFIX}.exceptions", tags: ['exception:429']) - raise_backend_exception('SEARCH_429', self.class, error) + raise_backend_exception(error_code_name(error.status), self.class, error) end def handle_server_error!(error) return unless [503, 504].include?(error.status) - exceptions = { - 503 => 'SEARCH_503', - 504 => 'SEARCH_504' - } # Catch when the error's structure doesn't match what's usually expected. - message = error.body.is_a?(Hash) ? parse_messages(error).first : 'Search.gov is down' + message = error.body.is_a?(Hash) ? parse_messages(error).first : 'Search API is down' save_error_details(message) - raise_backend_exception(exceptions[error.status], self.class, error) + raise_backend_exception(error_code_name(error.status), self.class, error) + end + + def error_code_name(error_status) + error_code_prefix = self.class.configuration.flipper_enabled? ? 'SEARCH_GSA' : 'SEARCH' + + "#{error_code_prefix}_#{error_status}" end end end diff --git a/spec/lib/search/configuration_spec.rb b/spec/lib/search/configuration_spec.rb index 90fbb77634..01b7233b54 100644 --- a/spec/lib/search/configuration_spec.rb +++ b/spec/lib/search/configuration_spec.rb @@ -8,4 +8,36 @@ expect(described_class.instance.service_name).to eq('Search/Results') end end + + describe '#base_path' do + context 'search_use_v2_gsa Flipper is enabled' do + before do + Flipper.enable(:search_use_v2_gsa) + end + + it 'provides api.gsa.gov search URL' do + expect(described_class.instance.base_path).to eq('https://api.gsa.gov/technology/searchgov/v2/results/i14y') + end + end + + context 'search_use_v2_gsa Flipper is disabled' do + before do + Flipper.disable(:search_use_v2_gsa) + end + + it 'provides search.usa.gov search URL' do + expect(described_class.instance.base_path).to eq('https://search.usa.gov/api/v2/search/i14y') + end + end + + context 'Flipper raises a ActiveRecord::NoDatabaseError' do + before do + expect(Flipper).to receive(:enabled?).and_raise(ActiveRecord::NoDatabaseError) + end + + it 'provides search.usa.gov search URL' do + expect(described_class.instance.base_path).to eq('https://search.usa.gov/api/v2/search/i14y') + end + end + end end diff --git a/spec/lib/search/service_spec.rb b/spec/lib/search/service_spec.rb index 5b4c74ed67..4f4684d1ee 100644 --- a/spec/lib/search/service_spec.rb +++ b/spec/lib/search/service_spec.rb @@ -10,6 +10,7 @@ before do allow_any_instance_of(described_class).to receive(:access_key).and_return('TESTKEY') + Flipper.disable(:search_use_v2_gsa) end describe '#results' do @@ -49,6 +50,18 @@ end end end + + it 'raises GSA exception if Flipper enabled', :aggregate_failures do + Flipper.enable(:search_use_v2_gsa) + + VCR.use_cassette('search/empty_query', VCR::MATCH_EVERYTHING) do + expect { subject.results }.to raise_error do |e| + expect(e).to be_a(Common::Exceptions::BackendServiceException) + expect(e.status_code).to eq(400) + expect(e.errors.first.code).to eq('SEARCH_GSA_400') + end + end + end end context 'when the upstream API gives a 503' do @@ -61,6 +74,18 @@ end end end + + it 'raises GSA exception if Flipper enabled', :aggregate_failures do + Flipper.enable(:search_use_v2_gsa) + + VCR.use_cassette('search/503', VCR::MATCH_EVERYTHING) do + expect { subject.results }.to raise_error do |e| + expect(e).to be_a(Common::Exceptions::BackendServiceException) + expect(e.status_code).to eq(503) + expect(e.errors.first.code).to eq('SEARCH_GSA_503') + end + end + end end context 'when the upstream API gives a 504' do @@ -73,6 +98,18 @@ end end end + + it 'raises GSA exception if Flipper enabled', :aggregate_failures do + Flipper.enable(:search_use_v2_gsa) + + VCR.use_cassette('search/504', VCR::MATCH_EVERYTHING) do + expect { subject.results }.to raise_error do |e| + expect(e).to be_a(Common::Exceptions::BackendServiceException) + expect(e.status_code).to eq(504) + expect(e.errors.first.code).to eq('SEARCH_GSA_504') + end + end + end end context 'with an invalid API access key' do @@ -87,6 +124,20 @@ end end end + + it 'raises GSA exception if Flipper enabled', :aggregate_failures do + Flipper.enable(:search_use_v2_gsa) + + VCR.use_cassette('search/invalid_access_key', VCR::MATCH_EVERYTHING) do + allow_any_instance_of(described_class).to receive(:access_key).and_return('INVALIDKEY') + + expect { subject.results }.to raise_error do |e| + expect(e).to be_a(Common::Exceptions::BackendServiceException) + expect(e.status_code).to eq(400) + expect(e.errors.first.code).to eq('SEARCH_GSA_400') + end + end + end end context 'with an invalid affiliate' do @@ -101,9 +152,23 @@ end end end + + it 'raises GSA exception if Flipper enabled', :aggregate_failures do + Flipper.enable(:search_use_v2_gsa) + + VCR.use_cassette('search/invalid_affiliate', VCR::MATCH_EVERYTHING) do + allow_any_instance_of(described_class).to receive(:affiliate).and_return('INVALID') + + expect { subject.results }.to raise_error do |e| + expect(e).to be_a(Common::Exceptions::BackendServiceException) + expect(e.status_code).to eq(400) + expect(e.errors.first.code).to eq('SEARCH_GSA_400') + end + end + end end - context 'when exceeding the Search.gov rate limit' do + context 'when exceeding the API rate limit' do it 'raises an exception', :aggregate_failures do VCR.use_cassette('search/exceeds_rate_limit', VCR::MATCH_EVERYTHING) do expect { subject.results }.to raise_error do |e| @@ -114,6 +179,18 @@ end end + it 'raises GSA exception if Flipper enabled', :aggregate_failures do + Flipper.enable(:search_use_v2_gsa) + + VCR.use_cassette('search/exceeds_rate_limit', VCR::MATCH_EVERYTHING) do + expect { subject.results }.to raise_error do |e| + expect(e).to be_a(Common::Exceptions::BackendServiceException) + expect(e.status_code).to eq(429) + expect(e.errors.first.code).to eq('SEARCH_GSA_429') + end + end + end + it 'increments the StatsD exception:429 counter' do VCR.use_cassette('search/exceeds_rate_limit', VCR::MATCH_EVERYTHING) do allow_any_instance_of(described_class).to receive(:raise_backend_exception).and_return(nil) diff --git a/spec/support/vcr_cassettes/search/503.yml b/spec/support/vcr_cassettes/search/503.yml index 1eb6edb9ff..91fd5aecc8 100644 --- a/spec/support/vcr_cassettes/search/503.yml +++ b/spec/support/vcr_cassettes/search/503.yml @@ -32,4 +32,36 @@ http_interactions: encoding: ASCII-8BIT string: '' recorded_at: Wed, 31 Jan 2024 18:40:23 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=TESTKEY&affiliate=va&limit=10&offset=0&query=benefits + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 503 + message: Service Unavailable + headers: + Content-Length: + - 0 + Connection: + - keep-alive + Date: + - Wed, 31 Jan 2024 18:40:23 GMT + Keep-Alive: + - timeout=5 + body: + encoding: ASCII-8BIT + string: '' + recorded_at: Wed, 31 Jan 2024 18:40:23 GMT recorded_with: VCR 6.2.0 diff --git a/spec/support/vcr_cassettes/search/504.yml b/spec/support/vcr_cassettes/search/504.yml index daee58af2f..22d2162cf3 100644 --- a/spec/support/vcr_cassettes/search/504.yml +++ b/spec/support/vcr_cassettes/search/504.yml @@ -32,4 +32,36 @@ http_interactions: encoding: ASCII-8BIT string: '' recorded_at: Wed, 31 Jan 2024 18:49:39 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=TESTKEY&affiliate=va&limit=10&offset=0&query=benefits + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 504 + message: Gateway Timeout + headers: + Content-Length: + - 0 + Connection: + - keep-alive + Date: + - Wed, 31 Jan 2024 18:49:39 GMT + Keep-Alive: + - timeout=5 + body: + encoding: ASCII-8BIT + string: '' + recorded_at: Tue, 17 Sep 2024 22:49:39 GMT recorded_with: VCR 6.2.0 diff --git a/spec/support/vcr_cassettes/search/empty_query.yml b/spec/support/vcr_cassettes/search/empty_query.yml index f2a79bc202..ea6592b738 100644 --- a/spec/support/vcr_cassettes/search/empty_query.yml +++ b/spec/support/vcr_cassettes/search/empty_query.yml @@ -56,4 +56,60 @@ http_interactions: string: '{"errors":["a search term must be present"]}' http_version: recorded_at: Thu, 13 Sep 2018 02:16:30 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=TESTKEY&affiliate=va&limit=10&offset=0&query= + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 400 + message: Bad Request + headers: + Access-Control-Allow-Origin: + - "*" + Cache-Control: + - max-age=0, private, must-revalidate + Content-Type: + - application/json; charset=utf-8 + Date: + - Thu, 13 Sep 2018 02:16:30 GMT + Etag: + - W/"c740cd937737ec25c05c833fee222c7f" + Server: + - Apache + Status: + - 400 Bad Request + Strict-Transport-Security: + - max-age=31536000; includeSubdomains; preload + - max-age=31536000; includeSubdomains; preload + Via: + - 1.1 proxy3.us-east-1.prod.infr.search.usa.gov:8443 + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Request-Id: + - '09de91a6-945a-484d-ab8a-7fa0b4dfe678' + X-Xss-Protection: + - 1; mode=block + Content-Length: + - '8720' + Connection: + - keep-alive + body: + encoding: ASCII-8BIT + string: '{"errors":["a search term must be present"]}' + http_version: + recorded_at: Tue, 17 Sep 2024 21:48:30 GMT recorded_with: VCR 3.0.3 diff --git a/spec/support/vcr_cassettes/search/exceeds_rate_limit.yml b/spec/support/vcr_cassettes/search/exceeds_rate_limit.yml index 07ba306433..bb4fc7a02d 100644 --- a/spec/support/vcr_cassettes/search/exceeds_rate_limit.yml +++ b/spec/support/vcr_cassettes/search/exceeds_rate_limit.yml @@ -56,4 +56,60 @@ http_interactions: string: '{"errors":["rate limit exceeded"]}' http_version: recorded_at: Thu, 13 Sep 2018 02:16:30 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=TESTKEY&affiliate=va&limit=10&offset=0&query=benefits + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 429 + message: Too Many Requests + headers: + Access-Control-Allow-Origin: + - "*" + Cache-Control: + - max-age=0, private, must-revalidate + Content-Type: + - application/json; charset=utf-8 + Date: + - Thu, 13 Sep 2018 02:16:30 GMT + Etag: + - W/"c740cd937737ec25c05c833fee222c7f" + Server: + - Apache + Status: + - 429 Too Many Requests + Strict-Transport-Security: + - max-age=31536000; includeSubdomains; preload + - max-age=31536000; includeSubdomains; preload + Via: + - 1.1 proxy3.us-east-1.prod.infr.search.usa.gov:8443 + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Request-Id: + - '09de91a6-945a-484d-ab8a-7fa0b4dfe678' + X-Xss-Protection: + - 1; mode=block + Content-Length: + - '8720' + Connection: + - keep-alive + body: + encoding: ASCII-8BIT + string: '{"errors":["rate limit exceeded"]}' + http_version: + recorded_at: Tue, 17 Sep 2024 21:50:30 GMT recorded_with: VCR 3.0.3 diff --git a/spec/support/vcr_cassettes/search/invalid_access_key.yml b/spec/support/vcr_cassettes/search/invalid_access_key.yml index b102c98746..e054c93697 100644 --- a/spec/support/vcr_cassettes/search/invalid_access_key.yml +++ b/spec/support/vcr_cassettes/search/invalid_access_key.yml @@ -56,4 +56,60 @@ http_interactions: string: '{"errors":["access_key is invalid"]}' http_version: recorded_at: Thu, 13 Sep 2018 02:16:30 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=INVALIDKEY&affiliate=va&limit=10&offset=0&query=benefits + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 400 + message: Bad Request + headers: + Access-Control-Allow-Origin: + - "*" + Cache-Control: + - max-age=0, private, must-revalidate + Content-Type: + - application/json; charset=utf-8 + Date: + - Thu, 13 Sep 2018 02:16:30 GMT + Etag: + - W/"c740cd937737ec25c05c833fee222c7f" + Server: + - Apache + Status: + - 400 Bad Request + Strict-Transport-Security: + - max-age=31536000; includeSubdomains; preload + - max-age=31536000; includeSubdomains; preload + Via: + - 1.1 proxy3.us-east-1.prod.infr.search.usa.gov:8443 + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Request-Id: + - '09de91a6-945a-484d-ab8a-7fa0b4dfe678' + X-Xss-Protection: + - 1; mode=block + Content-Length: + - '8720' + Connection: + - keep-alive + body: + encoding: ASCII-8BIT + string: '{"errors":["access_key is invalid"]}' + http_version: + recorded_at: Thu, 13 Sep 2018 02:16:30 GMT recorded_with: VCR 3.0.3 diff --git a/spec/support/vcr_cassettes/search/invalid_affiliate.yml b/spec/support/vcr_cassettes/search/invalid_affiliate.yml index 6040066536..aedb369b5b 100644 --- a/spec/support/vcr_cassettes/search/invalid_affiliate.yml +++ b/spec/support/vcr_cassettes/search/invalid_affiliate.yml @@ -56,4 +56,60 @@ http_interactions: string: '{"errors":["affiliate not found"]}' http_version: recorded_at: Thu, 13 Sep 2018 02:16:30 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=TESTKEY&affiliate=INVALID&limit=10&offset=0&query=benefits + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 400 + message: Bad Request + headers: + Access-Control-Allow-Origin: + - "*" + Cache-Control: + - max-age=0, private, must-revalidate + Content-Type: + - application/json; charset=utf-8 + Date: + - Thu, 13 Sep 2018 02:16:30 GMT + Etag: + - W/"c740cd937737ec25c05c833fee222c7f" + Server: + - Apache + Status: + - 400 Bad Request + Strict-Transport-Security: + - max-age=31536000; includeSubdomains; preload + - max-age=31536000; includeSubdomains; preload + Via: + - 1.1 proxy3.us-east-1.prod.infr.search.usa.gov:8443 + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Request-Id: + - '09de91a6-945a-484d-ab8a-7fa0b4dfe678' + X-Xss-Protection: + - 1; mode=block + Content-Length: + - '8720' + Connection: + - keep-alive + body: + encoding: ASCII-8BIT + string: '{"errors":["affiliate not found"]}' + http_version: + recorded_at: Thu, 13 Sep 2018 02:16:30 GMT recorded_with: VCR 3.0.3 diff --git a/spec/support/vcr_cassettes/search/last_page.yml b/spec/support/vcr_cassettes/search/last_page.yml index a91fef50c4..8279cbe25b 100644 --- a/spec/support/vcr_cassettes/search/last_page.yml +++ b/spec/support/vcr_cassettes/search/last_page.yml @@ -110,4 +110,114 @@ http_interactions: }' http_version: recorded_at: Fri, 12 Oct 2018 19:54:55 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=TESTKEY&affiliate=va&limit=10&offset=80&query=benefits + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 200 + message: OK + headers: + Access-Control-Allow-Origin: + - "*" + Cache-Control: + - max-age=0, private, must-revalidate + Content-Type: + - application/json; charset=utf-8 + Date: + - Fri, 12 Oct 2018 19:54:55 GMT + Etag: + - W/"c2254ed1719a71eee2c71db91cc1f4a5" + Server: + - Apache + Status: + - 200 OK + Strict-Transport-Security: + - max-age=31536000; includeSubdomains; preload + - max-age=31536000; includeSubdomains; preload + Via: + - 1.1 proxy1.us-east-1.prod.infr.search.usa.gov:8443 + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Request-Id: + - 24d63c55-38ed-4cc3-acf3-58678c0f8f90 + X-Xss-Protection: + - 1; mode=block + Content-Length: + - '1799' + Connection: + - keep-alive + body: + encoding: ASCII-8BIT + string: '{ + "query": "benefits", + "web": { + "total": 85, + "next_offset": null, + "spelling_correction": null, + "results": + [{ + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1995/introduction", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Manage your health & benefits Find VA locations Home Education Apply for Education...Education Benefits Manage your education benefits Equal to VA Form 22-1995 (Request", + "publication_date": null + }, + { + "title": "Education Benefits", + "url": "https://www.vets.gov/education/", + "snippet": "Find out which VA education benefits you may qualify for through the GI Bill...Education Benefits We offer Veterans, Servicemembers, and their families education...education benefits like help paying tuition, help finding the right school or", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1995/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/5490/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990E/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }] + }, + "text_best_bets": [], + "graphic_best_bets": [], + "health_topics": [], + "job_openings": [], + "recent_tweets": [ + { + "text": "What is VA compensation? Many people don’t fully understand the intent, purpose, or process behind this benefit. He… https://t.co/3OWDjaEqh6", + "url": "https://twitter.com/VAVetBenefits/status/1040228111646949377", + "name": "Veterans Benefits", + "screen_name": "VAVetBenefits", + "profile_image_url": "https://pbs.twimg.com/profile_images/344513261572743396/a9fcce7feb947b2ec498491c6c6d6985_normal.png", + "created_at": "2018-09-13T13:18:02+00:00" + } + ], + "federal_register_documents": [], + "related_search_terms": [] + }' + http_version: + recorded_at: Fri, 12 Oct 2018 19:54:55 GMT recorded_with: VCR 3.0.3 diff --git a/spec/support/vcr_cassettes/search/page_1.yml b/spec/support/vcr_cassettes/search/page_1.yml index cd06f5a625..1ee4fb5d05 100644 --- a/spec/support/vcr_cassettes/search/page_1.yml +++ b/spec/support/vcr_cassettes/search/page_1.yml @@ -140,4 +140,144 @@ http_interactions: }' http_version: recorded_at: Mon, 15 Oct 2018 10:31:33 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=TESTKEY&affiliate=va&limit=10&offset=0&query=benefits + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 200 + message: OK + headers: + Access-Control-Allow-Origin: + - "*" + Cache-Control: + - max-age=0, private, must-revalidate + Content-Type: + - application/json; charset=utf-8 + Date: + - Mon, 15 Oct 2018 10:31:33 GMT + Etag: + - W/"bd8e7b1d03a42ed35caf97044e477593" + Server: + - Apache + Status: + - 200 OK + Strict-Transport-Security: + - max-age=31536000; includeSubdomains; preload + - max-age=31536000; includeSubdomains; preload + Via: + - 1.1 proxy2.us-east-1.prod.infr.search.usa.gov:8443 + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Request-Id: + - d7a4dc39-3eca-4005-97e1-8cd668fac5a6 + X-Xss-Protection: + - 1; mode=block + Content-Length: + - '6776' + Connection: + - keep-alive + body: + encoding: ASCII-8BIT + string: '{ + "query": "benefits", + "web": { + "total": 85, + "next_offset": 10, + "spelling_correction": null, + "results": + [{ + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1995/introduction", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Manage your health & benefits Find VA locations Home Education Apply for Education...Education Benefits Manage your education benefits Equal to VA Form 22-1995 (Request", + "publication_date": null + }, + { + "title": "Education Benefits", + "url": "https://www.vets.gov/education/", + "snippet": "Find out which VA education benefits you may qualify for through the GI Bill...Education Benefits We offer Veterans, Servicemembers, and their families education...education benefits like help paying tuition, help finding the right school or", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1995/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/5490/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/5495/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990N/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990/introduction", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990E", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990E/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }] + }, + "text_best_bets": [], + "graphic_best_bets": [], + "health_topics": [], + "job_openings": [], + "recent_tweets": [ + { + "text": "What is VA compensation? Many people don’t fully understand the intent, purpose, or process behind this benefit. He… https://t.co/3OWDjaEqh6", + "url": "https://twitter.com/VAVetBenefits/status/1040228111646949377", + "name": "Veterans Benefits", + "screen_name": "VAVetBenefits", + "profile_image_url": "https://pbs.twimg.com/profile_images/344513261572743396/a9fcce7feb947b2ec498491c6c6d6985_normal.png", + "created_at": "2018-09-13T13:18:02+00:00" + } + ], + "federal_register_documents": [], + "related_search_terms": [] + }' + http_version: + recorded_at: Tue, 17 Sep 2024 22:20:33 GMT recorded_with: VCR 3.0.3 diff --git a/spec/support/vcr_cassettes/search/page_2.yml b/spec/support/vcr_cassettes/search/page_2.yml index 272cfafedb..e107fc9e92 100644 --- a/spec/support/vcr_cassettes/search/page_2.yml +++ b/spec/support/vcr_cassettes/search/page_2.yml @@ -140,4 +140,144 @@ http_interactions: }' http_version: recorded_at: Fri, 12 Oct 2018 19:43:11 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=TESTKEY&affiliate=va&limit=10&offset=10&query=benefits + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 200 + message: OK + headers: + Access-Control-Allow-Origin: + - "*" + Cache-Control: + - max-age=0, private, must-revalidate + Content-Type: + - application/json; charset=utf-8 + Date: + - Fri, 12 Oct 2018 19:43:11 GMT + Etag: + - W/"fcaa27d61a23cda72af15458e243d7cb" + Server: + - Apache + Status: + - 200 OK + Strict-Transport-Security: + - max-age=31536000; includeSubdomains; preload + - max-age=31536000; includeSubdomains; preload + Via: + - 1.1 proxy1.us-east-1.prod.infr.search.usa.gov:8443 + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Request-Id: + - 04d4802d-5352-4f56-aa07-bbd64fa9c7a9 + X-Xss-Protection: + - 1; mode=block + Content-Length: + - '6463' + Connection: + - keep-alive + body: + encoding: ASCII-8BIT + string: '{ + "query": "benefits", + "web": { + "total": 85, + "next_offset": 20, + "spelling_correction": null, + "results": + [{ + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1995/introduction", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Manage your health & benefits Find VA locations Home Education Apply for Education...Education Benefits Manage your education benefits Equal to VA Form 22-1995 (Request", + "publication_date": null + }, + { + "title": "Education Benefits", + "url": "https://www.vets.gov/education/", + "snippet": "Find out which VA education benefits you may qualify for through the GI Bill...Education Benefits We offer Veterans, Servicemembers, and their families education...education benefits like help paying tuition, help finding the right school or", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1995/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/5490/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/5495/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990N/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990/introduction", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990E", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }, + { + "title": "Apply for education benefits", + "url": "https://www.vets.gov/education/apply-for-education-benefits/application/1990E/", + "snippet": "Use your VA education benefits to pay for college or training programs. Find...documents youll need to apply for benefits, and start your online application...Home Education Apply for Education Benefits Please wait while we load the application", + "publication_date": null + }] + }, + "text_best_bets": [], + "graphic_best_bets": [], + "health_topics": [], + "job_openings": [], + "recent_tweets": [ + { + "text": "What is VA compensation? Many people don’t fully understand the intent, purpose, or process behind this benefit. He… https://t.co/3OWDjaEqh6", + "url": "https://twitter.com/VAVetBenefits/status/1040228111646949377", + "name": "Veterans Benefits", + "screen_name": "VAVetBenefits", + "profile_image_url": "https://pbs.twimg.com/profile_images/344513261572743396/a9fcce7feb947b2ec498491c6c6d6985_normal.png", + "created_at": "2018-09-13T13:18:02+00:00" + } + ], + "federal_register_documents": [], + "related_search_terms": [] + }' + http_version: + recorded_at: Tue, 17 Sep 2024 22:19:11 GMT recorded_with: VCR 3.0.3 diff --git a/spec/support/vcr_cassettes/search/success.yml b/spec/support/vcr_cassettes/search/success.yml index 20758786d3..852914f5ea 100644 --- a/spec/support/vcr_cassettes/search/success.yml +++ b/spec/support/vcr_cassettes/search/success.yml @@ -56,4 +56,60 @@ http_interactions: eyJxdWVyeSI6ImJlbmVmaXRzIiwid2ViIjp7InRvdGFsIjo2NTAxMywibmV4dF9vZmZzZXQiOjEwLCJzcGVsbGluZ19jb3JyZWN0aW9uIjpudWxsLCJyZXN1bHRzIjpbeyJ0aXRsZSI6IlZldGVyYW5zIO6AgEJlbmVmaXRz7oCBIEFkbWluaXN0cmF0aW9uIEhvbWUiLCJ1cmwiOiJodHRwczovL2JlbmVmaXRzLnZhLmdvdi9iZW5lZml0cy8iLCJzbmlwcGV0IjoiVmV0ZXJhbnMg7oCAQmVuZWZpdHPugIEgQWRtaW5pc3RyYXRpb24gcHJvdmlkZXMgZmluYW5jaWFsIGFuZCBvdGhlciBmb3JtcyBvZiBhc3Npc3RhbmNlLi4uZGVwZW5kZW50cy4gVGhpcyBwYWdlIHByb3ZpZGVzIGxpbmtzIHRvIO6AgGJlbmVmaXTugIEgaW5mb3JtYXRpb24gYW5kIHNlcnZpY2VzLi4uLmV4cGFuZCBhIG1haW4gbWVudSBvcHRpb24gKEhlYWx0aCwg7oCAQmVuZWZpdHPugIEsIGV0YykuIDMuIFRvIGVudGVyIGFuZCBhY3RpdmF0ZSB0aGUuLi5EYXRlcyBGdWxseSBEZXZlbG9wZWQgQ2xhaW1zIEFwcGx5IO6AgEJlbmVmaXTugIEgUmF0ZXMgQWRkIGEgRGVwZW5kZW50IEVkdWNhdGlvbiAmIiwicHVibGljYXRpb25fZGF0ZSI6bnVsbH0seyJ0aXRsZSI6Ik1hbmFnZSBZb3VyIENvbXBlbnNhdGlvbiDugIBCZW5lZml0c+6AgSAtIFZBL0RvRCBlQmVuZWZpdHMiLCJ1cmwiOiJodHRwczovL3d3dy5lYmVuZWZpdHMudmEuZ292L2ViZW5lZml0cy9tYW5hZ2UvY29tcGVuc2F0aW9uIiwic25pcHBldCI6Ii4uLnN0YXJ0cyBoZXJlLiBNYW5hZ2UgWW91ciBDb21wZW5zYXRpb24g7oCAQmVuZWZpdHPugIEgQ29tcGVuc2F0aW9uIENsYWltIFN0YXR1cyBDaGVjayB0aGUuLi5pbmZvcm1hdGlvbiBmb3IgeW91ciBWQSBjb21wZW5zYXRpb24g7oCAYmVuZWZpdHPugIEuIG15UGF5IERGQVMgbXlQYXkgc2luZ2xlIHNpZ24gb24gZnJvbSIsInB1YmxpY2F0aW9uX2RhdGUiOm51bGx9LHsidGl0bGUiOiJWQSDugIBiZW5lZml0c+6AgSBmb3Igc3BvdXNlcywgZGVwZW5kZW50cywgc3Vydml2b3JzLCBhbmQgZmFtaWx5IGNhcmVnaXZlcnMgfCBWZXRlcmFucyBBZmZhaXJzIiwidXJsIjoiaHR0cHM6Ly93d3cudmEuZ292L2ZhbWlseS1tZW1iZXItYmVuZWZpdHMvIiwic25pcHBldCI6IkxlYXJuIGFib3V0IFZBIO6AgGJlbmVmaXRz7oCBIGZvciBzcG91c2VzLCBkZXBlbmRlbnRzLCBzdXJ2aXZvcnMsIGFuZCBmYW1pbHkgY2FyZWdpdmVycy4uLlZBIO6AgGJlbmVmaXRz7oCBIGZvciBzcG91c2VzLCBkZXBlbmRlbnRzLCBzdXJ2aXZvcnMsIGFuZCBmYW1pbHkgY2FyZWdpdmVycyBBcyB0aGUuLi5tZW1iZXIsIHlvdSBtYXkgcXVhbGlmeSBmb3IgY2VydGFpbiDugIBiZW5lZml0c+6AgSwgbGlrZSBoZWFsdGggY2FyZSwgbGlmZSBpbnN1cmFuY2UiLCJwdWJsaWNhdGlvbl9kYXRlIjoiMjAxOS0wOS0yMyJ9LHsidGl0bGUiOiJEb3dubG9hZCBWQSDugIBiZW5lZml07oCBIGxldHRlcnMgfCBWZXRlcmFucyBBZmZhaXJzIiwidXJsIjoiaHR0cHM6Ly93d3cudmEuZ292L3JlY29yZHMvZG93bmxvYWQtdmEtbGV0dGVycy8iLCJzbmlwcGV0IjoiRG93bmxvYWQgeW91ciBWQSDugIBCZW5lZml07oCBIFN1bW1hcnkgTGV0dGVyIChzb21ldGltZXMgY2FsbGVkIGEgVkEgYXdhcmQgbGV0dGVyKS4uLmxldHRlcikgYW5kIG90aGVyIO6AgGJlbmVmaXTugIEgbGV0dGVycyBhbmQgZG9jdW1lbnRzIG9ubGluZS4uLi5zZWN0aW9uIERvd25sb2FkIFZBIO6AgGJlbmVmaXTugIEgbGV0dGVycyBUbyByZWNlaXZlIHNvbWUg7oCAYmVuZWZpdHPugIEsIFZldGVyYW5zIG5lZWQgYSBsZXR0ZXIuLi5zdGF0dXMuIEFjY2VzcyBhbmQgZG93bmxvYWQgeW91ciBWQSDugIBCZW5lZml07oCBIFN1bW1hcnkgTGV0dGVyIChzb21ldGltZXMgY2FsbGVkIGEiLCJwdWJsaWNhdGlvbl9kYXRlIjoiMjAxOS0wOC0yNyJ9LHsidGl0bGUiOiJWQS5nb3YgSG9tZSB8IFZldGVyYW5zIEFmZmFpcnMiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvIiwic25pcHBldCI6IkFwcGx5IGZvciBhbmQgbWFuYWdlIHRoZSBWQSDugIBiZW5lZml0c+6AgSBhbmQgc2VydmljZXMgeW914oCZdmUgZWFybmVkIGFzIGEgVmV0ZXJhbi4uLkFjY2VzcyBhbmQgbWFuYWdlIHlvdXIgVkEg7oCAYmVuZWZpdHPugIEgYW5kIGhlYWx0aCBjYXJlIEhlYWx0aCBjYXJlIFJlZmlsbCBhbmQgdHJhY2suLi5FZHVjYXRpb24gQ2hlY2sgeW91ciBQb3N0LTkvMTEgR0kgQmlsbMKuIO6AgGJlbmVmaXRz7oCBIFZpZXcgeW91ciBwYXltZW50IGhpc3RvcnkgQ2hhbmdlIHlvdXIiLCJwdWJsaWNhdGlvbl9kYXRlIjpudWxsfSx7InRpdGxlIjoiVkEgQWlkIGFuZCBBdHRlbmRhbmNlIO6AgGJlbmVmaXRz7oCBIGFuZCBIb3VzZWJvdW5kIGFsbG93YW5jZSB8IFZldGVyYW5zIEFmZmFpcnMiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvcGVuc2lvbi9haWQtYXR0ZW5kYW5jZS1ob3VzZWJvdW5kLyIsInNuaXBwZXQiOiJBaWQgYW5kIEF0dGVuZGFuY2Ugb3IgSG91c2Vib3VuZCDugIBiZW5lZml0c+6AgSBmb3IgVmV0ZXJhbnMgYW5kIHN1cnZpdmluZyBzcG91c2VzLi4udGhpcyBzZWN0aW9uIFZBIEFpZCBhbmQgQXR0ZW5kYW5jZSDugIBiZW5lZml0c+6AgSBhbmQgSG91c2Vib3VuZCBhbGxvd2FuY2UgVkEgQWlkIGFuZC4uLmFuZCBBdHRlbmRhbmNlIG9yIEhvdXNlYm91bmQg7oCAYmVuZWZpdHPugIEgcHJvdmlkZSBtb250aGx5IHBheW1lbnRzIGFkZGVkIHRvIHRoZSBhbW91bnQiLCJwdWJsaWNhdGlvbl9kYXRlIjoiMjAxOS0wOC0wOCJ9LHsidGl0bGUiOiJDSEFNUFZBIO6AgGJlbmVmaXRz7oCBIHwgVmV0ZXJhbnMgQWZmYWlycyIsInVybCI6Imh0dHBzOi8vd3d3LnZhLmdvdi9oZWFsdGgtY2FyZS9mYW1pbHktY2FyZWdpdmVyLWJlbmVmaXRzL2NoYW1wdmEvIiwic25pcHBldCI6IkxlYXJuIGFib3V0IENIQU1QVkEg7oCAYmVuZWZpdHPugIEsIHdoaWNoIGNvdmVyIHRoZSBjb3N0IG9mIGhlYWx0aCBjYXJlIGZvciB0aGUgc3BvdXNlLi4uTW9yZSBpbiB0aGlzIHNlY3Rpb24gQ0hBTVBWQSDugIBiZW5lZml0c+6AgSBBcmUgeW91IHRoZSBzcG91c2Ugb3Igc3Vydml2aW5nIHNwb3VzZS4uLnNlcnZpY2UtY29ubmVjdGVkIGRpc2FiaWxpdHkgYnkgYSBWQSByZWdpb25hbCDugIBiZW5lZml07oCBIG9mZmljZSwgb3IgVGhlIHN1cnZpdmluZyBzcG91c2Ugb3IiLCJwdWJsaWNhdGlvbl9kYXRlIjoiMjAxOS0wNi0xNCJ9LHsidGl0bGUiOiJWZXRlcmFucyBIZWFsdGgg7oCAQmVuZWZpdHPugIEgSGFuZGJvb2sgLSBIZWFsdGgg7oCAQmVuZWZpdHPugIEiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvaGVhbHRoYmVuZWZpdHMvdmhiaC8iLCJzbmlwcGV0IjoiQXBwbHkgZm9yIGFuZCBtYW5hZ2UgdGhlIFZBIO6AgGJlbmVmaXRz7oCBIGFuZCBzZXJ2aWNlcyB5b3XigJl2ZSBlYXJuZWQgYXMgYSBWZXRlcmFuLi4uZXhwYW5kIGEgbWFpbiBtZW51IG9wdGlvbiAoSGVhbHRoLCDugIBCZW5lZml0c+6AgSwgZXRjKS4gMy4gVG8gZW50ZXIgYW5kIGFjdGl2YXRlIHRoZS4uLmFuZCBDbGluaWNzIFZldCBDZW50ZXJzIFJlZ2lvbmFsIO6AgEJlbmVmaXRz7oCBIE9mZmljZXMgUmVnaW9uYWwgTG9hbiBDZW50ZXJzIENlbWV0ZXJ5IiwicHVibGljYXRpb25fZGF0ZSI6bnVsbH0seyJ0aXRsZSI6IkZlZGVyYWwg7oCAQmVuZWZpdHPugIEgZm9yIFZldGVyYW5zLCBEZXBlbmRlbnRzIGFuZCBTdXJ2aXZvcnMgLSBPZmZpY2Ugb2YgUHVibGljIGFuZCBJbnRlcmdvdmVybm1lbnRhbCBBZmZhaXJzIiwidXJsIjoiaHR0cHM6Ly93d3cudmEuZ292L29wYS9wdWJsaWNhdGlvbnMvYmVuZWZpdHNfYm9vay5hc3AiLCJzbmlwcGV0IjoiQXBwbHkgZm9yIGFuZCBtYW5hZ2UgdGhlIFZBIO6AgGJlbmVmaXRz7oCBIGFuZCBzZXJ2aWNlcyB5b3XigJl2ZSBlYXJuZWQgYXMgYSBWZXRlcmFuLi4uZXhwYW5kIGEgbWFpbiBtZW51IG9wdGlvbiAoSGVhbHRoLCDugIBCZW5lZml0c+6AgSwgZXRjKS4gMy4gVG8gZW50ZXIgYW5kIGFjdGl2YXRlIHRoZS4uLmFuZCBDbGluaWNzIFZldCBDZW50ZXJzIFJlZ2lvbmFsIO6AgEJlbmVmaXRz7oCBIE9mZmljZXMgUmVnaW9uYWwgTG9hbiBDZW50ZXJzIENlbWV0ZXJ5IiwicHVibGljYXRpb25fZGF0ZSI6bnVsbH0seyJ0aXRsZSI6IkNvbXBlbnNhdGlvbiAtIFZBL0RvRCBlQmVuZWZpdHMiLCJ1cmwiOiJodHRwczovL3d3dy5lYmVuZWZpdHMudmEuZ292L2ViZW5lZml0cy9sZWFybi9jb21wZW5zYXRpb24iLCJzbmlwcGV0IjoiLi4uIFlvdSBtYXkgYmUgZWxpZ2libGUgZm9yIG1vbnRobHkg7oCAYmVuZWZpdHPugIEgbm8gbWF0dGVyIHdoZW4gb3Igd2hlcmUgeW91IHNlcnZlZC4uLnNlcnZpY2UuIExlYXJuIE1vcmUgQWJvdXQgQ29tcGVuc2F0aW9uIO6AgEJlbmVmaXRz7oCBIFJlYWQgYW4gb3ZlcnZpZXcgb2YgZGlzYWJpbGl0eSBjb21wZW5zYXRpb24iLCJwdWJsaWNhdGlvbl9kYXRlIjpudWxsfV19LCJ0ZXh0X2Jlc3RfYmV0cyI6W3siaWQiOjE0MTk0MiwidGl0bGUiOiJWQSBIb21lIFBhZ2UiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvIiwiZGVzY3JpcHRpb24iOiJFeHBsb3JlLCBhY2Nlc3MsIGFuZCBtYW5hZ2UgeW91ciBWQSDugIBiZW5lZml0c+6AgSBhbmQgaGVhbHRoIGNhcmUuIn0seyJpZCI6MTM5OTY3LCJ0aXRsZSI6IkNIQU1QVkEg7oCAQmVuZWZpdHPugIEiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvaGVhbHRoLWNhcmUvZmFtaWx5LWNhcmVnaXZlci1iZW5lZml0cy9jaGFtcHZhLyIsImRlc2NyaXB0aW9uIjoiQ0hBTVBWQSDugIBiZW5lZml0c+6AgSBjb3ZlciB0aGUgY29zdCBvZiBoZWFsdGggY2FyZSBmb3IgdGhlIHNwb3VzZSwgc3Vydml2aW5nIHNwb3VzZSwgb3IgY2hpbGQgb2YgYSBWZXRlcmFuIHdobyBoYXMgZGlzYWJpbGl0aWVzIG9yIHdobyBpcyBkZWNlYXNlZC4ifV0sImdyYXBoaWNfYmVzdF9iZXRzIjpbXSwiaGVhbHRoX3RvcGljcyI6W10sImpvYl9vcGVuaW5ncyI6W10sInJlY2VudF90d2VldHMiOlt7InRleHQiOiJTaG9ydC1zdGF5IGtuZWUgc3VyZ2VyeSBoYXMgbG9uZy10ZXJtIO6AgGJlbmVmaXTugIEgZm9yIFZldGVyYW4gaHR0cHM6Ly90LmNvL3pNNXVYaXFKWjEgdmlhICNWQW50YWdlUG9pbnQiLCJ1cmwiOiJodHRwczovL3R3aXR0ZXIuY29tL0RlcHRWZXRBZmZhaXJzL3N0YXR1cy8xMjA3MzIyMTU0NzEyMzUwNzIwIiwibmFtZSI6IlZldGVyYW5zIEFmZmFpcnMiLCJzY3JlZW5fbmFtZSI6IkRlcHRWZXRBZmZhaXJzIiwicHJvZmlsZV9pbWFnZV91cmwiOiJodHRwczovL3Bicy50d2ltZy5jb20vcHJvZmlsZV9pbWFnZXMvMzQ0NTEzMjYxNTY1OTg0NDU1L2E5ZmNjZTdmZWI5NDdiMmVjNDk4NDkxYzZjNmQ2OTg1X25vcm1hbC5wbmciLCJjcmVhdGVkX2F0IjoiMjAxOS0xMi0xOFQxNTozMDowNyswMDowMCJ9XSwiZmVkZXJhbF9yZWdpc3Rlcl9kb2N1bWVudHMiOltdLCJyZWxhdGVkX3NlYXJjaF90ZXJtcyI6W119 http_version: recorded_at: Fri, 20 Dec 2019 04:59:46 GMT +- request: + method: get + uri: https://api.gsa.gov/technology/searchgov/v2/results/i14y?access_key=TESTKEY&affiliate=va&limit=10&offset=0&query=benefits + body: + encoding: US-ASCII + string: '' + headers: + Accept: + - application/json + Content-Type: + - application/json + User-Agent: + - Vets.gov Agent + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + response: + status: + code: 200 + message: OK + headers: + Access-Control-Allow-Origin: + - "*" + Cache-Control: + - max-age=0, private, must-revalidate + Content-Type: + - application/json; charset=utf-8 + Date: + - Fri, 20 Dec 2019 04:59:46 GMT + Etag: + - W/"e42883851e20d6878846d7272e35f530" + Server: + - Apache + Status: + - 200 OK + Strict-Transport-Security: + - max-age=31536000; includeSubdomains; preload + Via: + - 1.1 proxy3.us-east-1.prod.infr.search.usa.gov:8443 + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Request-Id: + - 0fa51ee5-8a24-4244-9f03-ea94bbf368be + X-Xss-Protection: + - 1; mode=block + Content-Length: + - '5406' + Connection: + - keep-alive + body: + encoding: ASCII-8BIT + string: !binary |- + eyJxdWVyeSI6ImJlbmVmaXRzIiwid2ViIjp7InRvdGFsIjo2NTAxMywibmV4dF9vZmZzZXQiOjEwLCJzcGVsbGluZ19jb3JyZWN0aW9uIjpudWxsLCJyZXN1bHRzIjpbeyJ0aXRsZSI6IlZldGVyYW5zIO6AgEJlbmVmaXRz7oCBIEFkbWluaXN0cmF0aW9uIEhvbWUiLCJ1cmwiOiJodHRwczovL2JlbmVmaXRzLnZhLmdvdi9iZW5lZml0cy8iLCJzbmlwcGV0IjoiVmV0ZXJhbnMg7oCAQmVuZWZpdHPugIEgQWRtaW5pc3RyYXRpb24gcHJvdmlkZXMgZmluYW5jaWFsIGFuZCBvdGhlciBmb3JtcyBvZiBhc3Npc3RhbmNlLi4uZGVwZW5kZW50cy4gVGhpcyBwYWdlIHByb3ZpZGVzIGxpbmtzIHRvIO6AgGJlbmVmaXTugIEgaW5mb3JtYXRpb24gYW5kIHNlcnZpY2VzLi4uLmV4cGFuZCBhIG1haW4gbWVudSBvcHRpb24gKEhlYWx0aCwg7oCAQmVuZWZpdHPugIEsIGV0YykuIDMuIFRvIGVudGVyIGFuZCBhY3RpdmF0ZSB0aGUuLi5EYXRlcyBGdWxseSBEZXZlbG9wZWQgQ2xhaW1zIEFwcGx5IO6AgEJlbmVmaXTugIEgUmF0ZXMgQWRkIGEgRGVwZW5kZW50IEVkdWNhdGlvbiAmIiwicHVibGljYXRpb25fZGF0ZSI6bnVsbH0seyJ0aXRsZSI6Ik1hbmFnZSBZb3VyIENvbXBlbnNhdGlvbiDugIBCZW5lZml0c+6AgSAtIFZBL0RvRCBlQmVuZWZpdHMiLCJ1cmwiOiJodHRwczovL3d3dy5lYmVuZWZpdHMudmEuZ292L2ViZW5lZml0cy9tYW5hZ2UvY29tcGVuc2F0aW9uIiwic25pcHBldCI6Ii4uLnN0YXJ0cyBoZXJlLiBNYW5hZ2UgWW91ciBDb21wZW5zYXRpb24g7oCAQmVuZWZpdHPugIEgQ29tcGVuc2F0aW9uIENsYWltIFN0YXR1cyBDaGVjayB0aGUuLi5pbmZvcm1hdGlvbiBmb3IgeW91ciBWQSBjb21wZW5zYXRpb24g7oCAYmVuZWZpdHPugIEuIG15UGF5IERGQVMgbXlQYXkgc2luZ2xlIHNpZ24gb24gZnJvbSIsInB1YmxpY2F0aW9uX2RhdGUiOm51bGx9LHsidGl0bGUiOiJWQSDugIBiZW5lZml0c+6AgSBmb3Igc3BvdXNlcywgZGVwZW5kZW50cywgc3Vydml2b3JzLCBhbmQgZmFtaWx5IGNhcmVnaXZlcnMgfCBWZXRlcmFucyBBZmZhaXJzIiwidXJsIjoiaHR0cHM6Ly93d3cudmEuZ292L2ZhbWlseS1tZW1iZXItYmVuZWZpdHMvIiwic25pcHBldCI6IkxlYXJuIGFib3V0IFZBIO6AgGJlbmVmaXRz7oCBIGZvciBzcG91c2VzLCBkZXBlbmRlbnRzLCBzdXJ2aXZvcnMsIGFuZCBmYW1pbHkgY2FyZWdpdmVycy4uLlZBIO6AgGJlbmVmaXRz7oCBIGZvciBzcG91c2VzLCBkZXBlbmRlbnRzLCBzdXJ2aXZvcnMsIGFuZCBmYW1pbHkgY2FyZWdpdmVycyBBcyB0aGUuLi5tZW1iZXIsIHlvdSBtYXkgcXVhbGlmeSBmb3IgY2VydGFpbiDugIBiZW5lZml0c+6AgSwgbGlrZSBoZWFsdGggY2FyZSwgbGlmZSBpbnN1cmFuY2UiLCJwdWJsaWNhdGlvbl9kYXRlIjoiMjAxOS0wOS0yMyJ9LHsidGl0bGUiOiJEb3dubG9hZCBWQSDugIBiZW5lZml07oCBIGxldHRlcnMgfCBWZXRlcmFucyBBZmZhaXJzIiwidXJsIjoiaHR0cHM6Ly93d3cudmEuZ292L3JlY29yZHMvZG93bmxvYWQtdmEtbGV0dGVycy8iLCJzbmlwcGV0IjoiRG93bmxvYWQgeW91ciBWQSDugIBCZW5lZml07oCBIFN1bW1hcnkgTGV0dGVyIChzb21ldGltZXMgY2FsbGVkIGEgVkEgYXdhcmQgbGV0dGVyKS4uLmxldHRlcikgYW5kIG90aGVyIO6AgGJlbmVmaXTugIEgbGV0dGVycyBhbmQgZG9jdW1lbnRzIG9ubGluZS4uLi5zZWN0aW9uIERvd25sb2FkIFZBIO6AgGJlbmVmaXTugIEgbGV0dGVycyBUbyByZWNlaXZlIHNvbWUg7oCAYmVuZWZpdHPugIEsIFZldGVyYW5zIG5lZWQgYSBsZXR0ZXIuLi5zdGF0dXMuIEFjY2VzcyBhbmQgZG93bmxvYWQgeW91ciBWQSDugIBCZW5lZml07oCBIFN1bW1hcnkgTGV0dGVyIChzb21ldGltZXMgY2FsbGVkIGEiLCJwdWJsaWNhdGlvbl9kYXRlIjoiMjAxOS0wOC0yNyJ9LHsidGl0bGUiOiJWQS5nb3YgSG9tZSB8IFZldGVyYW5zIEFmZmFpcnMiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvIiwic25pcHBldCI6IkFwcGx5IGZvciBhbmQgbWFuYWdlIHRoZSBWQSDugIBiZW5lZml0c+6AgSBhbmQgc2VydmljZXMgeW914oCZdmUgZWFybmVkIGFzIGEgVmV0ZXJhbi4uLkFjY2VzcyBhbmQgbWFuYWdlIHlvdXIgVkEg7oCAYmVuZWZpdHPugIEgYW5kIGhlYWx0aCBjYXJlIEhlYWx0aCBjYXJlIFJlZmlsbCBhbmQgdHJhY2suLi5FZHVjYXRpb24gQ2hlY2sgeW91ciBQb3N0LTkvMTEgR0kgQmlsbMKuIO6AgGJlbmVmaXRz7oCBIFZpZXcgeW91ciBwYXltZW50IGhpc3RvcnkgQ2hhbmdlIHlvdXIiLCJwdWJsaWNhdGlvbl9kYXRlIjpudWxsfSx7InRpdGxlIjoiVkEgQWlkIGFuZCBBdHRlbmRhbmNlIO6AgGJlbmVmaXRz7oCBIGFuZCBIb3VzZWJvdW5kIGFsbG93YW5jZSB8IFZldGVyYW5zIEFmZmFpcnMiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvcGVuc2lvbi9haWQtYXR0ZW5kYW5jZS1ob3VzZWJvdW5kLyIsInNuaXBwZXQiOiJBaWQgYW5kIEF0dGVuZGFuY2Ugb3IgSG91c2Vib3VuZCDugIBiZW5lZml0c+6AgSBmb3IgVmV0ZXJhbnMgYW5kIHN1cnZpdmluZyBzcG91c2VzLi4udGhpcyBzZWN0aW9uIFZBIEFpZCBhbmQgQXR0ZW5kYW5jZSDugIBiZW5lZml0c+6AgSBhbmQgSG91c2Vib3VuZCBhbGxvd2FuY2UgVkEgQWlkIGFuZC4uLmFuZCBBdHRlbmRhbmNlIG9yIEhvdXNlYm91bmQg7oCAYmVuZWZpdHPugIEgcHJvdmlkZSBtb250aGx5IHBheW1lbnRzIGFkZGVkIHRvIHRoZSBhbW91bnQiLCJwdWJsaWNhdGlvbl9kYXRlIjoiMjAxOS0wOC0wOCJ9LHsidGl0bGUiOiJDSEFNUFZBIO6AgGJlbmVmaXRz7oCBIHwgVmV0ZXJhbnMgQWZmYWlycyIsInVybCI6Imh0dHBzOi8vd3d3LnZhLmdvdi9oZWFsdGgtY2FyZS9mYW1pbHktY2FyZWdpdmVyLWJlbmVmaXRzL2NoYW1wdmEvIiwic25pcHBldCI6IkxlYXJuIGFib3V0IENIQU1QVkEg7oCAYmVuZWZpdHPugIEsIHdoaWNoIGNvdmVyIHRoZSBjb3N0IG9mIGhlYWx0aCBjYXJlIGZvciB0aGUgc3BvdXNlLi4uTW9yZSBpbiB0aGlzIHNlY3Rpb24gQ0hBTVBWQSDugIBiZW5lZml0c+6AgSBBcmUgeW91IHRoZSBzcG91c2Ugb3Igc3Vydml2aW5nIHNwb3VzZS4uLnNlcnZpY2UtY29ubmVjdGVkIGRpc2FiaWxpdHkgYnkgYSBWQSByZWdpb25hbCDugIBiZW5lZml07oCBIG9mZmljZSwgb3IgVGhlIHN1cnZpdmluZyBzcG91c2Ugb3IiLCJwdWJsaWNhdGlvbl9kYXRlIjoiMjAxOS0wNi0xNCJ9LHsidGl0bGUiOiJWZXRlcmFucyBIZWFsdGgg7oCAQmVuZWZpdHPugIEgSGFuZGJvb2sgLSBIZWFsdGgg7oCAQmVuZWZpdHPugIEiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvaGVhbHRoYmVuZWZpdHMvdmhiaC8iLCJzbmlwcGV0IjoiQXBwbHkgZm9yIGFuZCBtYW5hZ2UgdGhlIFZBIO6AgGJlbmVmaXRz7oCBIGFuZCBzZXJ2aWNlcyB5b3XigJl2ZSBlYXJuZWQgYXMgYSBWZXRlcmFuLi4uZXhwYW5kIGEgbWFpbiBtZW51IG9wdGlvbiAoSGVhbHRoLCDugIBCZW5lZml0c+6AgSwgZXRjKS4gMy4gVG8gZW50ZXIgYW5kIGFjdGl2YXRlIHRoZS4uLmFuZCBDbGluaWNzIFZldCBDZW50ZXJzIFJlZ2lvbmFsIO6AgEJlbmVmaXRz7oCBIE9mZmljZXMgUmVnaW9uYWwgTG9hbiBDZW50ZXJzIENlbWV0ZXJ5IiwicHVibGljYXRpb25fZGF0ZSI6bnVsbH0seyJ0aXRsZSI6IkZlZGVyYWwg7oCAQmVuZWZpdHPugIEgZm9yIFZldGVyYW5zLCBEZXBlbmRlbnRzIGFuZCBTdXJ2aXZvcnMgLSBPZmZpY2Ugb2YgUHVibGljIGFuZCBJbnRlcmdvdmVybm1lbnRhbCBBZmZhaXJzIiwidXJsIjoiaHR0cHM6Ly93d3cudmEuZ292L29wYS9wdWJsaWNhdGlvbnMvYmVuZWZpdHNfYm9vay5hc3AiLCJzbmlwcGV0IjoiQXBwbHkgZm9yIGFuZCBtYW5hZ2UgdGhlIFZBIO6AgGJlbmVmaXRz7oCBIGFuZCBzZXJ2aWNlcyB5b3XigJl2ZSBlYXJuZWQgYXMgYSBWZXRlcmFuLi4uZXhwYW5kIGEgbWFpbiBtZW51IG9wdGlvbiAoSGVhbHRoLCDugIBCZW5lZml0c+6AgSwgZXRjKS4gMy4gVG8gZW50ZXIgYW5kIGFjdGl2YXRlIHRoZS4uLmFuZCBDbGluaWNzIFZldCBDZW50ZXJzIFJlZ2lvbmFsIO6AgEJlbmVmaXRz7oCBIE9mZmljZXMgUmVnaW9uYWwgTG9hbiBDZW50ZXJzIENlbWV0ZXJ5IiwicHVibGljYXRpb25fZGF0ZSI6bnVsbH0seyJ0aXRsZSI6IkNvbXBlbnNhdGlvbiAtIFZBL0RvRCBlQmVuZWZpdHMiLCJ1cmwiOiJodHRwczovL3d3dy5lYmVuZWZpdHMudmEuZ292L2ViZW5lZml0cy9sZWFybi9jb21wZW5zYXRpb24iLCJzbmlwcGV0IjoiLi4uIFlvdSBtYXkgYmUgZWxpZ2libGUgZm9yIG1vbnRobHkg7oCAYmVuZWZpdHPugIEgbm8gbWF0dGVyIHdoZW4gb3Igd2hlcmUgeW91IHNlcnZlZC4uLnNlcnZpY2UuIExlYXJuIE1vcmUgQWJvdXQgQ29tcGVuc2F0aW9uIO6AgEJlbmVmaXRz7oCBIFJlYWQgYW4gb3ZlcnZpZXcgb2YgZGlzYWJpbGl0eSBjb21wZW5zYXRpb24iLCJwdWJsaWNhdGlvbl9kYXRlIjpudWxsfV19LCJ0ZXh0X2Jlc3RfYmV0cyI6W3siaWQiOjE0MTk0MiwidGl0bGUiOiJWQSBIb21lIFBhZ2UiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvIiwiZGVzY3JpcHRpb24iOiJFeHBsb3JlLCBhY2Nlc3MsIGFuZCBtYW5hZ2UgeW91ciBWQSDugIBiZW5lZml0c+6AgSBhbmQgaGVhbHRoIGNhcmUuIn0seyJpZCI6MTM5OTY3LCJ0aXRsZSI6IkNIQU1QVkEg7oCAQmVuZWZpdHPugIEiLCJ1cmwiOiJodHRwczovL3d3dy52YS5nb3YvaGVhbHRoLWNhcmUvZmFtaWx5LWNhcmVnaXZlci1iZW5lZml0cy9jaGFtcHZhLyIsImRlc2NyaXB0aW9uIjoiQ0hBTVBWQSDugIBiZW5lZml0c+6AgSBjb3ZlciB0aGUgY29zdCBvZiBoZWFsdGggY2FyZSBmb3IgdGhlIHNwb3VzZSwgc3Vydml2aW5nIHNwb3VzZSwgb3IgY2hpbGQgb2YgYSBWZXRlcmFuIHdobyBoYXMgZGlzYWJpbGl0aWVzIG9yIHdobyBpcyBkZWNlYXNlZC4ifV0sImdyYXBoaWNfYmVzdF9iZXRzIjpbXSwiaGVhbHRoX3RvcGljcyI6W10sImpvYl9vcGVuaW5ncyI6W10sInJlY2VudF90d2VldHMiOlt7InRleHQiOiJTaG9ydC1zdGF5IGtuZWUgc3VyZ2VyeSBoYXMgbG9uZy10ZXJtIO6AgGJlbmVmaXTugIEgZm9yIFZldGVyYW4gaHR0cHM6Ly90LmNvL3pNNXVYaXFKWjEgdmlhICNWQW50YWdlUG9pbnQiLCJ1cmwiOiJodHRwczovL3R3aXR0ZXIuY29tL0RlcHRWZXRBZmZhaXJzL3N0YXR1cy8xMjA3MzIyMTU0NzEyMzUwNzIwIiwibmFtZSI6IlZldGVyYW5zIEFmZmFpcnMiLCJzY3JlZW5fbmFtZSI6IkRlcHRWZXRBZmZhaXJzIiwicHJvZmlsZV9pbWFnZV91cmwiOiJodHRwczovL3Bicy50d2ltZy5jb20vcHJvZmlsZV9pbWFnZXMvMzQ0NTEzMjYxNTY1OTg0NDU1L2E5ZmNjZTdmZWI5NDdiMmVjNDk4NDkxYzZjNmQ2OTg1X25vcm1hbC5wbmciLCJjcmVhdGVkX2F0IjoiMjAxOS0xMi0xOFQxNTozMDowNyswMDowMCJ9XSwiZmVkZXJhbF9yZWdpc3Rlcl9kb2N1bWVudHMiOltdLCJyZWxhdGVkX3NlYXJjaF90ZXJtcyI6W119 + http_version: + recorded_at: Fri, 17 Sep 2024 21:44:46 GMT recorded_with: VCR 5.0.0 From 94233de1ea35c38da693f6b58210dae7514c5d93 Mon Sep 17 00:00:00 2001 From: Ryan McNeil Date: Fri, 20 Sep 2024 14:33:07 -0600 Subject: [PATCH 17/27] Bump google-protobuf 4.28.1 -> 4.28.2 (#18562) --- Gemfile.lock | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 80c8208c76..ed2dc30821 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -512,9 +512,14 @@ GEM thor (>= 0.20, < 2.a) google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) - google-protobuf (4.28.1) + google-protobuf (4.28.2) bigdecimal rake (>= 13) + google-protobuf (4.28.2-java) + bigdecimal + ffi (~> 1) + ffi-compiler (~> 1) + rake (>= 13) googleauth (1.11.0) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.1) From 4aafc201f041c3f37893e138a3a03f15904c15bf Mon Sep 17 00:00:00 2001 From: Gabriel Zurita Date: Fri, 20 Sep 2024 14:35:26 -0600 Subject: [PATCH 18/27] arf.93199 clean up ARP engine (#18518) * clean up ARP engine * improve ARP logging --- .../application_controller.rb | 8 +++++ .../v0/form21a_controller.rb | 22 ++++++++---- .../app/services/accreditation_service.rb | 12 ++++--- .../config/routes.rb | 7 ---- .../v0/form21a_spec.rb | 34 ++++++++++++++++--- .../services/accreditation_service_spec.rb | 20 ++++++++--- 6 files changed, 75 insertions(+), 28 deletions(-) diff --git a/modules/accredited_representative_portal/app/controllers/accredited_representative_portal/application_controller.rb b/modules/accredited_representative_portal/app/controllers/accredited_representative_portal/application_controller.rb index 4faeb25811..4f5072b707 100644 --- a/modules/accredited_representative_portal/app/controllers/accredited_representative_portal/application_controller.rb +++ b/modules/accredited_representative_portal/app/controllers/accredited_representative_portal/application_controller.rb @@ -9,9 +9,17 @@ class ApplicationController < SignIn::ApplicationController validates_access_token_audience Settings.sign_in.arp_client_id before_action :verify_pilot_enabled_for_user + around_action :handle_exceptions private + def handle_exceptions + yield + rescue => e + Rails.logger.error("ARP: Unexpected error occurred for user with user_uuid=#{@current_user&.uuid} - #{e.message}") + raise e + end + def verify_pilot_enabled_for_user unless Flipper.enabled?(:accredited_representative_portal_pilot, @current_user) message = 'The accredited_representative_portal_pilot feature flag is disabled ' \ diff --git a/modules/accredited_representative_portal/app/controllers/accredited_representative_portal/v0/form21a_controller.rb b/modules/accredited_representative_portal/app/controllers/accredited_representative_portal/v0/form21a_controller.rb index a1f4618aec..7c9905816f 100644 --- a/modules/accredited_representative_portal/app/controllers/accredited_representative_portal/v0/form21a_controller.rb +++ b/modules/accredited_representative_portal/app/controllers/accredited_representative_portal/v0/form21a_controller.rb @@ -12,13 +12,10 @@ class Form21aController < ApplicationController # Parses the request body and submits the form. # Renders the appropriate response based on the service's outcome. def submit - response = AccreditationService.submit_form21a(parsed_request_body) + response = AccreditationService.submit_form21a(parsed_request_body, @current_user&.uuid) InProgressForm.form_for_user(FORM_ID, @current_user)&.destroy if response.success? render_ogc_service_response(response) - rescue => e - Rails.logger.error("Form21aController: Unexpected error occurred - #{e.message}") - render json: { errors: 'Unexpected error' }, status: :internal_server_error end private @@ -30,19 +27,30 @@ def submit def parse_request_body @parsed_request_body = JSON.parse(request.raw_post) rescue JSON::ParserError - Rails.logger.error('Form21aController: Invalid JSON in request body') + Rails.logger.error( + "Form21aController: Invalid JSON in request body for user with user_uuid=#{@current_user&.uuid}" + ) render json: { errors: 'Invalid JSON' }, status: :bad_request end # Renders the response based on the service call's success or failure. def render_ogc_service_response(response) if response.success? + Rails.logger.info( + 'Form21aController: Form 21a successfully submitted to OGC service ' \ + "by user with user_uuid=#{@current_user&.uuid} - Response: #{response.body}" + ) render json: response.body, status: response.status elsif response.body.blank? - Rails.logger.info('Form21aController: Blank response from OGC service') + Rails.logger.info( + "Form21aController: Blank response from OGC service for user with user_uuid=#{@current_user&.uuid}" + ) render status: :no_content else - Rails.logger.error('Form21aController: Failed to parse response from external OGC service') + Rails.logger.error( + 'Form21aController: Failed to parse response from external OGC service ' \ + "for user with user_uuid=#{@current_user&.uuid}" + ) render json: { errors: 'Failed to parse response' }, status: :bad_gateway end end diff --git a/modules/accredited_representative_portal/app/services/accreditation_service.rb b/modules/accredited_representative_portal/app/services/accreditation_service.rb index fd0a2a7a4a..bf0b835679 100644 --- a/modules/accredited_representative_portal/app/services/accreditation_service.rb +++ b/modules/accredited_representative_portal/app/services/accreditation_service.rb @@ -8,16 +8,20 @@ class AccreditationService # self.submit_form21a(parsed_body): Submits the given parsed body as JSON to the accreditation service. # - Parameters: # - parsed_body: A Hash representing the parsed form data. + # - user_uuid: A String representing the user's UUID, which is also stored in the in_progress_forms DB entry. # - Returns: A Faraday::Response object containing the service response. - def self.submit_form21a(parsed_body) + def self.submit_form21a(parsed_body, user_uuid) + Rails.logger.info("Accreditation Service attempting submit_form21a with service_url: #{service_url}") connection.post do |req| req.body = parsed_body.to_json end rescue Faraday::ConnectionFailed => e - Rails.logger.error("Accreditation Service connection failed: #{e.message}, URL: #{service_url}") + Rails.logger.error( + "Accreditation Service connection failed for user with user_uuid=#{user_uuid}: #{e.message}, URL: #{service_url}" + ) Faraday::Response.new(status: :service_unavailable, body: { errors: 'Accreditation Service unavailable' }.to_json) rescue Faraday::TimeoutError => e - Rails.logger.error("Accreditation Service request timed out: #{e.message}") + Rails.logger.error("Accreditation Service request timed out for user with user_uuid=#{user_uuid}: #{e.message}") Faraday::Response.new(status: :request_timeout, body: { errors: 'Accreditation Service request timed out' }.to_json) end @@ -39,7 +43,7 @@ def self.service_url case Rails.env when 'development', 'test' # NOTE: the below is a temporary URL for development purposes only. - # TODO: Update this once ESECC request goes through. See: https://github.com/department-of-veterans-affairs/va.gov-team/ + # TODO: Update this once ESECC request goes through. See: https://github.com/department-of-veterans-affairs/va.gov-team/issues/88288 'http://localhost:5000/api/v1/accreditation/applications/form21a' when 'production' # TODO: Update this once MOU has been signed and the ESECC request has gone through. See: diff --git a/modules/accredited_representative_portal/config/routes.rb b/modules/accredited_representative_portal/config/routes.rb index 55381a2891..c5a94e8365 100644 --- a/modules/accredited_representative_portal/config/routes.rb +++ b/modules/accredited_representative_portal/config/routes.rb @@ -2,13 +2,6 @@ AccreditedRepresentativePortal::Engine.routes.draw do namespace :v0, defaults: { format: :json } do - resources :power_of_attorney_requests, only: [:index] do - member do - post :accept - post :decline - end - end - get 'user', to: 'representative_users#show' post 'form21a', to: 'form21a#submit' diff --git a/modules/accredited_representative_portal/spec/requests/accredited_representative_portal/v0/form21a_spec.rb b/modules/accredited_representative_portal/spec/requests/accredited_representative_portal/v0/form21a_spec.rb index 8c53592bdd..bb190cdb8c 100644 --- a/modules/accredited_representative_portal/spec/requests/accredited_representative_portal/v0/form21a_spec.rb +++ b/modules/accredited_representative_portal/spec/requests/accredited_representative_portal/v0/form21a_spec.rb @@ -16,7 +16,7 @@ context 'with valid JSON' do let!(:in_progress_form) { create(:in_progress_form, form_id: '21a', user_uuid: representative_user.uuid) } - it 'returns a successful response from the service and destroys in progress form' do + it 'logs a successful submission and destroys in-progress form' do get('/accredited_representative_portal/v0/in_progress_forms/21a') expect(response).to have_http_status(:ok) expect(parsed_response.keys).to contain_exactly('formData', 'metadata') @@ -25,6 +25,11 @@ instance_double(Faraday::Response, success?: true, body: { result: 'success' }.to_json, status: 200) ) + expect(Rails.logger).to receive(:info).with( + 'Form21aController: Form 21a successfully submitted to OGC service ' \ + "by user with user_uuid=#{representative_user.uuid} - Response: {\"result\":\"success\"}" + ) + headers = { 'Content-Type' => 'application/json' } post('/accredited_representative_portal/v0/form21a', params: valid_json, headers:) @@ -38,7 +43,11 @@ end context 'with invalid JSON' do - it 'returns a bad request status' do + it 'logs the error and returns a bad request status' do + expect(Rails.logger).to receive(:error).with( + "Form21aController: Invalid JSON in request body for user with user_uuid=#{representative_user.uuid}" + ) + headers = { 'Content-Type' => 'application/json' } post('/accredited_representative_portal/v0/form21a', params: invalid_json, headers:) @@ -48,11 +57,15 @@ end context 'when service returns a blank response' do - it 'returns no content status' do + it 'logs the error and returns no content status' do allow(AccreditationService).to receive(:submit_form21a).and_return( instance_double(Faraday::Response, success?: false, body: nil, status: 204) ) + expect(Rails.logger).to receive(:info).with( + "Form21aController: Blank response from OGC service for user with user_uuid=#{representative_user.uuid}" + ) + headers = { 'Content-Type' => 'application/json' } post('/accredited_representative_portal/v0/form21a', params: valid_json, headers:) @@ -61,12 +74,17 @@ end context 'when service fails to parse response' do - it 'returns a bad gateway status' do + it 'logs the error and returns a bad gateway status' do allow(AccreditationService).to receive(:submit_form21a).and_return( instance_double(Faraday::Response, success?: false, body: { errors: 'Failed to parse response' }.to_json, status: 502) ) + expect(Rails.logger).to receive(:error).with( + 'Form21aController: Failed to parse response from external OGC service ' \ + "for user with user_uuid=#{representative_user.uuid}" + ) + headers = { 'Content-Type' => 'application/json' } post('/accredited_representative_portal/v0/form21a', params: valid_json, headers:) @@ -76,12 +94,18 @@ end context 'when an unexpected error occurs' do - it 'returns an internal server error status' do + it 'logs the error and returns an internal server error status' do allow_any_instance_of(AccreditedRepresentativePortal::V0::Form21aController) .to receive(:parse_request_body).and_raise(StandardError, 'Unexpected error') + allow(Rails.logger).to receive(:error).and_call_original + post '/accredited_representative_portal/v0/form21a' + expect(Rails.logger).to have_received(:error).with( + "ARP: Unexpected error occurred for user with user_uuid=#{representative_user.uuid} - Unexpected error" + ) + expect(response).to have_http_status(:internal_server_error) expect(parsed_response).to match( 'errors' => [ diff --git a/modules/accredited_representative_portal/spec/services/accreditation_service_spec.rb b/modules/accredited_representative_portal/spec/services/accreditation_service_spec.rb index 9d0f7df10d..591074e8ad 100644 --- a/modules/accredited_representative_portal/spec/services/accreditation_service_spec.rb +++ b/modules/accredited_representative_portal/spec/services/accreditation_service_spec.rb @@ -6,6 +6,7 @@ RSpec.describe AccreditationService do let(:parsed_body) { { field: 'value' } } + let(:user_uuid) { 'test-user-uuid' } describe '#submit_form21a' do context 'when the request is successful' do @@ -13,7 +14,7 @@ stub_request(:post, 'http://localhost:5000/api/v1/accreditation/applications/form21a') .to_return(status: 200, body: parsed_body.to_json, headers: { 'Content-Type' => 'application/json' }) - response = described_class.submit_form21a(parsed_body) + response = described_class.submit_form21a(parsed_body, user_uuid) expect(response.status).to eq(200) expect(response.body).to eq(parsed_body.stringify_keys) @@ -21,11 +22,16 @@ end context 'when the connection fails' do - it 'returns a service unavailable status' do + it 'logs the error and returns a service unavailable status' do stub_request(:post, 'http://localhost:5000/api/v1/accreditation/applications/form21a') .to_raise(Faraday::ConnectionFailed.new('Accreditation Service connection failed')) - response = described_class.submit_form21a(parsed_body) + expect(Rails.logger).to receive(:error).with( + "Accreditation Service connection failed for user with user_uuid=#{user_uuid}: " \ + 'Accreditation Service connection failed, URL: http://localhost:5000/api/v1/accreditation/applications/form21a' + ) + + response = described_class.submit_form21a(parsed_body, user_uuid) expect(response.status).to eq(:service_unavailable) expect(JSON.parse(response.body)['errors']).to eq('Accreditation Service unavailable') @@ -33,11 +39,15 @@ end context 'when the request times out' do - it 'returns a request timeout status' do + it 'logs the error and returns a request timeout status' do stub_request(:post, 'http://localhost:5000/api/v1/accreditation/applications/form21a') .to_raise(Faraday::TimeoutError.new('Request timed out')) - response = described_class.submit_form21a(parsed_body) + expect(Rails.logger).to receive(:error).with( + "Accreditation Service request timed out for user with user_uuid=#{user_uuid}: Request timed out" + ) + + response = described_class.submit_form21a(parsed_body, user_uuid) expect(response.status).to eq(:request_timeout) expect(JSON.parse(response.body)['errors']).to eq('Accreditation Service request timed out') From 0607460f6ef551e24b494ae3a71ae532baedfd2d Mon Sep 17 00:00:00 2001 From: Jacob Penner <161746194+pennja@users.noreply.github.com> Date: Fri, 20 Sep 2024 17:09:11 -0400 Subject: [PATCH 19/27] update logic to fix bugs (#18558) --- .../s3/submission_archive_builder.rb | 29 +++++++------------ .../s3/submission_archiver.rb | 16 ++++++---- .../lib/tasks/archive_forms_by_uuid.rake | 8 ++--- .../services/s3/submission_archiver_spec.rb | 4 ++- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/modules/simple_forms_api/app/services/simple_forms_api/s3/submission_archive_builder.rb b/modules/simple_forms_api/app/services/simple_forms_api/s3/submission_archive_builder.rb index ceeee7994d..9123d9d042 100644 --- a/modules/simple_forms_api/app/services/simple_forms_api/s3/submission_archive_builder.rb +++ b/modules/simple_forms_api/app/services/simple_forms_api/s3/submission_archive_builder.rb @@ -20,24 +20,21 @@ def initialize(**options) # rubocop:disable Lint/MissingSuper def run FileUtils.mkdir_p(temp_directory_path) process_submission_files - temp_directory_path + [temp_directory_path, submission] rescue => e handle_error("Failed building submission: #{benefits_intake_uuid}", e) end private - attr_reader :attachments, :benefits_intake_uuid, :file_path, :include_json_archive, :include_manifest, - :include_text_archive, :metadata, :submission + attr_reader :attachments, :benefits_intake_uuid, :file_path, :include_manifest, :metadata, :submission def default_options { attachments: nil, # The confirmation codes of any attachments which were originally submitted benefits_intake_uuid: nil, # The UUID returned from the Benefits Intake API upon original submission file_path: nil, # The local path where the submission PDF is stored - include_json_archive: true, # Include the form data as a JSON object include_manifest: true, # Include a CSV file containing manifest data - include_text_archive: true, # Include the form data as a text file metadata: nil, # Data appended to the original submission headers submission: nil # The FormSubmission object representing the original data payload submitted } @@ -49,9 +46,7 @@ def valid_submission_data?(data) def process_submission_files write_pdf - write_as_json_archive if include_json_archive - write_as_text_archive if include_text_archive - write_attachments unless attachments && attachments.empty? + write_attachments if attachments&.any? write_manifest if include_manifest write_metadata rescue => e @@ -62,14 +57,6 @@ def write_pdf write_tempfile(submission_pdf_filename, File.read(file_path)) end - def write_as_json_archive - write_tempfile('form_json_archive.json', JSON.pretty_generate(form_data_hash)) - end - - def write_as_text_archive - write_tempfile('form_text_archive.txt', form_data_hash.to_s) - end - def write_metadata write_tempfile('metadata.json', metadata.to_json) end @@ -83,10 +70,10 @@ def write_attachments def process_attachment(attachment_number, guid) log_info("Processing attachment ##{attachment_number}: #{guid}") - attachment = PersistentAttachment.find_by(guid:).to_pdf + attachment = PersistentAttachment.find_by(guid:) raise "Attachment not found: #{guid}" unless attachment - write_tempfile("attachment_#{attachment_number}.pdf", attachment) + write_tempfile("attachment_#{attachment_number}.pdf", attachment.to_pdf) rescue => e handle_error("Failed processing attachment #{attachment_number} (#{guid})", e) end @@ -129,8 +116,12 @@ def form_data_hash @form_data_hash ||= JSON.parse(submission.form_data) end + # Name the form PDFs and/or individual submission folders + # uniquely, using a field that also appears in the manifest. + # The recommended format is Form-number-vagov-submission ID def submission_pdf_filename - @submission_pdf_filename ||= "form_#{form_data_hash['form_number']}.pdf" + form_number = form_data_hash['form_number'] + @submission_pdf_filename ||= "form_#{form_number}_vagov_#{benefits_intake_uuid}.pdf" end end end diff --git a/modules/simple_forms_api/app/services/simple_forms_api/s3/submission_archiver.rb b/modules/simple_forms_api/app/services/simple_forms_api/s3/submission_archiver.rb index ae420f0776..5483fab907 100644 --- a/modules/simple_forms_api/app/services/simple_forms_api/s3/submission_archiver.rb +++ b/modules/simple_forms_api/app/services/simple_forms_api/s3/submission_archiver.rb @@ -25,7 +25,9 @@ def fetch_s3_archive(benefits_intake_uuid) def initialize(parent_dir: 'vff-simple-forms', **options) # rubocop:disable Lint/MissingSuper @parent_dir = parent_dir defaults = default_options.merge(options) - @temp_directory_path = build_submission_archive(**defaults) + @temp_directory_path, @submission = build_submission_archive(**defaults) + raise 'Failed to build SubmissionArchive.' unless temp_directory_path && submission + assign_instance_variables(defaults) rescue => e handle_error('SubmissionArchiver initialization failed', e) @@ -54,7 +56,7 @@ def cleanup private - attr_reader :benefits_intake_uuid, :parent_dir, :submission + attr_reader :benefits_intake_uuid, :parent_dir, :submission, :temp_directory_path def default_options { @@ -116,13 +118,17 @@ def s3_submission_file_path "#{s3_directory_path}/#{submission_pdf_filename}" end + def unique_file_name + form_number = JSON.parse(submission.form_data)['form_number'] + @unique_file_name ||= "form_#{form_number}_vagov_#{benefits_intake_uuid}" + end + def submission_pdf_filename - submission_form_number = JSON.parse(submission.form_data)['form_number'] - @submission_pdf_filename ||= "form_#{submission_form_number}.pdf" + @submission_pdf_filename ||= "#{unique_file_name}.pdf" end def s3_directory_path - @s3_directory_path ||= "#{parent_dir}/#{benefits_intake_uuid}" + @s3_directory_path ||= "#{parent_dir}/#{unique_file_name}" end def local_submission_file_path diff --git a/modules/simple_forms_api/lib/tasks/archive_forms_by_uuid.rake b/modules/simple_forms_api/lib/tasks/archive_forms_by_uuid.rake index 3872a7b6b2..d0db7072cb 100644 --- a/modules/simple_forms_api/lib/tasks/archive_forms_by_uuid.rake +++ b/modules/simple_forms_api/lib/tasks/archive_forms_by_uuid.rake @@ -2,11 +2,11 @@ # Invoke this as follows: # Set the parameters as variables ahead of time: -# rails simple_forms_api:archive_forms_by_uuid[benefits_intake_uuids, parent_dir] +# bundle exec rails simple_forms_api:archive_forms_by_uuid[benefits_intake_uuids, parent_dir] # Pass in UUIDs only if default parent_dir is appropriate: -# rails simple_forms_api:archive_forms_by_uuid[abc-123 def-456] -# Pass in new directory to override default: -# rails simple_forms_api:archive_forms_by_uuid[abc-123 def-456,custom-directory] +# bundle exec rails simple_forms_api:archive_forms_by_uuid[abc-123 def-456] +# Pass in new directory to override default: +# bundle exec rails simple_forms_api:archive_forms_by_uuid[abc-123 def-456,custom-directory] namespace :simple_forms_api do desc 'Kick off the SubmissionArchiveHandler to archive submissions to S3 and print presigned URLs' task :archive_forms_by_uuid, %i[benefits_intake_uuids parent_dir] => :environment do |_, args| diff --git a/modules/simple_forms_api/spec/services/s3/submission_archiver_spec.rb b/modules/simple_forms_api/spec/services/s3/submission_archiver_spec.rb index fbacafe57c..4053f6b19f 100644 --- a/modules/simple_forms_api/spec/services/s3/submission_archiver_spec.rb +++ b/modules/simple_forms_api/spec/services/s3/submission_archiver_spec.rb @@ -32,7 +32,9 @@ allow_any_instance_of(described_class).to receive(:upload_temp_folder_to_s3).and_return('/things/stuff/') allow_any_instance_of(described_class).to receive(:cleanup).and_return(true) allow_any_instance_of(described_class).to receive(:generate_presigned_url).and_return('/s3_url/stuff.pdf') - allow_any_instance_of(SimpleFormsApi::S3::SubmissionArchiveBuilder).to receive(:run).and_return(file_path) + allow_any_instance_of(SimpleFormsApi::S3::SubmissionArchiveBuilder).to( + receive(:run).and_return([file_path, submission]) + ) end describe '#initialize' do From 4fd9dbdf31fc38c74d528b280376ca3d33e902b0 Mon Sep 17 00:00:00 2001 From: Jennica Stiehl <25069483+stiehlrod@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:06:02 -0600 Subject: [PATCH 20/27] API-40129-526-v1-13th-bday-validation (#18461) * Adds validation method to check 13th birthdate against activeDutyBeginDates. Adds corresponding test. * Fixes flakey test. * Incorporates PR suggestions. * Corrects tests. * Fixes rswag test --- .../disability_compensation_validations.rb | 19 ++++++++++ .../spec/requests/v1/forms/526_spec.rb | 37 +++++++++++++++---- .../spec/requests/v1/forms/rswag_526_spec.rb | 8 ++-- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/modules/claims_api/app/controllers/concerns/claims_api/disability_compensation_validations.rb b/modules/claims_api/app/controllers/concerns/claims_api/disability_compensation_validations.rb index 140664f0d8..4fdd2eb80c 100644 --- a/modules/claims_api/app/controllers/concerns/claims_api/disability_compensation_validations.rb +++ b/modules/claims_api/app/controllers/concerns/claims_api/disability_compensation_validations.rb @@ -21,6 +21,8 @@ def validate_form_526_submission_values! validate_form_526_service_information_confinements! # ensure conflicting homelessness values are not provided validate_form_526_veteran_homelessness! + # ensure that the active duty start date is not prior to the claimants 13th birthday + validate_service_after_13th_birthday! # ensure 'militaryRetiredPay.receiving' and 'militaryRetiredPay.willReceiveInFuture' are not same non-null values validate_form_526_service_pay! # ensure 'title10ActivationDate' if provided, is after the earliest servicePeriod.activeDutyBeginDate and on or before the current date # rubocop:disable Layout/LineLength @@ -232,6 +234,23 @@ def validate_form_526_veteran_homelessness! end end + def validate_service_after_13th_birthday! + service_periods = form_attributes&.dig('serviceInformation', 'servicePeriods') + age_thirteen = auth_headers['va_eauth_birthdate'].to_datetime.next_year(13).to_date + + return if age_thirteen.nil? || service_periods.nil? + + started_before_age_thirteen = service_periods.any? do |period| + Date.parse(period['activeDutyBeginDate']) < age_thirteen + end + if started_before_age_thirteen + raise ::Common::Exceptions::UnprocessableEntity.new( + detail: "If any 'serviceInformation.servicePeriods.activeDutyBeginDate' is "\ + "before the Veteran's 13th birthdate: #{age_thirteen}, the claim can not be processed." + ) + end + end + def validate_form_526_service_pay! validate_form_526_military_retired_pay! validate_form_526_separation_pay! diff --git a/modules/claims_api/spec/requests/v1/forms/526_spec.rb b/modules/claims_api/spec/requests/v1/forms/526_spec.rb index 14fcffced4..f270002b00 100644 --- a/modules/claims_api/spec/requests/v1/forms/526_spec.rb +++ b/modules/claims_api/spec/requests/v1/forms/526_spec.rb @@ -9,14 +9,15 @@ 'X-VA-First-Name': 'WESLEY', 'X-VA-Last-Name': 'FORD', 'X-Consumer-Username': 'TestConsumer', - 'X-VA-Birth-Date': '1986-05-06T00:00:00+00:00', + 'X-VA-Birth-Date': '1956-05-06T00:00:00+00:00', 'X-VA-Gender': 'M' } end let(:scopes) { %w[claim.write] } let(:multi_profile) do MPI::Responses::FindProfileResponse.new( status: :ok, - profile: FactoryBot.build(:mpi_profile, participant_id: nil, participant_ids: %w[123456789 987654321]) + profile: FactoryBot.build(:mpi_profile, participant_id: nil, participant_ids: %w[123456789 987654321], + birth_date: '19560506') ) end @@ -538,6 +539,8 @@ VCR.use_cassette('claims_api/brd/countries') do par = json_data par['data']['attributes']['veteran']['changeOfAddress'] = change_of_address + par['data']['attributes']['serviceInformation']['servicePeriods'][0]['activeDutyEndDate'] = + '2007-08-01' post path, params: par.to_json, headers: headers.merge(auth_header) expect(response).to have_http_status(:bad_request) @@ -601,6 +604,24 @@ } end + context "When an activeDutyBeginDate is before a Veteran's 13th birthday" do + it 'raise an error' do + mock_acg(scopes) do |auth_header| + VCR.use_cassette('claims_api/bgs/claims/claims') do + VCR.use_cassette('claims_api/brd/countries') do + headers['X-VA-Birth-Date'] = '1986-05-06T00:00:00+00:00' + par = json_data + par['data']['attributes']['serviceInformation']['servicePeriods'][0]['activeDutyEndDate'] = + '2007-08-01' + + post path, params: par.to_json, headers: headers.merge(auth_header) + expect(response).to have_http_status(:unprocessable_entity) + end + end + end + end + end + context "'title10ActivationDate' validations" do context 'when title10ActivationDate is prior to earliest servicePeriod.activeDutyBeginDate' do let(:title10_activation_date) { '1980-02-04' } @@ -1069,7 +1090,7 @@ def obj.class icn: '1012832025V743496', first_name: 'Wesley', last_name: 'Ford', - birth_date: '19630211', + birth_date: '19590211', loa: { current: 3, highest: 3 }, edipi: nil, ssn: '796043735', @@ -1123,10 +1144,10 @@ def obj.class let(:profile_with_edipi) do MPI::Responses::FindProfileResponse.new( status: 'OK', - profile: FactoryBot.build(:mpi_profile, edipi: '2536798') + profile: FactoryBot.build(:mpi_profile, edipi: '2536798', birth_date: '19560506') ) end - let(:profile) { build(:mpi_profile) } + let(:profile) { build(:mpi_profile, birth_date: '19560506') } let(:mpi_profile_response) { build(:find_profile_response, profile:) } it 'returns a 422 without an edipi' do @@ -1173,7 +1194,7 @@ def obj.class end context 'when consumer is Veteran, but is missing a participant id' do - let(:profile) { build(:mpi_profile) } + let(:profile) { build(:mpi_profile, birth_date: '19560506') } let(:mpi_profile_response) { build(:find_profile_response, profile:) } it 'raises a 422, with message' do @@ -1205,7 +1226,7 @@ def obj.class context 'when Veteran has participant_id' do context 'when Veteran is missing a birls_id' do before do - stub_mpi(build(:mpi_profile, birls_id: nil)) + stub_mpi(build(:mpi_profile, birls_id: nil, birth_date: '19560506')) end it 'returns an unprocessible entity status' do @@ -1221,7 +1242,7 @@ def obj.class context 'when Veteran has multiple participant_ids' do before do - stub_mpi(build(:mpi_profile, birls_id: nil)) + stub_mpi(build(:mpi_profile, birls_id: nil, birth_date: '19560506')) end it 'returns an unprocessible entity status' do diff --git a/modules/claims_api/spec/requests/v1/forms/rswag_526_spec.rb b/modules/claims_api/spec/requests/v1/forms/rswag_526_spec.rb index d6b3b5dbb4..ed0a17e601 100644 --- a/modules/claims_api/spec/requests/v1/forms/rswag_526_spec.rb +++ b/modules/claims_api/spec/requests/v1/forms/rswag_526_spec.rb @@ -80,7 +80,7 @@ let(:'X-VA-Last-Name') { 'FORD' } parameter SwaggerSharedComponents::V1.header_params[:veteran_birth_date_header] - let(:'X-VA-Birth-Date') { '1986-05-06T00:00:00+00:00' } + let(:'X-VA-Birth-Date') { '1965-05-06T00:00:00+00:00' } let(:Authorization) { 'Bearer token' } parameter SwaggerSharedComponents::V1.body_examples[:disability_compensation] @@ -272,7 +272,7 @@ def append_example_metadata(example, response) let(:'X-VA-Last-Name') { 'FORD' } parameter SwaggerSharedComponents::V1.header_params[:veteran_birth_date_header] - let(:'X-VA-Birth-Date') { '1986-05-06T00:00:00+00:00' } + let(:'X-VA-Birth-Date') { '1965-05-06T00:00:00+00:00' } let(:Authorization) { 'Bearer token' } attachment_description = <<~VERBIAGE @@ -495,7 +495,7 @@ def append_example_metadata(example, response) let(:'X-VA-Last-Name') { 'FORD' } parameter SwaggerSharedComponents::V1.header_params[:veteran_birth_date_header] - let(:'X-VA-Birth-Date') { '1986-05-06T00:00:00+00:00' } + let(:'X-VA-Birth-Date') { '1965-05-06T00:00:00+00:00' } let(:Authorization) { 'Bearer token' } parameter SwaggerSharedComponents::V1.body_examples[:disability_compensation] @@ -658,7 +658,7 @@ def append_example_metadata(example, response) let(:'X-VA-Last-Name') { 'FORD' } parameter SwaggerSharedComponents::V1.header_params[:veteran_birth_date_header] - let(:'X-VA-Birth-Date') { '1986-05-06T00:00:00+00:00' } + let(:'X-VA-Birth-Date') { '1965-05-06T00:00:00+00:00' } let(:Authorization) { 'Bearer token' } attachment_description = <<~VERBIAGE From 31353d003751579fd6f593645858ee4707f19f29 Mon Sep 17 00:00:00 2001 From: Jennica Stiehl <25069483+stiehlrod@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:06:32 -0600 Subject: [PATCH 21/27] Updates error message for retries (#18501) --- .../lib/claims_api/v2/error/lighthouse_error_mapper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/claims_api/lib/claims_api/v2/error/lighthouse_error_mapper.rb b/modules/claims_api/lib/claims_api/v2/error/lighthouse_error_mapper.rb index deeb2dafc2..8414d62ae1 100644 --- a/modules/claims_api/lib/claims_api/v2/error/lighthouse_error_mapper.rb +++ b/modules/claims_api/lib/claims_api/v2/error/lighthouse_error_mapper.rb @@ -16,7 +16,7 @@ class LighthouseErrorMapper submit: 'The claim could not be established', disabled: 'this claim has been disabled', submit_save_draftForm_MaxEPCode: 'The Maximum number of EP codes have been reached for this benefit type claim code', # rubocop:disable Layout/LineLength - submit_noRetryError: 'This job is no longer able to be re-tried', + submit_noRetryError: 'Claim could not be established. Retries will fail.', header_va_eauth_birlsfilenumber_Invalid: 'There is a problem with your birls file number. Please submit an issue at ask.va.gov or call 1-800-MyVA411 (800-698-2411) for assistance.' # rubocop:disable Layout/LineLength }.freeze From c3052877764b2d351b9062c37a6bae8155dde0c7 Mon Sep 17 00:00:00 2001 From: Jennica Stiehl <25069483+stiehlrod@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:07:19 -0600 Subject: [PATCH 22/27] API-40254-5103-bd-upload-errors (#18533) * Adds method to service_base for retry_limits_for_notification. Adds corresponding test. Adds logic to exclude file number in a BD upload if the doc type is 'L705'. Adds corresponding test. * Removes conflicting lines. Adds L705 doc_type to case where file_num should be nil. --- modules/claims_api/app/sidekiq/claims_api/service_base.rb | 4 ++++ modules/claims_api/lib/bd/bd.rb | 4 ++-- modules/claims_api/spec/lib/claims_api/bd_spec.rb | 8 ++++++++ .../spec/sidekiq/evidence_waiver_builder_job_spec.rb | 8 ++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/modules/claims_api/app/sidekiq/claims_api/service_base.rb b/modules/claims_api/app/sidekiq/claims_api/service_base.rb index 397ca0ce01..89b136e3d9 100644 --- a/modules/claims_api/app/sidekiq/claims_api/service_base.rb +++ b/modules/claims_api/app/sidekiq/claims_api/service_base.rb @@ -34,6 +34,10 @@ class ServiceBase end end + def retry_limits_for_notification + [11] + end + protected def preserve_original_form_data(form_data) diff --git a/modules/claims_api/lib/bd/bd.rb b/modules/claims_api/lib/bd/bd.rb index 0d42c6bfc2..501acc771e 100644 --- a/modules/claims_api/lib/bd/bd.rb +++ b/modules/claims_api/lib/bd/bd.rb @@ -122,9 +122,9 @@ def generate_upload_body(claim:, doc_type:, pdf_path:, action:, original_filenam end def determine_birls_file_number(doc_type, auth_headers) - if %w[L122 L705].include?(doc_type) + if %w[L122].include?(doc_type) birls_file_num = auth_headers['va_eauth_birlsfilenumber'] - elsif %w[L075 L190].include?(doc_type) + elsif %w[L075 L190 L705].include?(doc_type) birls_file_num = nil end birls_file_num diff --git a/modules/claims_api/spec/lib/claims_api/bd_spec.rb b/modules/claims_api/spec/lib/claims_api/bd_spec.rb index d2761e1fe2..4cc0f04487 100644 --- a/modules/claims_api/spec/lib/claims_api/bd_spec.rb +++ b/modules/claims_api/spec/lib/claims_api/bd_spec.rb @@ -203,6 +203,14 @@ expect(js['data']['systemName']).to eq 'VA.gov' expect(js['data']['trackedItemIds']).to eq [234, 235] end + + it 'sends only a participant id and not a file number for 5103' do + result = subject.send(:generate_upload_body, claim: ews, doc_type: 'L705', original_filename: '5103.pdf', + pdf_path:, action: 'post', pctpnt_vet_id: '123456789') + js = JSON.parse(result[:parameters].read) + expect(js['data']['fileNumber']).not_to be_truthy + expect(js['data']['fileNumber']).to eq(nil) + end end describe '#build_body' do diff --git a/modules/claims_api/spec/sidekiq/evidence_waiver_builder_job_spec.rb b/modules/claims_api/spec/sidekiq/evidence_waiver_builder_job_spec.rb index 927cf96726..14318ab4b9 100644 --- a/modules/claims_api/spec/sidekiq/evidence_waiver_builder_job_spec.rb +++ b/modules/claims_api/spec/sidekiq/evidence_waiver_builder_job_spec.rb @@ -19,6 +19,14 @@ end end + describe '#retry_limits_for_notification' do + it "provides the method definition for sidekiq 'retry_monitoring.rb'" do + res = described_class.new.retry_limits_for_notification + expect(res).to eq([11]) + expect(described_class.new.respond_to?(:retry_limits_for_notification)).to eq(true) + end + end + describe 'when an errored job has exhausted its retries' do it 'logs to the ClaimsApi Logger' do error_msg = 'An error occurred from the Evidence Waiver Builder Job' From 73ef6de433dbeb1494a1e9d5f1c30def7a489205 Mon Sep 17 00:00:00 2001 From: Rockwell Windsor Rice <129893414+rockwellwindsor-va@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:28:02 -0500 Subject: [PATCH 23/27] API 40137 update mapping to evss docker (#18511) * WIP * WIP * WIP * API-40137-update-mapping-to-evss-docker * Updates mapping for docker container to establish cvalues needed for BDD claim * converts/renames reservesNationGuard attributes * converts/renames federalActivation values * Adds conditionaly enforced validations required for valid BDD EP code establishment * Compiles RSWAG docs to reflect text for changed conditional requirements * Adds/Updates tests for scenarions modified: modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb modified: modules/claims_api/app/services/claims_api/disability_compensation/docker_container_service.rb modified: modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json modified: modules/claims_api/app/swagger/claims_api/v2/production/swagger.json modified: modules/claims_api/spec/lib/claims_api/v2/disability_compensation_validation_spec.rb * Reverts line removal * Reverts tabs addition in file * Cleans up messy method name --- .../v2/disability_compensation_validation.rb | 50 ++++++++- .../swagger/claims_api/v2/dev/swagger.json | 25 +++-- .../claims_api/v2/production/swagger.json | 25 +++-- modules/claims_api/config/schemas/v2/526.json | 1 + .../v2/disability_compensation_evss_mapper.rb | 52 +++++++-- ...isability_compensation_evss_mapper_spec.rb | 10 ++ ...disability_compensation_validation_spec.rb | 100 ++++++++++++++++++ 7 files changed, 231 insertions(+), 32 deletions(-) diff --git a/modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb b/modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb index 9d006adca0..c4e66bd16a 100644 --- a/modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb +++ b/modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb @@ -982,13 +982,25 @@ def validate_federal_activation_values(service_information) form_obj_desc = '/serviceInformation/federalActivation' + # For a valid BDD EP code to be assigned we need these values + validate_required_values_for_federal_activation(federal_activation_date, anticipated_separation_date) + + validate_federal_activation_date(federal_activation_date, form_obj_desc) + + validate_federal_activation_date_order(federal_activation_date) if federal_activation_date.present? + if anticipated_separation_date.present? + validate_anticipated_separation_date_in_past(anticipated_separation_date) + end + end + + def validate_federal_activation_date(federal_activation_date, form_obj_desc) if federal_activation_date.blank? collect_error_if_value_not_present('federal activation date', form_obj_desc) end + end - return if anticipated_separation_date.blank? - + def validate_federal_activation_date_order(federal_activation_date) # we know the dates are present if activation_date_not_after_duty_begin_date?(federal_activation_date) collect_error_messages( @@ -996,9 +1008,41 @@ def validate_federal_activation_values(service_information) detail: 'The federalActivation date must be after the earliest service period active duty begin date.' ) end + end - validate_anticipated_separation_date_in_past(anticipated_separation_date) + # rubocop:disable Metrics/MethodLength + def validate_required_values_for_federal_activation(activation_date, separation_date) + activation_form_obj_desc = 'serviceInformation/federalActivation/' + reserves_dates_form_obj_desc = 'serviceInformation/reservesNationalGuardServce/obligationTermsOfService/' + reserves_unit_form_obj_desc = 'serviceInformation/reservesNationalGuardServce/' + + reserves = form_attributes.dig('serviceInformation', 'reservesNationalGuardService') + tos_start_date = reserves&.dig('obligationTermsOfService', 'beginDate') + tos_end_date = reserves&.dig('obligationTermsOfService', 'endDate') + unit_name = reserves&.dig('unitName') + + if activation_date.blank? + collect_error_messages(detail: 'activationDate is missing or blank', + source: activation_form_obj_desc) + end + if separation_date.blank? + collect_error_messages(detail: 'anticipatedSeparationDate is missing or blank', + source: activation_form_obj_desc) + end + if tos_start_date.blank? + collect_error_messages(detail: 'beginDate is missing or blank', + source: reserves_dates_form_obj_desc) + end + if tos_end_date.blank? + collect_error_messages(detail: 'endDate is missing or blank', + source: reserves_dates_form_obj_desc) + end + if unit_name.blank? + collect_error_messages(detail: 'unitName is missing or blank', + source: reserves_unit_form_obj_desc) + end end + # rubocop:enable Metrics/MethodLength def activation_date_not_after_duty_begin_date?(activation_date) service_information = form_attributes['serviceInformation'] diff --git a/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json b/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json index ab775f3392..bb73cfb51d 100644 --- a/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json +++ b/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json @@ -2947,6 +2947,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -4330,6 +4331,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -5075,7 +5077,7 @@ "202 without a transactionId": { "value": { "data": { - "id": "a51ca7e0-180e-4792-b5a4-148a10a9bdae", + "id": "74d7a3b6-8164-49c2-9dfb-fdb3fa019477", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -5260,7 +5262,7 @@ }, "federalActivation": { "activationDate": "2023-10-01", - "anticipatedSeparationDate": "2024-09-18" + "anticipatedSeparationDate": "2024-09-21" }, "confinements": [ { @@ -5306,7 +5308,7 @@ "202 with a transactionId": { "value": { "data": { - "id": "3b5398d2-5851-4f40-9b81-9f03717acbff", + "id": "3356c8ae-350b-4a23-aea1-9bb00de306e1", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -6488,6 +6490,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -7871,6 +7874,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -10031,6 +10035,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -10521,7 +10526,7 @@ "application/json": { "example": { "data": { - "id": "9195a402-a9df-43ea-a62d-715e59db90c9", + "id": "e788a384-ee89-4e9e-9055-b81fa61b166d", "type": "forms/526", "attributes": { "claimProcessType": "STANDARD_CLAIM_PROCESS", @@ -14181,8 +14186,8 @@ "id": "1", "type": "intent_to_file", "attributes": { - "creationDate": "2024-09-16", - "expirationDate": "2025-09-16", + "creationDate": "2024-09-19", + "expirationDate": "2025-09-19", "type": "compensation", "status": "active" } @@ -15078,7 +15083,7 @@ "application/json": { "example": { "data": { - "id": "c231aa7f-e16b-4616-9f79-c5c5b4d1f1e3", + "id": "c97b8c40-558a-4d35-af92-57362329173a", "type": "individual", "attributes": { "code": "067", @@ -15771,7 +15776,7 @@ "application/json": { "example": { "data": { - "id": "1b2bcb3f-8af7-46d1-ba2f-cecbcd87a451", + "id": "8d551fa6-0088-4910-bbd7-08492f1f1dfc", "type": "organization", "attributes": { "code": "083", @@ -17722,10 +17727,10 @@ "application/json": { "example": { "data": { - "id": "4636c375-2259-4a3c-afe0-79bf01664c7d", + "id": "17c1d357-0b69-4ce1-a7e2-deb13931a6c6", "type": "claimsApiPowerOfAttorneys", "attributes": { - "dateRequestAccepted": "2024-09-16", + "dateRequestAccepted": "2024-09-19", "previousPoa": null, "representative": { "serviceOrganization": { diff --git a/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json b/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json index 0ee1c313d3..9fe4dd2c15 100644 --- a/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json +++ b/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json @@ -1560,6 +1560,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -2943,6 +2944,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -3688,7 +3690,7 @@ "202 without a transactionId": { "value": { "data": { - "id": "b636aeb7-88c0-4451-bd9b-73fd63697834", + "id": "c57050e5-558e-4f9f-9a6b-68ea79752541", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -3873,7 +3875,7 @@ }, "federalActivation": { "activationDate": "2023-10-01", - "anticipatedSeparationDate": "2024-09-18" + "anticipatedSeparationDate": "2024-09-21" }, "confinements": [ { @@ -3919,7 +3921,7 @@ "202 with a transactionId": { "value": { "data": { - "id": "bf5dc2c7-c4f6-497c-b263-c9cf2ef097d0", + "id": "e981c089-c851-4c90-8a76-87a956381c2e", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -5101,6 +5103,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -6484,6 +6487,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -8644,6 +8648,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": "object", "nullable": true, "additionalProperties": false, @@ -9134,7 +9139,7 @@ "application/json": { "example": { "data": { - "id": "cc98ad06-eee9-4a56-b089-f891410097a5", + "id": "18853a53-9cc4-479a-8443-0f3c9bdea0af", "type": "forms/526", "attributes": { "claimProcessType": "STANDARD_CLAIM_PROCESS", @@ -12794,8 +12799,8 @@ "id": "1", "type": "intent_to_file", "attributes": { - "creationDate": "2024-09-16", - "expirationDate": "2025-09-16", + "creationDate": "2024-09-19", + "expirationDate": "2025-09-19", "type": "compensation", "status": "active" } @@ -13691,7 +13696,7 @@ "application/json": { "example": { "data": { - "id": "46dd81ce-150a-46af-ab26-fd631d7a8c30", + "id": "b06d7ca0-bb23-4481-b9e1-6a15351e0d63", "type": "individual", "attributes": { "code": "067", @@ -14384,7 +14389,7 @@ "application/json": { "example": { "data": { - "id": "25afc8c7-aeba-47c9-aaec-31654a9c954e", + "id": "4d21ac8b-52eb-48ea-930e-6277a1a272be", "type": "organization", "attributes": { "code": "083", @@ -16335,10 +16340,10 @@ "application/json": { "example": { "data": { - "id": "0d361496-a409-41d3-9946-5c796ba0febe", + "id": "42002b9e-354f-40b4-a7c2-5b816a934c6b", "type": "claimsApiPowerOfAttorneys", "attributes": { - "dateRequestAccepted": "2024-09-16", + "dateRequestAccepted": "2024-09-19", "previousPoa": null, "representative": { "serviceOrganization": { diff --git a/modules/claims_api/config/schemas/v2/526.json b/modules/claims_api/config/schemas/v2/526.json index b587dfc94e..4c98b55e3c 100644 --- a/modules/claims_api/config/schemas/v2/526.json +++ b/modules/claims_api/config/schemas/v2/526.json @@ -872,6 +872,7 @@ } }, "federalActivation": { + "description": "If federalActivation is present then reservesNationalGuardService.obligationTermsOfService.beginDate, reservesNationalGuardService.obligationTermsOfService.endDate and reservesNationalGuardService.unitName are required", "type": ["object", "null"], "nullable": true, "additionalProperties": false, diff --git a/modules/claims_api/lib/claims_api/v2/disability_compensation_evss_mapper.rb b/modules/claims_api/lib/claims_api/v2/disability_compensation_evss_mapper.rb index 9906c87f67..f7bcb28bf1 100644 --- a/modules/claims_api/lib/claims_api/v2/disability_compensation_evss_mapper.rb +++ b/modules/claims_api/lib/claims_api/v2/disability_compensation_evss_mapper.rb @@ -36,12 +36,46 @@ def claim_attributes def service_information info = @data[:serviceInformation] + + map_service_periods(info) + map_federal_activation_to_reserves(info) if info&.dig(:federalActivation).present? + map_reserves_title_ten(info) if info&.dig(:reservesNationalGuardService, :title10Activation).present? + map_confinements(info) if info&.dig(:confinements).present? + end + + def map_service_periods(info) service_periods = format_service_periods(info&.dig(:servicePeriods)) - confinements = format_confinements(info&.dig(:confinements)) if info&.dig(:confinements).present? @evss_claim[:serviceInformation] = { servicePeriods: service_periods } + end + + def map_federal_activation_to_reserves(info) + activation_date = info&.dig(:federalActivation, :activationDate) + separation_date = info&.dig(:federalActivation, :anticipatedSeparationDate) + terms_of_service = info&.dig(:reservesNationalGuardService, :obligationTermsOfService) + unit_name = info&.dig(:reservesNationalGuardService, :unitName) + + return if activation_date.blank? && separation_date.blank? + + title_ten = {} + title_ten[:title10ActivationDate] = activation_date if activation_date.present? + title_ten[:anticipatedSeparationDate] = separation_date if separation_date.present? + + begin_date = terms_of_service&.dig(:beginDate) + end_date = terms_of_service&.dig(:endDate) + + @evss_claim[:serviceInformation][:reservesNationalGuardService] = { + unitName: unit_name, + obligationTermOfServiceFromDate: begin_date, + obligationTermOfServiceToDate: end_date, + title10Activation: title_ten + } + end + + def map_confinements(info) + confinements = format_confinements(info&.dig(:confinements)) if confinements.present? @evss_claim[:serviceInformation].merge!( @@ -134,16 +168,16 @@ def veteran_meta end # Convert 12-05-1984 to 1984-12-05 for Docker container - def format_service_periods(service_period_dates) - service_period_dates.each do |sp_date| - next if sp_date[:activeDutyBeginDate].nil? + def format_service_periods(service_periods) + service_periods.each do |sp| + next if sp[:activeDutyBeginDate].nil? - begin_year = Date.strptime(sp_date[:activeDutyBeginDate], '%Y-%m-%d') - sp_date[:activeDutyBeginDate] = begin_year.strftime('%Y-%m-%d') - next if sp_date[:activeDutyEndDate].nil? + begin_year = Date.strptime(sp[:activeDutyBeginDate], '%Y-%m-%d') + sp[:activeDutyBeginDate] = begin_year.strftime('%Y-%m-%d') + next if sp[:activeDutyEndDate].nil? - end_year = Date.strptime(sp_date[:activeDutyEndDate], '%Y-%m-%d') - sp_date[:activeDutyEndDate] = end_year.strftime('%Y-%m-%d') + end_year = Date.strptime(sp[:activeDutyEndDate], '%Y-%m-%d') + sp[:activeDutyEndDate] = end_year.strftime('%Y-%m-%d') end end diff --git a/modules/claims_api/spec/lib/claims_api/v2/disability_compensation_evss_mapper_spec.rb b/modules/claims_api/spec/lib/claims_api/v2/disability_compensation_evss_mapper_spec.rb index 2b322a36fd..450b1e12c5 100644 --- a/modules/claims_api/spec/lib/claims_api/v2/disability_compensation_evss_mapper_spec.rb +++ b/modules/claims_api/spec/lib/claims_api/v2/disability_compensation_evss_mapper_spec.rb @@ -263,6 +263,16 @@ expect(service_periods[:separationLocationCode]).to eq('98282') end + it 'maps the federalActivation to reserves attributes correctly' do + reserves_addition = evss_data[:serviceInformation][:reservesNationalGuardService] + + expect(reserves_addition[:title10Activation][:title10ActivationDate]).to eq('2023-10-01') + expect(reserves_addition[:title10Activation][:anticipatedSeparationDate]).to eq('2024-10-31') + expect(reserves_addition[:obligationTermOfServiceFromDate]).to eq('2019-06-04') + expect(reserves_addition[:obligationTermOfServiceToDate]).to eq('2020-06-04') + expect(reserves_addition[:unitName]).to eq('National Guard Unit Name') + end + it 'maps the confinements attribute correctly' do first_confinement = evss_data[:serviceInformation][:confinements][0] second_confinement = evss_data[:serviceInformation][:confinements][1] diff --git a/modules/claims_api/spec/lib/claims_api/v2/disability_compensation_validation_spec.rb b/modules/claims_api/spec/lib/claims_api/v2/disability_compensation_validation_spec.rb index ac0db19441..a2e7ac0659 100644 --- a/modules/claims_api/spec/lib/claims_api/v2/disability_compensation_validation_spec.rb +++ b/modules/claims_api/spec/lib/claims_api/v2/disability_compensation_validation_spec.rb @@ -469,4 +469,104 @@ def current_error_array end end end + + describe 'validation for BDD_PROGRAM claim' do + let(:valid_service_info_for_bdd) do + { + 'servicePeriods' => [ + { + 'serviceBranch' => 'Air Force Reserves', + 'serviceComponent' => 'Reserves', + 'activeDutyBeginDate' => '2015-11-14', + 'activeDutyEndDate' => '2024-12-20' + } + ], + 'reservesNationalGuardService' => { + 'component' => 'National Guard', + 'obligationTermsOfService' => { + 'beginDate' => '1990-11-24', + 'endDate' => '1995-11-17' + }, + 'unitName' => 'National Guard Unit Name', + 'unitAddress' => '1243 Main Street', + 'unitPhone' => { + 'areaCode' => '555', + 'phoneNumber' => '5555555' + }, + 'receivingInactiveDutyTrainingPay' => 'YES' + }, + 'federalActivation' => { + 'activationDate' => '2023-10-01', + 'anticipatedSeparationDate' => '2024-12-20' + } + } + end + + def validate_field(field_path, expected_detail, expected_source) + keys = field_path.split('.') + current_hash = valid_service_info_for_bdd + + keys[0..-2].each do |key| + current_hash = current_hash[key] + end + + current_hash[keys.last] = '' # set the specified field to empty string to omit + + invalid_service_info_for_bdd = valid_service_info_for_bdd + subject.form_attributes['serviceInformation'] = invalid_service_info_for_bdd + test_526_validation_instance.send(:validate_federal_activation_values, invalid_service_info_for_bdd) + + expect(current_error_array[0][:detail]).to eq(expected_detail) + expect(current_error_array[0][:source]).to eq(expected_source) + end + + context 'when federalActivation is present' do + it 'and all the required attributes are present' do + test_526_validation_instance.send(:validate_federal_activation_values, valid_service_info_for_bdd) + expect(current_error_array).to eq(nil) + end + + # rubocop:disable RSpec/NoExpectationExample + it 'requires federalActivation.activationDate' do + validate_field( + 'federalActivation.activationDate', + 'activationDate is missing or blank', + 'serviceInformation/federalActivation/' + ) + end + + it 'requires federalActivation.anticipatedSeparationDate' do + validate_field( + 'federalActivation.anticipatedSeparationDate', + 'anticipatedSeparationDate is missing or blank', + 'serviceInformation/federalActivation/' + ) + end + + it 'requires reservesNationalGuardService.obligationTermsOfService.beginDate' do + validate_field( + 'reservesNationalGuardService.obligationTermsOfService.beginDate', + 'beginDate is missing or blank', + 'serviceInformation/reservesNationalGuardServce/obligationTermsOfService/' + ) + end + + it 'requires reservesNationalGuardService.obligationTermsOfService.endDate' do + validate_field( + 'reservesNationalGuardService.obligationTermsOfService.endDate', + 'endDate is missing or blank', + 'serviceInformation/reservesNationalGuardServce/obligationTermsOfService/' + ) + end + + it 'requires reservesNationalGuardService.unitName' do + validate_field( + 'reservesNationalGuardService.unitName', + 'unitName is missing or blank', + 'serviceInformation/reservesNationalGuardServce/' + ) + end + # rubocop:enable RSpec/NoExpectationExample + end + end end From d4cedbab41271f588963dfea98ff9b50f5baf6fd Mon Sep 17 00:00:00 2001 From: Rockwell Windsor Rice <129893414+rockwellwindsor-va@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:29:10 -0500 Subject: [PATCH 24/27] API-40185-add-logger-for-pdf-validate-investigation (#18567) * Adds a log out at one of the spots we are seeing failures in an effort to get some insights into why the change to clamav is causing upload failures. * Checks for existence * Logs file size modified: modules/claims_api/app/services/claims_api/disability_compensation/pdf_generation_service.rb --- .../disability_compensation/pdf_generation_service.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/claims_api/app/services/claims_api/disability_compensation/pdf_generation_service.rb b/modules/claims_api/app/services/claims_api/disability_compensation/pdf_generation_service.rb index 3970e8d0a4..94bc2f2997 100644 --- a/modules/claims_api/app/services/claims_api/disability_compensation/pdf_generation_service.rb +++ b/modules/claims_api/app/services/claims_api/disability_compensation/pdf_generation_service.rb @@ -28,6 +28,13 @@ def generate(claim_id, middle_initial) # rubocop:disable Metrics/MethodLength file_name = "#{SecureRandom.hex}.pdf" path = ::Common::FileHelpers.generate_clamav_temp_file(pdf_string, file_name) + # temporary debugging of clam av + log_job_progress( + auto_claim.id, + "526EZ PDF generator PDF existence check: #{File.exist?(path)}, file size : #{File.size?(path)}", + auto_claim.transaction_id + ) + upload = ActionDispatch::Http::UploadedFile.new({ filename: file_name, type: 'application/pdf', From f378056e3c322840e42a5079dd2c3e957df120e2 Mon Sep 17 00:00:00 2001 From: Wayne Weibel Date: Mon, 23 Sep 2024 09:34:01 -0400 Subject: [PATCH 25/27] Pension 90726 temp file cleanup monitoring (#18549) --- .../app/sidekiq/pensions/pension_benefit_intake_job.rb | 6 ++---- modules/pensions/lib/pensions/monitor.rb | 1 + .../sidekiq/pensions/pension_benefit_intake_job_spec.rb | 7 ++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/pensions/app/sidekiq/pensions/pension_benefit_intake_job.rb b/modules/pensions/app/sidekiq/pensions/pension_benefit_intake_job.rb index d43f5ffa2b..7acf611375 100644 --- a/modules/pensions/app/sidekiq/pensions/pension_benefit_intake_job.rb +++ b/modules/pensions/app/sidekiq/pensions/pension_benefit_intake_job.rb @@ -184,16 +184,14 @@ def form_submission_polling end ## - # Delete temporary stamped PDF files for this job instance. - # - # @raise [PensionBenefitIntakeError] if unable to delete file + # Delete temporary stamped PDF files for this job instance + # catches any error, logs but does NOT re-raise - prevent job retry # def cleanup_file_paths Common::FileHelpers.delete_file_if_exists(@form_path) if @form_path @attachment_paths&.each { |p| Common::FileHelpers.delete_file_if_exists(p) } rescue => e @pension_monitor.track_file_cleanup_error(@claim, @intake_service, @user_account_uuid, e) - raise PensionBenefitIntakeError, e.message end end end diff --git a/modules/pensions/lib/pensions/monitor.rb b/modules/pensions/lib/pensions/monitor.rb index a0071affa3..0b4cfa5767 100644 --- a/modules/pensions/lib/pensions/monitor.rb +++ b/modules/pensions/lib/pensions/monitor.rb @@ -196,6 +196,7 @@ def track_submission_exhaustion(msg, claim = nil) # @param e [Error] # def track_file_cleanup_error(claim, lighthouse_service, user_uuid, e) + StatsD.increment("#{SUBMISSION_STATS_KEY}.cleanup_failed") Rails.logger.error('Lighthouse::PensionBenefitIntakeJob cleanup failed', { claim_id: claim&.id, diff --git a/modules/pensions/spec/sidekiq/pensions/pension_benefit_intake_job_spec.rb b/modules/pensions/spec/sidekiq/pensions/pension_benefit_intake_job_spec.rb index 9c4d48f6ee..010b594b46 100644 --- a/modules/pensions/spec/sidekiq/pensions/pension_benefit_intake_job_spec.rb +++ b/modules/pensions/spec/sidekiq/pensions/pension_benefit_intake_job_spec.rb @@ -116,12 +116,9 @@ allow(monitor).to receive(:track_file_cleanup_error) end - it 'returns expected hash' do + it 'errors and logs but does not reraise' do expect(monitor).to receive(:track_file_cleanup_error) - expect { job.send(:cleanup_file_paths) }.to raise_error( - Pensions::PensionBenefitIntakeJob::PensionBenefitIntakeError, - anything - ) + job.send(:cleanup_file_paths) end end From de557eb9f6963267fa454533ff2abd7a8512d16b Mon Sep 17 00:00:00 2001 From: Matthew Knight Date: Mon, 23 Sep 2024 11:31:36 -0400 Subject: [PATCH 26/27] Update readme.md (#18366) Co-authored-by: Wayne Weibel --- modules/pensions/documentation/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pensions/documentation/readme.md b/modules/pensions/documentation/readme.md index c112cd57a6..e0cb7f40ac 100644 --- a/modules/pensions/documentation/readme.md +++ b/modules/pensions/documentation/readme.md @@ -69,7 +69,7 @@ August 2023 - August 2024 Team | Wayne Weibel | wayne.weibel@adhocteam.us | | Tai Wilkin | tai.wilkin@coforma.io | | Todd Rizzolo | todd.rizzolo@adhocteam.us | -| Scott Gorman | scott.gorman@adhocteam.us | +| Bryan Alexander | bryan.alexander@adhocteam.us | | Daniel Lim | daniel.lim@adhocteam.us | ## Troubleshooting From cfe6a36eb2fe08f5cee14df364f5d4d780cef090 Mon Sep 17 00:00:00 2001 From: Mitch Saltykov Date: Fri, 20 Sep 2024 10:20:56 -0400 Subject: [PATCH 27/27] send CG claim created_at to CARMA as submitted_at metadata --- config/features.yml | 3 ++ lib/carma/models/metadata.rb | 5 ++- lib/carma/models/submission.rb | 11 ++++++ spec/lib/carma/models/metadata_spec.rb | 19 ++++++++- spec/lib/carma/models/submission_spec.rb | 50 ++++++++++++++++++------ 5 files changed, 74 insertions(+), 14 deletions(-) diff --git a/config/features.yml b/config/features.yml index 2805f6b2a4..8eff7f67da 100644 --- a/config/features.yml +++ b/config/features.yml @@ -66,6 +66,9 @@ features: caregiver_browser_monitoring_enabled: actor_type: user description: Enables Datadog Real Time User Monitoring + caregiver_carma_submitted_at: + actor_type: user + description: Enables sending CARMA the creation timestamp of a claim as a metadata submitted_at value hca_browser_monitoring_enabled: actor_type: user description: Enables browser monitoring for the health care application. diff --git a/lib/carma/models/metadata.rb b/lib/carma/models/metadata.rb index 09cb870de3..296188a822 100644 --- a/lib/carma/models/metadata.rb +++ b/lib/carma/models/metadata.rb @@ -9,13 +9,15 @@ module Models class Metadata < Base request_payload_key :claim_id, :claim_guid, + :submitted_at, :veteran, :primary_caregiver, :secondary_caregiver_one, :secondary_caregiver_two attr_accessor :claim_id, - :claim_guid + :claim_guid, + :submitted_at attr_reader :veteran, :primary_caregiver, @@ -25,6 +27,7 @@ class Metadata < Base def initialize(args = {}) @claim_id = args[:claim_id] @claim_guid = args[:claim_guid] + @submitted_at = args[:submitted_at] self.veteran = args[:veteran] || {} self.primary_caregiver = args[:primary_caregiver] diff --git a/lib/carma/models/submission.rb b/lib/carma/models/submission.rb index 9b2c3525ee..c95b88d290 100644 --- a/lib/carma/models/submission.rb +++ b/lib/carma/models/submission.rb @@ -19,6 +19,17 @@ class Submission < Base # @return [CARMA::Models::Submission] A CARMA Submission model object # def self.from_claim(claim, metadata = {}) + if Flipper.enabled?(:caregiver_carma_submitted_at) + return new( + data: claim.parsed_form, + metadata: metadata.merge( + claim_id: claim.id, + claim_guid: claim.guid, + submitted_at: claim.created_at&.iso8601 + ) + ) + end + new( data: claim.parsed_form, metadata: metadata.merge(claim_id: claim.id, claim_guid: claim.guid) diff --git a/spec/lib/carma/models/metadata_spec.rb b/spec/lib/carma/models/metadata_spec.rb index 51ba786195..bfa0bd3303 100644 --- a/spec/lib/carma/models/metadata_spec.rb +++ b/spec/lib/carma/models/metadata_spec.rb @@ -18,6 +18,14 @@ end end + describe '#submitted_at' do + it 'is accessible' do + claim_created_at = DateTime.now.iso8601 + subject.submitted_at = claim_created_at + expect(subject.submitted_at).to eq(claim_created_at) + end + end + describe '#veteran' do it 'is accessible' do subject.veteran = { icn: 'ABCD1234', is_veteran: true } @@ -87,10 +95,12 @@ expect(subject.secondary_caregiver_two).to eq(nil) end - it 'accepts :claim_id, :veteran, :primary_caregiver, :secondary_caregiver_one, :secondary_caregiver_two' do + it 'accepts claim_id, submitted_at, veteran, primary_caregiver, secondary_caregiver_one, secondary_caregiver_two' do + claim_created_at = DateTime.now.iso8601 subject = described_class.new( claim_id: 123, claim_guid: 'my-uuid', + submitted_at: claim_created_at, veteran: { icn: 'VET1234', is_veteran: true @@ -108,6 +118,7 @@ expect(subject.claim_id).to eq(123) expect(subject.claim_guid).to eq('my-uuid') + expect(subject.submitted_at).to eq(claim_created_at) expect(subject.veteran.icn).to eq('VET1234') expect(subject.veteran.is_veteran).to eq(true) expect(subject.primary_caregiver.icn).to eq('PC1234') @@ -126,6 +137,7 @@ %i[ claim_id claim_guid + submitted_at veteran primary_caregiver secondary_caregiver_one @@ -151,6 +163,7 @@ { 'claimId' => 123, 'claimGuid' => 'my-uuid', + 'submittedAt' => nil, 'veteran' => { 'icn' => nil, 'isVeteran' => nil @@ -179,6 +192,7 @@ { 'claimId' => 123, 'claimGuid' => 'my-uuid', + 'submittedAt' => nil, 'veteran' => { 'icn' => nil, 'isVeteran' => nil @@ -196,9 +210,11 @@ context 'with a maximum data set' do it 'can receive :to_request_payload' do + claim_created_at = DateTime.now.iso8601 subject = described_class.new( claim_id: 123, claim_guid: 'my-uuid', + submitted_at: claim_created_at, veteran: { icn: 'VET1234', is_veteran: true @@ -218,6 +234,7 @@ { 'claimId' => 123, 'claimGuid' => 'my-uuid', + 'submittedAt' => claim_created_at, 'veteran' => { 'icn' => 'VET1234', 'isVeteran' => true diff --git a/spec/lib/carma/models/submission_spec.rb b/spec/lib/carma/models/submission_spec.rb index ba5016e36a..d5b327bacd 100644 --- a/spec/lib/carma/models/submission_spec.rb +++ b/spec/lib/carma/models/submission_spec.rb @@ -164,23 +164,46 @@ end describe '::from_claim' do - it 'transforms a CaregiversAssistanceClaim to a new CARMA::Model::Submission' do - claim = build(:caregivers_assistance_claim) + context 'with the caregiver_carma_submitted_at flag enabled' do + it 'transforms a CaregiversAssistanceClaim to a new CARMA::Model::Submission' do + expect(Flipper).to receive(:enabled?).with(:caregiver_carma_submitted_at).and_return(true) - submission = described_class.from_claim(claim) + claim = build(:caregivers_assistance_claim, created_at: DateTime.now) - expect(submission).to be_instance_of(described_class) - expect(submission.data).to eq(claim.parsed_form) - expect(submission.carma_case_id).to eq(nil) - expect(submission.submitted_at).to eq(nil) + submission = described_class.from_claim(claim) - expect(submission.metadata).to be_instance_of(CARMA::Models::Metadata) - expect(submission.metadata.claim_id).to eq(claim.id) - expect(submission.metadata.claim_guid).to eq(claim.guid) + expect(submission).to be_instance_of(described_class) + expect(submission.data).to eq(claim.parsed_form) + expect(submission.carma_case_id).to eq(nil) + + expect(submission.metadata).to be_instance_of(CARMA::Models::Metadata) + expect(submission.metadata.claim_id).to eq(claim.id) + expect(submission.metadata.claim_guid).to eq(claim.guid) + expect(submission.metadata.submitted_at).to eq(claim.created_at.iso8601) + end + end + + context 'with the caregiver_carma_submitted_at flag disabled' do + it 'transforms a CaregiversAssistanceClaim to a new CARMA::Model::Submission' do + expect(Flipper).to receive(:enabled?).with(:caregiver_carma_submitted_at).and_return(false) + + claim = build(:caregivers_assistance_claim, created_at: DateTime.now) + + submission = described_class.from_claim(claim) + + expect(submission).to be_instance_of(described_class) + expect(submission.data).to eq(claim.parsed_form) + expect(submission.carma_case_id).to eq(nil) + + expect(submission.metadata).to be_instance_of(CARMA::Models::Metadata) + expect(submission.metadata.claim_id).to eq(claim.id) + expect(submission.metadata.claim_guid).to eq(claim.guid) + expect(submission.metadata.submitted_at).to eq(nil) + end end it 'overrides :claim_id when passed in metadata and use claim.id instead' do - claim = build(:caregivers_assistance_claim) + claim = build(:caregivers_assistance_claim, created_at: DateTime.now) submission = described_class.from_claim(claim, claim_id: 99) @@ -191,10 +214,11 @@ expect(submission.metadata).to be_instance_of(CARMA::Models::Metadata) expect(submission.metadata.claim_id).to eq(claim.id) + expect(submission.metadata.submitted_at).to eq(claim.created_at.iso8601) end it 'overrides :claim_guid when passed in metadata and use claim.guid instead' do - claim = build(:caregivers_assistance_claim) + claim = build(:caregivers_assistance_claim, created_at: DateTime.now) submission = described_class.from_claim(claim, claim_guid: 'not-this-claims-guid') @@ -206,6 +230,7 @@ expect(submission.metadata).to be_instance_of(CARMA::Models::Metadata) expect(submission.metadata.claim_guid).not_to eq('not-this-claims-guid') expect(submission.metadata.claim_guid).to eq(claim.guid) + expect(submission.metadata.submitted_at).to eq(claim.created_at.iso8601) end end @@ -252,6 +277,7 @@ 'metadata' => { 'claimId' => 123, 'claimGuid' => 'my-uuid', + 'submittedAt' => nil, 'veteran' => { 'icn' => 'VET1234', 'isVeteran' => true