Removed extra pciu migration flippers (#21108)

* Removed extra pciu migration flippers

* fixed failing specs

* fixed update spec

* fixed mdot spec

* fixed swagger spec

* rubo and bgs service spec fixed

* fixed form prefill spec

Author: RachalCassity

app/controllers/concerns/vet360/transactionable.rb

@@ -23,7 +23,7 @@ def check_transaction_status!
     private
 
     def service
-      if Flipper.enabled?(:va_v3_contact_information_service, @current_user)
+      if Flipper.enabled?(:remove_pciu, @current_user)
         VAProfile::V2::ContactInformation::Service.new @current_user
       else
         VAProfile::ContactInformation::Service.new @current_user

app/controllers/concerns/vet360/writeable.rb

@@ -27,7 +27,7 @@ def write_to_vet360_and_render_transaction!(type, params, http_verb: 'post')
     end
 
     def invalidate_cache
-      if Flipper.enabled?(:va_v3_contact_information_service, @current_user)
+      if Flipper.enabled?(:remove_pciu, @current_user)
         VAProfileRedis::V2::Cache.invalidate(@current_user)
       else
         VAProfileRedis::Cache.invalidate(@current_user)
@@ -38,7 +38,7 @@ def invalidate_cache
 
     def build_record(type, params)
       # This needs to be refactored after V2 upgrade is complete
-      if type == 'address' && Flipper.enabled?(:va_v3_contact_information_service, @current_user)
+      if type == 'address' && Flipper.enabled?(:remove_pciu, @current_user)
         model = 'VAProfile::Models::V3::Address'
         # Ensures the address_pou is valid
         params[:address_pou] = 'RESIDENCE' if params[:address_pou] == 'RESIDENCE/CHOICE'
@@ -61,7 +61,7 @@ def validate!(record)
     end
 
     def service
-      if Flipper.enabled?(:va_v3_contact_information_service, @current_user)
+      if Flipper.enabled?(:remove_pciu, @current_user)
         VAProfile::V2::ContactInformation::Service.new @current_user
       else
         VAProfile::ContactInformation::Service.new @current_user

app/controllers/v0/profile/address_validation_controller.rb

@@ -13,7 +13,7 @@ class AddressValidationController < ApplicationController
       skip_before_action :authenticate, only: [:create]
 
       def create
-        address = if Flipper.enabled?(:va_v3_contact_information_service)
+        address = if Flipper.enabled?(:remove_pciu)
                     VAProfile::Models::V3::ValidationAddress.new(address_params)
                   else
                     VAProfile::Models::ValidationAddress.new(address_params)
@@ -49,7 +49,7 @@ def address_params
       end
 
       def service
-        @service ||= if Flipper.enabled?(:va_v3_contact_information_service)
+        @service ||= if Flipper.enabled?(:remove_pciu)
                        VAProfile::V3::AddressValidation::Service.new
                      else
                        VAProfile::AddressValidation::Service.new

app/controllers/v0/profile/persons_controller.rb

@@ -12,7 +12,7 @@ class PersonsController < ApplicationController
       after_action :invalidate_mpi_cache
 
       def initialize_vet360_id
-        response = if Flipper.enabled?(:va_v3_contact_information_service, @current_user)
+        response = if Flipper.enabled?(:remove_pciu, @current_user)
                      VAProfile::V2::Person::Service.new(@current_user).init_vet360_id
                    else
                      VAProfile::Person::Service.new(@current_user).init_vet360_id

app/controllers/v0/profile/transactions_controller.rb

@@ -29,7 +29,7 @@ def transaction_params
       end
 
       def service
-        if Flipper.enabled?(:va_v3_contact_information_service, @current_user)
+        if Flipper.enabled?(:remove_pciu, @current_user)
           VAProfile::V2::ContactInformation::Service.new @current_user
         else
           VAProfile::ContactInformation::Service.new @current_user

app/controllers/v0/veteran_readiness_employment_claims_controller.rb

@@ -46,7 +46,7 @@ def encrypted_user
         uuid: current_user.uuid,
         icn: current_user.icn,
         first_name: current_user.first_name,
-        va_profile_email: current_user.va_profile_email || current_user.va_profile_v2_email
+        va_profile_email: current_user.va_profile_email
       )
       KmsEncrypted::Box.new.encrypt(user_struct.to_h.to_json)
     end

