Changes to reflect updated GeoServices VHA attributes

app/models/vha_facility_adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 class VHAFacilityAdapter
   VHA_URL = +ENV['VHA_MAPSERVER_URL']
-  VHA_ID_FIELD = 'StationNum'
+  VHA_ID_FIELD = 'StationNumber'
   FACILITY_TYPE = 'va_health_facility'
 
   def initialize
@@ -44,8 +44,8 @@ def service_whitelist
   end
 
   TOP_KEYMAP = {
-    unique_id: 'StationNum', name: 'StationNam', classification: 'CocClassif',
-    website: 'First_Inte', lat: 'Latitude', long: 'Longitude'
+    unique_id: 'StationNumber', name: 'StationName', classification: 'CocClassification',
+    website: 'First_InternetAddress', lat: 'Latitude', long: 'Longitude'
   }.freeze
 
   ADDR_KEYMAP = {
@@ -54,9 +54,10 @@ def service_whitelist
   }.freeze
 
   PHONE_KEYMAP = {
-    'main' => 'MainPhone', 'fax' => 'MainFax', 'after_hours' => 'AfterHours',
-    'patient_advocate' => 'PatientAdv', 'enrollment_coordinator' => 'Enrollment',
-    'pharmacy' => 'PharmacyPh'
+    'main' => 'MainPhone', 'fax' => 'MainFax', 'after_hours' => 'AfterHoursPhone',
+    'patient_advocate' => 'PatientAdvocatePhone',
+    'enrollment_coordinator' => 'EnrollmentCoordinatorPhone',
+    'pharmacy' => 'PharmacyPhone'
   }.freeze
 
   HOURS_KEYMAP = %w(
@@ -95,9 +96,10 @@ def service_whitelist
   }.freeze
 
   def self.mh_clinic_phone(attrs)
-    return '' if (attrs['MHClinicPh']).zero?
-    result = attrs['MHClinicPh'].to_s
-    result << ' x ' + attrs['Extension'].to_s unless (attrs['Extension']).zero?
+    return '' if (attrs['MHClinicPhone']).blank? || (attrs['MHClinicPhone']).zero?
+    result = attrs['MHClinicPhone'].to_s
+    result << ' x ' + attrs['Extension'].to_s unless
+      (attrs['Extension']).blank? || (attrs['Extension']).zero?
     result
   end
 

spec/factories/vha_gis_records.rb

