Merge remote-tracking branch 'origin/CLDC-2140-scheme-typeahead-with-inactive-locations' into CLDC-2140-scheme-typeahead-with-inactive-locations

# Conflicts:
#	app/models/form/lettings/questions/location_id.rb
#	app/models/scheme.rb

app/models/scheme.rb

@@ -235,7 +235,7 @@ class Scheme < ApplicationRecord
   end
 
   def status_at(date)
-    return :incomplete unless confirmed && has_confirmed_locations?
+    return :incomplete unless confirmed && has_completed_locations?
     return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date
     return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date
     return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date
@@ -255,17 +255,13 @@ class Scheme < ApplicationRecord
     status == :deactivated
   end
 
-  def has_confirmed_locations?
-    confirmed_locations_count.positive?
+  def has_completed_locations?
+    completed_locations_count.positive?
   end
 
 private
 
-  def confirmed_locations_count
-    locations.confirmed.size
-  end
-
-  def unconfirmed_locations_count
-    locations.unconfirmed.size
+  def completed_locations_count
+    locations.count { |location| location.status != :incomplete }
   end
 end