From 59986030d874eb8df25ad62a22dee1d4eff854f9 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Fri, 14 Jun 2024 11:28:15 +0100 Subject: [PATCH] fix: only show a single barcode when one is entered --- .../bulk_submission_excel/downloads_controller.rb | 5 ++--- .../bulk_submission_excel/downloads_controller_spec.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/bulk_submission_excel/downloads_controller.rb b/app/controllers/bulk_submission_excel/downloads_controller.rb index 53f9902459..b50d99eb67 100644 --- a/app/controllers/bulk_submission_excel/downloads_controller.rb +++ b/app/controllers/bulk_submission_excel/downloads_controller.rb @@ -73,12 +73,11 @@ def submission_parameters # Follows the format: first barcode_to_last barcode_date_sanger user ID # e.g. "SQPP-1234_to_SQPP-5678_20240521_ec20.xlsx" def build_filename(barcodes) - first_barcode = barcodes.first - last_barcode = barcodes.last date = Time.current.utc.strftime('%Y%m%d') username = current_user.login + barcode_part = barcodes.one? ? barcodes.first.to_s : "#{barcodes.first}_to_#{barcodes.last}" - "#{first_barcode}_to_#{last_barcode}_#{date}_#{username}.xlsx" + "#{barcode_part}_#{date}_#{username}.xlsx" end end diff --git a/spec/controllers/bulk_submission_excel/downloads_controller_spec.rb b/spec/controllers/bulk_submission_excel/downloads_controller_spec.rb index 9cd17301b1..1c365dd7d3 100644 --- a/spec/controllers/bulk_submission_excel/downloads_controller_spec.rb +++ b/spec/controllers/bulk_submission_excel/downloads_controller_spec.rb @@ -64,7 +64,7 @@ it 'generates an Excel file with the correct headers' do post :create, params: valid_attributes expect(response.headers['Content-Disposition']).to include( - "#{barcodes.first}_to_#{barcodes.first}_#{Time.current.utc.strftime('%Y%m%d')}_#{session[:user].login}.xlsx" + "#{barcodes.first}_#{Time.current.utc.strftime('%Y%m%d')}_#{session[:user].login}.xlsx" ) end end