Skip to content

Commit 018e3e2

Browse files
committed
Rename syncable_to_nhs_immunisations_api to ...
with_correct_source_for_nhs_immunisations_api and correct_source_for_nhs_immunisations_api? Makes more sense since these methods are only there to check the source of the vaccination record. Jira-Issue: MAV-2733
1 parent 961ce7d commit 018e3e2

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

app/lib/nhs/immunisations_api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ def should_be_in_immunisations_api?(
263263
ignore_nhs_number: false
264264
)
265265
vaccination_record.kept? &&
266-
vaccination_record.syncable_to_nhs_immunisations_api? &&
266+
vaccination_record.correct_source_for_nhs_immunisations_api? &&
267267
vaccination_record.administered? &&
268268
Flipper.enabled?(:imms_api_sync_job, vaccination_record.programme) &&
269269
(ignore_nhs_number || vaccination_record.patient.nhs_number.present?) &&

app/models/concerns/vaccination_record_sync_to_nhs_immunisations_api_concern.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module VaccinationRecordSyncToNHSImmunisationsAPIConcern
44
extend ActiveSupport::Concern
55

66
included do
7-
scope :syncable_to_nhs_immunisations_api,
7+
scope :with_correct_source_for_nhs_immunisations_api,
88
-> do
99
includes(:patient).then do
1010
it.sourced_from_service.or(it.sourced_from_bulk_upload)
@@ -17,7 +17,7 @@ module VaccinationRecordSyncToNHSImmunisationsAPIConcern
1717
Programme.all.select { Flipper.enabled?(:imms_api_sync_job, it) }
1818

1919
ids =
20-
syncable_to_nhs_immunisations_api.for_programmes(
20+
with_correct_source_for_nhs_immunisations_api.for_programmes(
2121
programmes
2222
).pluck(:id)
2323

@@ -33,7 +33,7 @@ module VaccinationRecordSyncToNHSImmunisationsAPIConcern
3333
after_commit :queue_sync_to_nhs_immunisations_api
3434
end
3535

36-
def syncable_to_nhs_immunisations_api?
36+
def correct_source_for_nhs_immunisations_api?
3737
(sourced_from_service? || sourced_from_bulk_upload?)
3838
end
3939

@@ -67,14 +67,14 @@ def changes_need_to_be_synced_to_nhs_immunisations_api?
6767

6868
def touch_nhs_immunisations_api_sync_pending_at
6969
return unless Flipper.enabled?(:imms_api_sync_job, programme)
70-
return unless syncable_to_nhs_immunisations_api?
70+
return unless correct_source_for_nhs_immunisations_api?
7171

7272
self.nhs_immunisations_api_sync_pending_at = Time.current
7373
end
7474

7575
def queue_sync_to_nhs_immunisations_api
7676
return unless Flipper.enabled?(:imms_api_sync_job, programme)
77-
return unless syncable_to_nhs_immunisations_api?
77+
return unless correct_source_for_nhs_immunisations_api?
7878
return if nhs_immunisations_api_sync_pending_at.nil?
7979

8080
if nhs_immunisations_api_synced_at &&

spec/lib/nhs/immunisations_api_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@
683683
context "when the vaccination record doesn't have the correct source" do
684684
before do
685685
allow(vaccination_record).to receive(
686-
:syncable_to_nhs_immunisations_api?
686+
:correct_source_for_nhs_immunisations_api?
687687
).and_return(false)
688688
end
689689

spec/models/concerns/vaccination_record_sync_to_nhs_immunisations_api_concern_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
context "when the vaccination record isn't syncable" do
3030
before do
3131
allow(vaccination_record).to receive(
32-
:syncable_to_nhs_immunisations_api?
32+
:correct_source_for_nhs_immunisations_api?
3333
).and_return(false)
3434
end
3535

@@ -71,8 +71,8 @@
7171
end
7272
end
7373

74-
describe "syncable_to_nhs_immunisations_api scope" do
75-
subject { VaccinationRecord.syncable_to_nhs_immunisations_api }
74+
describe "with_correct_source_for_nhs_immunisations_api scope" do
75+
subject { VaccinationRecord.with_correct_source_for_nhs_immunisations_api }
7676

7777
let!(:vaccination_record) do
7878
create(:vaccination_record, programme:, session:)
@@ -109,8 +109,8 @@
109109
end
110110
end
111111

112-
describe "#syncable_to_nhs_immunisations_api?" do
113-
subject { vaccination_record.syncable_to_nhs_immunisations_api? }
112+
describe "#correct_source_to_nhs_immunisations_api?" do
113+
subject { vaccination_record.correct_source_for_nhs_immunisations_api? }
114114

115115
context "when the vaccination record is eligible to sync" do
116116
it { should be true }

0 commit comments

Comments
 (0)