Merge pull request #657 from berkmancenter/dev

Dev
berkmancenter · May 28, 2021 · 65f7860 · 65f7860
2 parents 80a52ea + d3d1a0f
commit 65f7860
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). It uses [CalVer](https://calver.org/) as of May 2019.
 
+## [21.05d](https://github.com/berkmancenter/lumendatabase/releases/tag/2021.05d) - 2021-05-28
+### Changed
+* Made the `kind` field required in the `file_upload` model.
+* Replaced the `expire_fragment` method with a system method call during the async indexing rake task.
+
 ## [21.05c](https://github.com/berkmancenter/lumendatabase/releases/tag/2021.05c) - 2021-05-24
 ### Changed
 * Bumped Ruby to `2.5.9`.

diff --git a/app/models/file_upload.rb b/app/models/file_upload.rb
@@ -9,8 +9,10 @@ class FileUpload < ApplicationRecord
 
   ALLOWED_KINDS = %w[original supporting].freeze
 
-  validates_inclusion_of :kind, in: ALLOWED_KINDS
-  validates :kind, length: { maximum: 255 }
+  validates :kind,
+            presence: true,
+            length: { maximum: 255 },
+            inclusion: { in: ALLOWED_KINDS }
 
   belongs_to :notice
   has_attached_file :file,

diff --git a/app/models/reindex_run.rb b/app/models/reindex_run.rb
@@ -18,7 +18,9 @@ def self.index_changed_model_instances
   end
 
   def self.sweep_search_result_caches
-    ApplicationController.new.expire_fragment(/search-result-[a-f0-9]{32}/)
+    # We were previously using the expire_fragment method but it was randomly
+    # generating "No such file or directory @ dir_initialize" errors
+    system("find tmp/cache -name '*search-result*' -delete")
   end
 
   def self.indexed?(klass, id)