app/models/async_transaction/va_profile/base.rb

@@ -43,7 +43,7 @@ def self.last_requested_for_user(user)
       #
       def self.start(user, response)
         # vet360_id is no longer required for Contact Information API V2
-        source_id = if Flipper.enabled?(:va_v3_contact_information_service,
+        source_id = if Flipper.enabled?(:remove_pciu,
                                         user)
                       user.vet360_id || user.uuid
                     else

app/models/form_profiles/va_21686c.rb

@@ -108,7 +108,7 @@ def metadata
   end
 
   def prefill
-    if Flipper.enabled?(:va_v3_contact_information_service, user)
+    if Flipper.enabled?(:remove_pciu, user)
       return {} unless user.authorize :va_profile, :access_to_v2?
     else
       return {} unless user.authorize :evss, :access?

app/models/form_profiles/va_526ez.rb

@@ -186,7 +186,7 @@ def initialize_vets360_contact_info
   end
 
   def initialize_veteran_contact_information
-    if Flipper.enabled?(:disability_compensation_remove_pciu, user)
+    if Flipper.enabled?(:remove_pciu, user)
       return {} unless user.authorize :va_profile, :access_to_v2?
 
       contact_info = initialize_vets360_contact_info
@@ -202,11 +202,10 @@ def initialize_veteran_contact_information
     end
     # Logging was added below to contrast/compare completeness of contact information returned
     # from VA Profile alone versus VA Profile + PCIU. This logging will be removed when the Flipper flag is.
-    Rails.logger.info("disability_compensation_remove_pciu=#{Flipper.enabled?(:disability_compensation_remove_pciu,
-                                                                              user)}," \
-                        "mailing_address=#{contact_info[:mailing_address].present?}," \
-                        "email_address=#{contact_info[:email_address].present?}," \
-                        "primary_phone=#{contact_info[:primary_phone].present?}")
+    Rails.logger.info("remove_pciu=#{Flipper.enabled?(:remove_pciu, user)}," \
+                      "mailing_address=#{contact_info[:mailing_address].present?}," \
+                      "email_address=#{contact_info[:email_address].present?}," \
+                      "primary_phone=#{contact_info[:primary_phone].present?}")
 
     contact_info = VA526ez::FormContactInformation.new(contact_info)
 

app/models/user.rb

@@ -410,11 +410,15 @@ def onboarding
   delegate :show_onboarding_flow_on_login, to: :onboarding, allow_nil: true
 
   def vet360_contact_info
-    return nil unless VAProfile::Configuration::SETTINGS.contact_information.enabled && vet360_id.present?
+    return nil unless VAProfile::Configuration::SETTINGS.contact_information.enabled &&
+                      (
+                        (!Flipper.enabled?(:remove_pciu, self) && vet360_id.present?) ||
+                        (Flipper.enabled?(:remove_pciu, self) && icn.present?)
+                      )
 
-    @vet360_contact_info ||= if Flipper.enabled?(:remove_pciu, self)
+    @vet360_contact_info ||= if Flipper.enabled?(:remove_pciu, self) && icn.present?
                                VAProfileRedis::V2::ContactInformation.for_user(self)
-                             else
+                             elsif !Flipper.enabled?(:remove_pciu, self) && vet360_id.present?
                                VAProfileRedis::ContactInformation.for_user(self)
                              end
   end

app/policies/va_profile_policy.rb

@@ -6,7 +6,7 @@ def access?
   end
 
   def access_to_v2?
