update claim_evidence_request method

department-of-veterans-affairs · Oct 8, 2024 · 1f0659d · 1f0659d
1 parent 6aae3ed
commit 1f0659d
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/app/services/external_api/vbms_service.rb b/app/services/external_api/vbms_service.rb
@@ -140,21 +140,13 @@ def self.process_fetch_veteran_file_list_response(response)
   end
 
   def self.claim_evidence_request
-    user_css_id = if RequestStore[:current_user].present? && FeatureToggle.enabled?(:send_current_user_cred_to_ce_api)
-                    RequestStore[:current_user].css_id
-                  else
-                    ENV['CLAIM_EVIDENCE_VBMS_USER']
-                  end
-
-    station_id = if RequestStore[:current_user].present? && FeatureToggle.enabled?(:send_current_user_cred_to_ce_api)
-                   RequestStore[:current_user].station_id
-                 else
-                   ENV['CLAIM_EVIDENCE_STATION_ID']
-                 end
-
     ClaimEvidenceRequest.new(
-      user_css_id: user_css_id,
-      station_id: station_id
+      user_css_id: allow_user_info? ? RequestStore[:current_user].css_id : ENV['CLAIM_EVIDENCE_VBMS_USER'],
+      station_id: allow_user_info? ? RequestStore[:current_user].station_id : ENV['CLAIM_EVIDENCE_STATION_ID']
     )
   end
+
+  def self.allow_user_info?
+    RequestStore[:current_user].present? && FeatureToggle.enabled?(:send_current_user_cred_to_ce_api)
+  end
 end