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