Implement phase override

Use overriden value where present, else default to gias_phase

Author: murugapl

app/models/location.rb

@@ -126,8 +126,23 @@ class Location < ApplicationRecord
           )
         end
 
+  GIAS_PHASE_MAPPINGS = {
+    "nursery" => %w[nursery],
+    "primary" => %w[primary middle_deemed_primary],
+    "secondary" => %w[secondary middle_deemed_secondary],
+    "other" => %w[sixteen_plus all_through not_applicable]
+  }.freeze
+
+  PHASES = GIAS_PHASE_MAPPINGS.keys.freeze
+
   scope :where_phase,
-        ->(phase) { where(gias_phase: GIAS_PHASE_MAPPINGS.fetch(phase)) }
+        ->(phase) do
+          where(phase:).or(
+            where(phase: nil).where(
+              gias_phase: GIAS_PHASE_MAPPINGS.fetch(phase)
+            )
+          )
+        end
 
   scope :with_team,
         ->(academic_year:) do
@@ -191,6 +206,7 @@ class Location < ApplicationRecord
     validates :gias_local_authority_code, presence: true
     validates :gias_phase, inclusion: Location.gias_phases.keys
     validates :ods_code, absence: true
+    validates :phase, inclusion: { in: PHASES }, allow_nil: true
     validates :site, uniqueness: { scope: :urn }, allow_nil: true
     validates :urn, presence: true, uniqueness: { unless: :site }
   end
@@ -241,11 +257,10 @@ def dfe_number
   end
 
   def phase
-    if gias_phase
+    super.presence ||
       GIAS_PHASE_MAPPINGS
         .find { |_, values| values.include?(gias_phase) }
         &.first
-    end
   end
 
   def as_json
@@ -307,13 +322,6 @@ def import_default_programme_year_groups!(programmes, academic_year:)
 
   def organisation_ods_codes = Organisation.pluck(:ods_code)
 
-  GIAS_PHASE_MAPPINGS = {
-    "nursery" => %w[nursery],
-    "primary" => %w[primary middle_deemed_primary],
-    "secondary" => %w[secondary middle_deemed_secondary],
-    "other" => %w[sixteen_plus all_through not_applicable]
-  }.freeze
-
   def fhir_mapper
     @fhir_mapper ||= FHIRMapper::Location.new(self)
   end

spec/models/location_spec.rb

@@ -407,6 +407,14 @@
       it { should eq("other") }
     end
 
+    context "with a phase override" do
+      let(:location) do
+        build(:gias_school, gias_phase: "secondary", phase: "primary")
+      end
+
+      it { should eq("primary") }
+    end
+
     context "with something other than a school" do
       let(:location) { build(:community_clinic) }
 
@@ -434,6 +442,7 @@
           "is_attached_to_team" => false,
           "name" => location.name,
           "ods_code" => location.ods_code,
+          "phase" => nil,
           "position" => [location.position.x, location.position.y],
           "site" => location.site,
           "status" => "unknown",