Use administered outcome for already had

We can use outcome `administered` and a new source value
`manual_record` to ensure that already had records are treated more
consistently.

Jira-Issue: MAV-2848
Jira-Issue: MAV-3404

Author: stevehook

app/components/app_vaccination_record_summary_component.rb

@@ -351,12 +351,6 @@ def outcome_value
     outcome =
       VaccinationRecord.human_enum_name(:outcome, @vaccination_record.outcome)
 
-    if Flipper.enabled?(:already_vaccinated) &&
-         @vaccination_record.already_had? &&
-         @vaccination_record.reported_as_already_vaccinated?
-      outcome = VaccinationRecord.human_enum_name(:outcome, "administered")
-    end
-
     highlight_if(outcome, @vaccination_record.outcome_changed?)
   end
 

app/controllers/draft_vaccination_records_controller.rb

@@ -63,6 +63,7 @@ def update
 
     reload_steps
 
+    require 'pry'; binding.pry
     render_wizard @draft_vaccination_record
   end
 

app/controllers/patient_sessions/programmes_controller.rb

@@ -31,7 +31,7 @@ def record_already_vaccinated
       first_active_wizard_step:,
       location_id: nil,
       location_name: "Unknown",
-      outcome: :already_had,
+      outcome: (Flipper.enabled?(:already_vaccinated) ? :administered : :already_had),
       patient: @patient,
       performed_at: (Time.current unless Flipper.enabled?(:already_vaccinated)),
       performed_by_user_id:
@@ -42,7 +42,7 @@ def record_already_vaccinated
         (current_user.id if Flipper.enabled?(:already_vaccinated)),
       reported_at: (Time.current if Flipper.enabled?(:already_vaccinated)),
       session: @session,
-      source: "service"
+      source: (Flipper.enabled?(:already_vaccinated) ? :manual_report : :service)
     )
 
     redirect_to draft_vaccination_record_path(

app/models/draft_vaccination_record.rb

@@ -70,9 +70,9 @@ def wizard_steps
       :date_and_time,
       (:outcome if can_change_outcome?),
       (:supplier if requires_supplied_by?),
-      (:delivery if administered?),
-      (:dose if administered? && can_be_half_dose?),
-      (:batch if administered?),
+      (:delivery if administered? && !reported_as_already_vaccinated?),
+      (:dose if administered? && can_be_half_dose? && !reported_as_already_vaccinated?),
+      (:batch if administered? && !reported_as_already_vaccinated?),
       (
         if !already_had? && (session&.generic_clinic? || national_reporting_user_and_record?)
           :location
@@ -162,7 +162,7 @@ def wizard_steps
 
   with_options on: :update,
                if: -> do
-                 required_for_step?(:confirm, exact: true) && administered?
+                 required_for_step?(:confirm, exact: true) && administered? && !reported_as_already_vaccinated?
                end do
     validates :delivery_method,
               :delivery_site,
@@ -191,8 +191,7 @@ def already_had?
   end
 
   def reported_as_already_vaccinated?
-    Flipper.enabled?(:already_vaccinated) && already_had? &&
-      reported_by_id.present?
+    Flipper.enabled?(:already_vaccinated) && administered? && sourced_from_manual_report?
   end
 
   # So that a form error matches to a field in this model
@@ -381,6 +380,8 @@ def sourced_from_consent_refusal? = source == "consent_refusal"
 
   def sourced_from_national_reporting? = source == "national_reporting"
 
+  def sourced_from_manual_report? = source == "manual_report"
+
   def national_reporting_user_and_record?
     @current_user.selected_team.has_national_reporting_access? &&
       sourced_from_national_reporting?
@@ -487,7 +488,7 @@ def vaccine_method
   def can_be_half_dose? = vaccine_method == "nasal"
 
   def can_change_outcome?
-    (outcome != "already_had" || editing? || session.nil? || session.today?) &&
+    ((outcome != "already_had" && reported_at.nil?) || editing? || session.nil? || session.today?) &&
       !national_reporting_user_and_record?
   end
 

app/models/vaccination_record.rb

@@ -195,7 +195,8 @@ class VaccinationRecord < ApplicationRecord
          historical_upload: 1,
          nhs_immunisations_api: 2,
          consent_refusal: 3,
-         national_reporting: 4
+         national_reporting: 4,
+         manual_report: 5
        },
        prefix: "sourced_from",
        validate: true
@@ -272,7 +273,7 @@ class << self
   def not_administered? = !administered?
 
   def reported_as_already_vaccinated?
-    already_had? && reported_by_id.present?
+    administered? && sourced_from_manual_report?
   end
 
   def show_in_academic_year?(current_academic_year)