Skip to content

Commit e2b7d21

Browse files
committed
Set default dose sequence for flu to 1
Jira-Issue: MAV-1502
1 parent fc991b2 commit e2b7d21

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

app/models/programme.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def vaccinated_dose_sequence
103103
end
104104

105105
def default_dose_sequence
106-
hpv? ? vaccinated_dose_sequence : nil
106+
hpv? || flu? ? vaccinated_dose_sequence : nil
107107
end
108108

109109
def maximum_dose_sequence

spec/lib/reports/offline_session_exporter_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ def validation_formula(worksheet:, column_name:, row: 1)
955955
context "Flu programme" do
956956
let(:programme) { create(:programme, :flu) }
957957
let(:expected_programme) { "Flu" }
958-
let(:expected_dose_sequence) { nil }
958+
let(:expected_dose_sequence) { 1 }
959959

960960
include_examples "generates a report"
961961
end

spec/models/immunisation_import_row_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,8 @@
11791179
"DATE_OF_VACCINATION" => session.dates.first.strftime("%Y%m%d"),
11801180
"SESSION_ID" => session.id.to_s,
11811181
"ORGANISATION_CODE" => organisation.ods_code,
1182-
"PERFORMING_PROFESSIONAL_EMAIL" => create(:user).email
1182+
"PERFORMING_PROFESSIONAL_EMAIL" => create(:user).email,
1183+
"DOSE_SEQUENCE" => "1"
11831184
)
11841185
end
11851186

spec/models/programme_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
context "with a Flu programme" do
161161
let(:programme) { build(:programme, :flu) }
162162

163-
it { should be_nil }
163+
it { should eq(1) }
164164
end
165165

166166
context "with an HPV programme" do

0 commit comments

Comments
 (0)