Allow unaltered shelters to be updated during import

hurricane-response · Sep 4, 2019 · ec1d4e3 · ec1d4e3
1 parent a829f3e
commit ec1d4e3
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 4 deletions.
diff --git a/app/importers/fema_importer.rb b/app/importers/fema_importer.rb
@@ -44,7 +44,7 @@ def self.shelters
 
         # If not closed, the sheter will likely have staff available to answer Questions
         # if shelter-seekers do show up even if they are not accepting at this time.
-        active: status != 'CLOSED',
+        archived: !(status != 'CLOSED'), # Yes, double negative
         accepting: accepting
       }
 

diff --git a/app/jobs/import_fema_shelters_job.rb b/app/jobs/import_fema_shelters_job.rb
@@ -36,7 +36,7 @@ def deduplicated_import!(data)
       Shelter.create!(data)
       1
     else
-      unarchive!(shelter)
+      update!(shelter, data)
       0
     end
   end
@@ -66,10 +66,13 @@ def find_by_source(data)
     Shelter.unscope(:where).where('LOWER(TRIM(source)) = ?', data[:source].strip.downcase)
   end
 
-  def unarchive!(shelter)
+  def update!(shelter, data)
+    _data = shelter.updated_by.blank? ? data : {}
     if shelter.archived
       logger.info "Unarchiving pre-existing shelter with ID #{shelter.id}"
-      shelter.update_columns(archived: false, updated_at: Time.now)
+      _data[:archived] = false
     end
+    shelter.assign_attributes(_data)
+    shelter.save if shelter.changed?
   end
 end
diff --git a/test/jobs/import_fema_shelters_job_test.rb b/test/jobs/import_fema_shelters_job_test.rb
@@ -29,4 +29,46 @@ class ImportFemaSheltersJobTest < ActiveJob::TestCase
       assert_equal shelters.count, Shelter.count
     end
   end
+
+  test 'import update unaltered shelter records' do
+    VCR.use_cassette('fema_shelters') do
+      # setup
+      shelters = FemaImporter.shelters
+      ImportFemaSheltersJob.perform_now
+
+      # modify a shelter
+      shelter = Shelter.first
+      correct_value = shelter.shelter
+      shelter.update_column(:shelter, 'This Shelter will be modified')
+
+      # reimport
+      ImportFemaSheltersJob.perform_now
+
+      shelter.reload
+      assert_equal correct_value, shelter.shelter
+    end
+  end
+
+  test 'import does not update user-updated shelter records' do
+    VCR.use_cassette('fema_shelters') do
+      # setup
+      shelters = FemaImporter.shelters
+      ImportFemaSheltersJob.perform_now
+
+      # mock a user edit
+      shelter = Shelter.first
+      correct_value = 'This Shelter was user-updated'
+      shelter.assign_attributes(
+        shelter: correct_value,
+        updated_by: users(:admin),
+      )
+      shelter.save
+
+      # reimport
+      ImportFemaSheltersJob.perform_now
+
+      shelter.reload
+      assert_equal correct_value, shelter.shelter
+    end
+  end
 end