Merge pull request #221 from CitizenLabDotCo/OS-280-seed-essential

OS-280 Dont fail on seeding essential wo app_configuration
CitizenLabDotCo · May 11, 2021 · 3f25bdb · 3f25bdb
2 parents 24a15d8 + 656e468
commit 3f25bdb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/back/app/models/common_password.rb b/back/app/models/common_password.rb
@@ -4,7 +4,7 @@ class CommonPassword < ApplicationRecord
 
 
   def self.initialize!
-    CommonPassword.destroy_all
+    CommonPassword.delete_all
     pwds = open(COMMON_PASSWORDS_FILE).readlines.map do |password|
       CommonPassword.new password: password.strip
     end

diff --git a/back/config/initializers/reload_cl_settings.rb b/back/config/initializers/reload_cl_settings.rb
@@ -35,4 +35,6 @@
   end
 rescue ActiveRecord::NoDatabaseError
   # rescue case where initializer is executed within db:create rake task
+rescue ActiveRecord::RecordNotFound
+  # rescue case where app_configuration doesn't exist yet in db:seed rake task
 end