-    if Flipper.enabled?(:va_v3_contact_information_service, user)
+    if Flipper.enabled?(:remove_pciu, user)
       user.icn.present?
     else
       user.vet360_id.present?

app/services/users/profile.rb

@@ -119,8 +119,7 @@ def form_526_required_identifiers
     end
 
     def vet360_contact_information
-      contact_info_v2_enabled = Flipper.enabled?(:va_v3_contact_information_service, user)
-      person = contact_info_v2_enabled ? user.vaprofile_contact_info : user.vet360_contact_info
+      person = user.vet360_contact_info
       return {} if person.blank?
 
       {

config/features.yml

@@ -1602,14 +1602,6 @@ features:
     actor_type: user
     enable_in_development: true
     description: Toggle for warning user of appointment conflicts on the direct scheduling calendar during booking.
-  va_v2_person_service:
-    actor_type: user
-    description: When enabled, the VAProfile::V2::Person::Service will be enabled
-    enable_in_development: true
-  va_v3_contact_information_service:
-    actor_type: user
-    description: When enabled, the VAProfile::V3::ContactInformation will be enabled
-    enable_in_development: true
   veteran_onboarding_beta_flow:
     actor_type: user
     description: Conditionally display the new veteran onboarding flow to user
@@ -1749,9 +1741,6 @@ features:
   disability_compensation_prevent_submission_job:
     actor_type: user
     description: If enabled, the submission form526 record will be created, but there will be submission job
-  disability_compensation_remove_pciu:
-    actor_type: user
-    description: If enabled, VA Profile is used to populate contact information- without PCIU calls (status quo)
   disability_compensation_use_api_provider_for_bdd_instructions:
     actor_type: user
     description: Provide a temporary killswitch for using the ApiProviderFactory to select an API for uploading BDD instructions
@@ -1979,9 +1968,6 @@ features:
   remove_pciu:
     actor_type: user
     description: If enabled, VA Profile is used to populate contact information with PCIU backup calls
-  remove_pciu_2:
-    actor_type: user
-    description: If enabled, removes all PCIU requests in form pre-fill.
   show_yellow_ribbon_table:
     actor_type: user
     description: Used to show yellow ribbon table in Comparison Tool

lib/va_profile/v2/contact_information/service.rb

@@ -137,7 +137,7 @@ def post_email(email)
         def put_email(email)
           old_email =
             begin
-              @user.va_profile_v2_email
+              @user.va_profile_email
             rescue
               nil
             end
@@ -238,7 +238,7 @@ def send_contact_change_notification(transaction_status, personalisation)
             transaction_id = transaction.id
             return if TransactionNotification.find(transaction_id).present?
 
-            email = @user.va_profile_v2_email
+            email = @user.va_profile_email
             return if email.blank?
 
             VANotifyEmailJob.perform_async(

modules/ask_va_api/app/controllers/ask_va_api/v0/address_validation_controller.rb

@@ -13,7 +13,7 @@ class AddressValidationController < ApplicationController
       service_tag 'profile'
 
       def create
-        address = if Flipper.enabled?(:va_v3_contact_information_service)
+        address = if Flipper.enabled?(:remove_pciu)
                     VAProfile::Models::V3::ValidationAddress.new(address_params)
                   else
                     VAProfile::Models::ValidationAddress.new(address_params)
@@ -47,7 +47,7 @@ def address_params
       end
 
       def service
-        @service ||= if Flipper.enabled?(:va_v3_contact_information_service)
+        @service ||= if Flipper.enabled?(:remove_pciu)
                        VAProfile::V3::AddressValidation::Service.new
                      else
                        VAProfile::AddressValidation::Service.new

modules/ask_va_api/spec/requests/ask_va_api/v0/address_validation_spec.rb

@@ -120,7 +120,7 @@
     let(:incorrect_address_pou) { build(:va_profile_v3_address, :incorrect_address_pou) }
 
     before do
-      allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service).and_return(true)
+      allow(Flipper).to receive(:enabled?).with(:remove_pciu).and_return(true)
     end
 
     shared_examples 'invalid address' do

modules/burials/spec/lib/burials/form_profiles/va_21p530ez_spec.rb

@@ -10,6 +10,7 @@
   let(:address) { instance_double(Address, country: 'USA') }
 
   before do
+    allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(true)
     allow(FormProfile).to receive(:prefill_enabled_forms).and_return([form_id])
   end
 

modules/mobile/app/models/mobile/v0/user_accessible_services.rb

@@ -38,7 +38,7 @@ def service_auth_map
           prescriptions: access?(mhv_prescriptions: :access?),
           scheduleAppointments: access?(schedule_appointment: :access?),
           secureMessaging: access?(mhv_messaging: :mobile_access?),
-          userProfileUpdate: access?(vet360: :access?)
+          userProfileUpdate: access?(va_profile: :access_to_v2?)
         }
       end
       # rubocop:enable Metrics/MethodLength

