Add endpoint for EVSS

Gemfile

@@ -118,7 +118,6 @@ group :development do
   gem 'benchmark-ips'
   gem 'guard-rubocop'
   gem 'seedbank'
-  gem 'socksify'
   gem 'spring', platforms: :ruby # Spring speeds up development by keeping your application running in the background
   gem 'spring-commands-rspec'
 

Gemfile.lock

@@ -912,7 +912,6 @@ DEPENDENCIES
   sidekiq-pro!
   sidekiq-scheduler (~> 3.0)
   simplecov (< 0.18)
-  socksify
   spring
   spring-commands-rspec
   staccato

app/controllers/v0/apidocs_controller.rb

@@ -173,7 +173,6 @@ class ApidocsController < ApplicationController
       Swagger::Schemas::ConnectedApplications,
       Swagger::Schemas::Dependents,
       Swagger::Schemas::DismissedStatus,
-      Swagger::Schemas::Form526::RatedDisabilities,
       Swagger::Schemas::Email,
       Swagger::Schemas::Errors,
       Swagger::Schemas::EVSSAuthError,
@@ -184,6 +183,7 @@ class ApidocsController < ApplicationController
       Swagger::Schemas::Form526::Form4142,
       Swagger::Schemas::Form526::Form526SubmitV2,
       Swagger::Schemas::Form526::Form8940,
+      Swagger::Schemas::Form526::SeparationLocation,
       Swagger::Schemas::Form526::JobStatus,
       Swagger::Schemas::Form526::RatedDisabilities,
       Swagger::Schemas::Form526::SubmitDisabilityForm,

app/controllers/v0/disability_compensation_forms_controller.rb

@@ -11,6 +11,11 @@ def rated_disabilities
              serializer: RatedDisabilitiesSerializer
     end
 
+    def separation_locations
+      response = EVSS::ReferenceData::Service.new(@current_user).get_separation_locations
+      render json: response, each_serializer: EVSSSeparationLocationSerializer
+    end
+
     def suggested_conditions
       results = DisabilityContention.suggested(params[:name_part])
       render json: results, each_serializer: DisabilityContentionSerializer

app/serializers/evss_separation_location_serializer.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class EVSSSeparationLocationSerializer < ActiveModel::Serializer
+  attribute :separation_locations
+
+  def id
+    nil
+  end
+end

app/swagger/requests/disability_compensation_form.rb

@@ -144,6 +144,25 @@ class DisabilityCompensationForm
           end
         end
       end
+
+      swagger_path '/v0/disability_compensation_form/separation_locations' do
+        operation :get do
+          extend Swagger::Responses::AuthenticationError
+
+          key :description, 'Get the separation locations from EVSS'
+          key :operationId, 'getIntakeSites'
+          key :tags, %w[form_526]
+
+          parameter :authorization
+
+          response 200 do
+            key :description, 'Response is OK'
+            schema do
+              key :'$ref', :SeparationLocations
+            end
+          end
+        end
+      end
     end
   end
 end

app/swagger/schemas/form526/separation_locations.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Swagger
+  module Schemas
+    module Form526
+      class SeparationLocations
+        include Swagger::Blocks
+        swagger_schema :SeparationLocation do
+          key :required, [:separation_locations]
+
+          property :separation_locations, type: :array do
+            items do
+              key :required, %i[code description]
+              property :code, type: :string, example: '98283'
+              property :description, type: :string, example: 'AF Academy'
+            end
+          end
+        end
+      end
+    end
+  end
+end

config/betamocks/services_config.yml

@@ -181,6 +181,16 @@
     :cache_multiple_responses:
       :uid_location: header
       :uid_locator: 'va_eauth_pnid'
