Merge pull request #4415 from nhsuk/make-protocol-optional

Make `VaccinationRecord.protocol` optional from imports and API

Author: alistair-white-horne-tng

app/models/immunisation_import_row.rb

@@ -106,7 +106,6 @@ def to_vaccination_record
       performed_by_user:,
       performed_ods_code: performed_ods_code&.to_s,
       programme:,
-      protocol: "pgd",
       session:
     }
 
@@ -117,7 +116,7 @@ def to_vaccination_record
       )
     end
 
-    attributes.merge!(notify_parents: true) if session
+    attributes.merge!(notify_parents: true, protocol: "pgd") if session
 
     attributes_to_stage_if_already_exists = {
       batch_id: batch&.id,

app/models/vaccination_record.rb

@@ -141,10 +141,10 @@ class VaccinationRecord < ApplicationRecord
 
   encrypts :notes
 
-  with_options if: :administered? do
-    validates :full_dose, inclusion: [true, false]
-    validates :protocol, presence: true
-  end
+  validates :full_dose, inclusion: [true, false], if: :administered?
+  validates :protocol,
+            presence: true,
+            if: -> { administered? && recorded_in_service? }
 
   validates :notes, length: { maximum: 1000 }
 

spec/models/vaccination_record_spec.rb

@@ -74,7 +74,11 @@
       it { should allow_values(true, false).for(:full_dose) }
       it { should_not allow_values(nil).for(:full_dose) }
 
-      it { should validate_presence_of(:protocol) }
+      context "when administered in mavis" do
+        before { vaccination_record.session = create(:session) }
+
+        it { should validate_presence_of(:protocol) }
+      end
     end
 
     context "when not administered" do