modules/mobile/spec/requests/mobile/v0/community_care_providers_spec.rb

@@ -11,7 +11,6 @@
   let(:json_body_headers) { { 'Content-Type' => 'application/json', 'Accept' => 'application/json' } }
 
   before do
-    allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service, instance_of(User)).and_return(false)
     allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(false)
   end
 

modules/mobile/spec/requests/mobile/v0/user/addresses_spec.rb

@@ -10,7 +10,6 @@
   before do
     allow(Flipper).to receive(:enabled?).with(:mobile_v2_contact_info, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:mobile_v2_contact_info).and_return(true)
-    allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(true)
     Timecop.freeze(Time.zone.parse('2024-08-27T18:51:06.012Z'))
   end

modules/mobile/spec/requests/mobile/v0/user/contact_info_spec.rb

@@ -3,7 +3,6 @@
 require_relative '../../../../support/helpers/rails_helper'
 RSpec.describe 'Mobile::V0::User::ContactInfo', type: :request do
   before do
-    allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service, instance_of(User)).and_return(false)
     allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(false)
   end
 

modules/mobile/spec/requests/mobile/v0/user/emails_spec.rb

@@ -9,7 +9,6 @@
 
   before do
     allow(Flipper).to receive(:enabled?).with(:mobile_v2_contact_info, instance_of(User)).and_return(true)
-    allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(true)
     Timecop.freeze(Time.zone.parse('2024-08-27T18:51:06.000Z'))
   end

modules/mobile/spec/requests/mobile/v0/user/phones_spec.rb

@@ -13,7 +13,6 @@
 
   before do
     allow(Flipper).to receive(:enabled?).with(:mobile_v2_contact_info, instance_of(User)).and_return(true)
-    allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(true)
     Timecop.freeze(Time.zone.parse('2024-08-27T18:51:06.012Z'))
   end

modules/mobile/spec/requests/mobile/v0/user_spec.rb

@@ -12,7 +12,6 @@
 
   before do
     allow(Flipper).to receive(:enabled?).with(:mobile_v2_contact_info, instance_of(User)).and_return(true)
-    allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:mobile_lighthouse_letters, instance_of(User)).and_return(false)
     allow(Flipper).to receive(:enabled?).with(:mobile_lighthouse_claims, instance_of(User)).and_return(false)

modules/mobile/spec/requests/mobile/v1/user_spec.rb

@@ -8,7 +8,6 @@
 
   before do
     allow(Flipper).to receive(:enabled?).with(:mobile_v2_contact_info, instance_of(User)).and_return(true)
-    allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:mobile_lighthouse_letters, instance_of(User)).and_return(false)
     allow(Flipper).to receive(:enabled?).with(:mobile_lighthouse_claims, instance_of(User)).and_return(false)

modules/mobile/spec/services/sync_update_service_spec.rb

