Browse Source

Update expiration time

pull/2785/head
Kat 8 months ago
parent
commit
7af662f12f
  1. 2
      app/jobs/email_csv_job.rb
  2. 2
      app/jobs/scheme_email_csv_job.rb
  3. 4
      spec/jobs/email_csv_job_spec.rb
  4. 6
      spec/jobs/scheme_email_csv_job_spec.rb

2
app/jobs/email_csv_job.rb

@ -4,7 +4,7 @@ class EmailCsvJob < ApplicationJob
BYTE_ORDER_MARK = "\uFEFF".freeze # Required to ensure Excel always reads CSV as UTF-8
EXPIRATION_TIME = 24.hours.to_i
EXPIRATION_TIME = 48.hours.to_i
def perform(user, search_term = nil, filters = {}, all_orgs = false, organisation = nil, codes_only_export = false, log_type = "lettings", year = nil) # rubocop:disable Style/OptionalBooleanParameter - sidekiq can't serialise named params
export_type = codes_only_export ? "codes" : "labels"

2
app/jobs/scheme_email_csv_job.rb

@ -4,7 +4,7 @@ class SchemeEmailCsvJob < ApplicationJob
BYTE_ORDER_MARK = "\uFEFF".freeze # Required to ensure Excel always reads CSV as UTF-8
EXPIRATION_TIME = 24.hours.to_i
EXPIRATION_TIME = 48.hours.to_i
def perform(user, search_term = nil, filters = {}, all_orgs = false, organisation = nil, download_type = "combined") # rubocop:disable Style/OptionalBooleanParameter - sidekiq can't serialise named params
unfiltered_schemes = if organisation.present? && user.support?

4
spec/jobs/email_csv_job_spec.rb

@ -72,7 +72,7 @@ describe EmailCsvJob do
expect(CsvDownload.first.organisation).to eq(user.organisation)
expect(CsvDownload.first.filename).to match(/lettings-logs-.*\.csv/)
expect(CsvDownload.first.download_type).to eq("lettings")
expect(CsvDownload.first.expiration_time).to eq(86_400)
expect(CsvDownload.first.expiration_time).to eq(172_800)
end
end
@ -117,7 +117,7 @@ describe EmailCsvJob do
expect(CsvDownload.first.organisation).to eq(user.organisation)
expect(CsvDownload.first.filename).to match(/sales-logs-.*\.csv/)
expect(CsvDownload.first.download_type).to eq("sales")
expect(CsvDownload.first.expiration_time).to eq(86_400)
expect(CsvDownload.first.expiration_time).to eq(172_800)
end
end

6
spec/jobs/scheme_email_csv_job_spec.rb

@ -59,7 +59,7 @@ describe SchemeEmailCsvJob do
expect(CsvDownload.first.organisation).to eq(user.organisation)
expect(CsvDownload.first.filename).to match(/schemes-.*\.csv/)
expect(CsvDownload.first.download_type).to eq("schemes")
expect(CsvDownload.first.expiration_time).to eq(86_400)
expect(CsvDownload.first.expiration_time).to eq(172_800)
end
end
@ -78,7 +78,7 @@ describe SchemeEmailCsvJob do
expect(CsvDownload.first.organisation).to eq(user.organisation)
expect(CsvDownload.first.filename).to match(/locations-.*\.csv/)
expect(CsvDownload.first.download_type).to eq("locations")
expect(CsvDownload.first.expiration_time).to eq(86_400)
expect(CsvDownload.first.expiration_time).to eq(172_800)
end
end
@ -97,7 +97,7 @@ describe SchemeEmailCsvJob do
expect(CsvDownload.first.organisation).to eq(user.organisation)
expect(CsvDownload.first.filename).to match(/schemes-and-locations-.*\.csv/)
expect(CsvDownload.first.download_type).to eq("combined")
expect(CsvDownload.first.expiration_time).to eq(86_400)
expect(CsvDownload.first.expiration_time).to eq(172_800)
end
end

Loading…
Cancel
Save