+  # EVSS Reference Data
+  - :method: :get
+    :path: "/wss-referencedata-services-web/rest/referencedata/v1/countries"
+    :file_path: "evss/reference_data/countries"
+  - :method: :get
+    :path: "/wss-referencedata-services-web/rest/referencedata/v1/states"
+    :file_path: "evss/reference_data/states"
+  - :method: :get
+    :path: "/wss-referencedata-services-web/rest/referencedata/v1/intakesites"
+    :file_path: "evss/reference_data/intakesites"
 
   # PPIU payment information
   - :method: :get

config/routes.rb

@@ -42,6 +42,7 @@
       post 'submit_all_claim'
       get 'suggested_conditions'
       get 'user_submissions'
+      get 'separation_locations'
     end
 
     resource :upload_supporting_evidence, only: :create

config/settings.yml

@@ -185,6 +185,7 @@ evss:
   mock_pciu: true
   mock_pciu_address: false
   mock_ppiu: true
+  mock_reference: false
   mock_itf: true
   mock_disabilities_form: true
   mock_common_service: true
@@ -194,9 +195,6 @@ evss:
     cert_path: ~
     key_path: ~
     root_ca: ~
-  jwt:
-    issuer: fake_issuer
-    key: fake_key
   reference_data_service:
     enabled: false
   international_postal_codes: 'config/evss/international_postal_codes.json'
@@ -444,10 +442,6 @@ betamocks:
   cache_dir: /cache
   services_config: config/betamocks/services_config.yml
 
-faraday_socks_proxy:
-  enabled: false
-  uri: socks5://localhost:2002
-
 google_analytics_tracking_id: ~
 
 # Settings for search

lib/evss/reference_data/configuration.rb

@@ -5,27 +5,28 @@ module ReferenceData
     # HTTP client configuration for the {ReferenceData::Service} to
     # set the base path and a service name for breakers and metrics
     #
-    class Configuration < EVSS::AWSConfiguration
+    class Configuration < EVSS::Configuration
       ##
       # @return [String] Base path for ReferenceData URLs.
       #
       def base_path
-        Settings.evss.aws.url.to_s
+        # TODO: remove "/VONAPP2/domain2" when both pint instances are up
+        "#{Settings.evss.url}/VONAPP2/domain2/wss-referencedata-services-web/rest/referencedata/v1"
       end
 
       ##
       # @return [String] Service name to use in breakers and metrics.
       #
       def service_name
-        'EVSS/AWS/ReferenceData'
+        'EVSS/ReferenceData'
       end
 
       ##
       # @return [Boolean] Should the service use mock data in lower environments.
       #
       def mock_enabled?
         # TODO: create mock data
-        false
+        Settings.evss.mock_reference || false
       end
     end
   end

lib/evss/reference_data/intake_sites_response.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'evss/response'
+
+module EVSS
+  module ReferenceData
+    ##
+    # Model for Intake Sites returned by reference_datea
+    #
+    # @param status [Integer] The HTTP status code
+    # @param response [Hash] The API response
+    #
+    # @!attribute countries
+    #   @return [Array[String]] An array of intake sites
+    #
+    class IntakeSitesResponse < EVSS::Response
+      attribute :separation_locations, Array[Hash]
+
+      def initialize(status, response = nil)
+        separation_locations = response&.body&.dig('intake_sites')
+        super(status, separation_locations: separation_locations)
+      end
+    end
+  end
+end

lib/evss/reference_data/service.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'evss/jwt'
-
 module EVSS
   module ReferenceData
     class Service < EVSS::Service
@@ -31,13 +29,11 @@ def get_states
         end
       end
 
-      private
-
-      # overrides EVSS::Service#headers_for_user
-      def headers_for_user(user)
-        {
-          Authorization: "Bearer #{EVSS::Jwt.new(user).encode}"
-        }
+      def get_separation_locations
+        with_monitoring_and_error_handling do
+          raw_response = perform(:get, 'intakesites')
+          EVSS::ReferenceData::IntakeSitesResponse.new(raw_response.status, raw_response)
+        end
       end
     end
   end