Skip to content

Commit b2190d7

Browse files
authored
Merge pull request #3920 from nhsuk/personalisation-vaccine-brand
2 parents c5dd563 + 9175a35 commit b2190d7

2 files changed

Lines changed: 34 additions & 1 deletion

File tree

app/lib/govuk_notify_personalisation.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def to_h
6767
team_phone:,
6868
today_or_date_of_vaccination:,
6969
vaccination:,
70+
vaccine_brand:,
7071
vaccine_is_injection:,
7172
vaccine_is_nasal:,
7273
vaccine_side_effects:
@@ -301,6 +302,10 @@ def vaccination
301302
].join(" ")
302303
end
303304

305+
def vaccine_brand
306+
vaccination_record&.vaccine&.brand
307+
end
308+
304309
def vaccine_is_injection = vaccine_is?("injection")
305310

306311
def vaccine_is_nasal = vaccine_is?("nasal")

spec/lib/govuk_notify_personalisation_spec.rb

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,35 @@
223223
end
224224
end
225225

226-
context "with a vaccination record" do
226+
context "with an administered vaccination record" do
227+
let(:vaccine) do
228+
create(:vaccine, brand: "Vaccine", programme: programmes.first)
229+
end
230+
231+
let(:vaccination_record) do
232+
create(
233+
:vaccination_record,
234+
:administered,
235+
programme: programmes.first,
236+
performed_at: Date.new(2024, 1, 1),
237+
vaccine:
238+
)
239+
end
240+
241+
it do
242+
expect(to_h).to match(
243+
hash_including(
244+
day_month_year_of_vaccination: "01/01/2024",
245+
today_or_date_of_vaccination: "1 January 2024",
246+
outcome_administered: "yes",
247+
outcome_not_administered: "no",
248+
vaccine_brand: "Vaccine"
249+
)
250+
)
251+
end
252+
end
253+
254+
context "with a not-administered vaccination record" do
227255
let(:vaccination_record) do
228256
create(
229257
:vaccination_record,

0 commit comments

Comments
 (0)