@@ -3,30 +3,29 @@
   factory :vha_gis_record, class: Hash do
     gis_attrs do
       {
-        'FID' => 1049,
-        'OBJECTID' => 1736,
-        'FacilityDa' => '8-19-2016',
-        'Outpatient' => 1_472_428_800_000,
+        'OBJECTID' => 224,
+        'FacilityDataDate' => '10-31-2016',
+        'OutpatientServicesDataDate' => 1_477_872_000_000,
         'StationID' => 538,
         'VisnID' => 20,
-        'StationNum' => '648',
-        'StationNam' => 'Portland VA Medical Center',
-        'CommonStat' => 'Portland',
-        'CocClassif' => 'VA Medical Center (VAMC)',
-        'CocClass_1' => 'Firm',
-        'Building' => ' ',
+        'StationNumber' => '648',
+        'StationName' => 'Portland VA Medical Center',
+        'CommonStationName' => 'Portland',
+        'CocClassification' => 'VA Medical Center (VAMC)',
+        'CocClassificationAttribute' => 'Firm',
+        'Building' => '',
         'Street' => '3710 Southwest US Veterans Hospital Road',
-        'Suite' => ' ',
+        'Suite' => nil,
         'City' => 'Portland',
         'State' => 'OR',
         'Zip' => '97239',
         'Zip4' => '2964',
         'MainPhone' => '503-721-1498 x',
         'MainFax' => '503-273-5319 x',
-        'AfterHours' => '503-220-8262 x',
-        'PatientAdv' => '503-273-5308 x',
-        'Enrollment' => '503-273-5069 x',
-        'PharmacyPh' => '503-273-5183 x',
+        'AfterHoursPhone' => '503-220-8262 x',
+        'PatientAdvocatePhone' => '503-273-5308 x',
+        'EnrollmentCoordinatorPhone' => '503-273-5069 x',
+        'PharmacyPhone' => '503-273-5183 x',
         'Monday' => '24/7',
         'Tuesday' => '24/7',
         'Wednesday' => '24/7',
@@ -36,9 +35,56 @@
         'Sunday' => '24/7',
         'Latitude' => 45.49746145,
         'Longitude' => -122.68287208,
-        'MHClinicPh' => 5_032_735_187,
-        'Extension' => 0,
-        'First_Inte' => 'http://www.portland.va.gov/'
+        'Audiology' => '',
+        'ComplementaryAlternativeMed' => '',
+        'DentalServices' => '',
+        'DiagnosticServices' => '',
+        'ImagingAndRadiology' => '',
+        'LabServices' => '',
+        'EmergencyDept' => '',
+        'EyeCare' => '',
+        'MentalHealthCare' => 'YES',
+        'OutpatientMHCare' => '',
+        'OutpatientSpecMHCare' => '',
+        'VocationalAssistance' => '',
+        'OutpatientMedicalSpecialty' => '',
+        'AllergyAndImmunology' => '',
+        'CardiologyCareServices' => '',
+        'DermatologyCareServices' => '',
+        'Diabetes' => '',
+        'Dialysis' => '',
+        'Endocrinology' => '',
+        'Gastroenterology' => '',
+        'Hematology' => '',
+        'InfectiousDisease' => '',
+        'InternalMedicine' => '',
+        'Nephrology' => '',
+        'Neurology' => '',
+        'Oncology' => '',
+        'PulmonaryRespiratoryDisease' => '',
+        'Rheumatology' => '',
+        'SleepMedicine' => '',
+        'OutpatientSurgicalSpecialty' => '',
+        'CardiacSurgery' => '',
+        'ColoRectalSurgery' => '',
+        'ENT' => '',
+        'GeneralSurgery' => '',
+        'Gynecology' => '',
+        'Neurosurgery' => '',
+        'Orthopedics' => '',
+        'PainManagement' => '',
+        'PlasticSurgery' => '',
+        'Podiatry' => '',
+        'ThoracicSurgery' => '',
+        'Urology' => '',
+        'VascularSurgery' => '',
+        'PrimaryCare' => 'YES',
+        'Rehabilitation' => '',
+        'UrgentCare' => '',
+        'WellnessAndPreventativeCare' => '',
+        'First_InternetAddress' => 'http://www.portland.va.gov/',
+        'MHClinicPhone' => 5_032_735_187,
+        'Extension' => nil
       }
     end
     geometry do

spec/models/vha_facility_adapter_spec.rb

@@ -36,9 +36,23 @@
     expect(model.phone[:mental_health_clinic]).to eq('5032735187 x 12345')
   end
 
-  it '#it handles no mh_phone' do
+  it '#it handles zero mh_phone' do
     input = FactoryGirl.build(:vha_gis_record)
-    input['attributes']['MHClinicPh'] = 0
+    input['attributes']['MHClinicPhone'] = 0
+    model = described_class.from_gis(input)
+    expect(model.phone[:mental_health_clinic]).to eq('')
+  end
+
+  it '#it handles zero extension' do
+    input = FactoryGirl.build(:vha_gis_record)
+    input['attributes']['Extension'] = 0
+    model = described_class.from_gis(input)
+    expect(model.phone[:mental_health_clinic]).to eq('5032735187')
+  end
+
+  it '#it handles nil mh_phone' do
+    input = FactoryGirl.build(:vha_gis_record)
+    input['attributes']['MHClinicPhone'] = nil
     model = described_class.from_gis(input)
     expect(model.phone[:mental_health_clinic]).to eq('')
   end