@@ -8,7 +8,6 @@
 
   before do
     allow(Flipper).to receive(:enabled?).with(:mobile_v2_contact_info, instance_of(User)).and_return(true)
-    allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(true)
     Timecop.freeze(Time.zone.parse('2024-09-16T16:09:37.000Z'))
   end

modules/mobile/spec/sidekiq/vet360_linking_spec.rb

@@ -8,7 +8,6 @@
   before do
     allow(Flipper).to receive(:enabled?).with(:mobile_v2_contact_info, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:mobile_v2_contact_info).and_return(true)
-    allow(Flipper).to receive(:enabled?).with(:va_v3_contact_information_service, instance_of(User)).and_return(true)
     allow(Flipper).to receive(:enabled?).with(:remove_pciu, instance_of(User)).and_return(true)
   end
 

modules/veteran/app/sidekiq/organizations/update.rb

@@ -74,7 +74,7 @@ def record_can_be_updated?(org_data)
     # @param address [Hash] A hash containing the details of the organization's address.
     # @return [VAProfile::Models::ValidationAddress] A validation address object ready for address validation service.
     def build_validation_address(address)
-      validation_model = if Flipper.enabled?(:va_v3_contact_information_service)
+      validation_model = if Flipper.enabled?(:remove_pciu)
                            VAProfile::Models::V3::ValidationAddress
                          else
                            VAProfile::Models::ValidationAddress
@@ -97,7 +97,7 @@ def build_validation_address(address)
     # @param candidate_address [VAProfile::Models::ValidationAddress] The address to be validated.
     # @return [Hash] The response from the address validation service.
     def validate_address(candidate_address)
-      validation_service = if Flipper.enabled?(:va_v3_contact_information_service)
+      validation_service = if Flipper.enabled?(:remove_pciu)
                              VAProfile::V3::AddressValidation::Service.new
                            else
                              VAProfile::AddressValidation::Service.new
@@ -131,7 +131,7 @@ def update_org_record(org_data, api_response)
     # @param org_data [Hash] Original org_data containing the address and other details.
     # @param api_response [Hash] The response from the address validation service.
     def build_address_attributes(org_data, api_response)
-      if Flipper.enabled?(:va_v3_contact_information_service)
+      if Flipper.enabled?(:remove_pciu)
         build_v3_address(api_response['candidate_addresses'].first)
       else
         address = api_response['candidate_addresses'].first['address']

modules/veteran/app/sidekiq/representatives/update.rb

@@ -77,7 +77,7 @@ def record_can_be_updated?(rep_data)
     # @param address [Hash] A hash containing the details of the representative's address.
     # @return [VAProfile::Models::ValidationAddress] A validation address object ready for address validation service.
     def build_validation_address(address)
-      validation_model = if Flipper.enabled?(:va_v3_contact_information_service)
+      validation_model = if Flipper.enabled?(:remove_pciu)
                            VAProfile::Models::V3::ValidationAddress
                          else
                            VAProfile::Models::ValidationAddress
@@ -100,7 +100,7 @@ def build_validation_address(address)
     # @param candidate_address [VAProfile::Models::ValidationAddress] The address to be validated.
     # @return [Hash] The response from the address validation service.
     def validate_address(candidate_address)
-      validation_service = if Flipper.enabled?(:va_v3_contact_information_service)
+      validation_service = if Flipper.enabled?(:remove_pciu)
                              VAProfile::V3::AddressValidation::Service.new
                            else
                              VAProfile::AddressValidation::Service.new
@@ -157,7 +157,7 @@ def update_flags(representative_id, flag_type)
     # @param rep_data [Hash] Original rep_data containing the address and other details.
     # @param api_response [Hash] The response from the address validation service.
     def build_address_attributes(rep_data, api_response)
-      if Flipper.enabled?(:va_v3_contact_information_service)
+      if Flipper.enabled?(:remove_pciu)
         build_v3_address(api_response['candidate_addresses'].first)
       else
         address = api_response['candidate_addresses'].first['address']