Remove any download zip files when a request's cached files are expired.

2 files changed, 8 insertions, 0 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d7933b212..d93e68dab 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -28,6 +28,10 @@ class AdminController < ApplicationController
         cache_subpath = foi_fragment_cache_all_for_request(info_request)
         FileUtils.rm_rf(cache_subpath)
 
+        # Remove any download zips
+        download_dir = request_download_zip_dir(info_request)
+        FileUtils.rm_rf(download_dir)
+
         # Remove the database caches of body / attachment text (the attachment text
         # one is after privacy rules are applied)
         info_request.clear_in_database_caches!
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d8f7f9ea7..b707ae878 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -234,6 +234,10 @@ class ApplicationController < ActionController::Base
         File.join(first_three_digits.to_s, info_request.id.to_s)
     end
 
+    def request_download_zip_dir(info_request)
+        File.join(download_zip_dir, "download", request_dirs(info_request))
+    end
+
     def download_zip_dir()
         File.join(Rails.root, '/cache/zips/')
     end