Move ordering back to the controller

app/controllers/schemes_controller.rb

@@ -9,7 +9,7 @@ class SchemesController < ApplicationController
 
   def index
     redirect_to schemes_organisation_path(current_user.organisation) unless current_user.support?
-    all_schemes = Scheme.all
+    all_schemes = Scheme.all.order(confirmed: :asc, service_name: :asc)
 
     @pagy, @schemes = pagy(filtered_collection(all_schemes, search_term))
     @searched = search_term.presence

app/models/scheme.rb

@@ -21,7 +21,6 @@ class Scheme < ApplicationRecord
   validate :validate_confirmed
 
   auto_strip_attributes :service_name
-  default_scope { order(confirmed: :asc, service_name: :asc) }
 
   SENSITIVE = {
     No: 0,

spec/models/scheme_spec.rb

@@ -182,8 +182,8 @@ RSpec.describe Scheme, type: :model do
       FactoryBot.create_list(:scheme, 3, confirmed: false)
     end
 
-    it "sorts the schemes by status" do
+    it "can sort the schemes by status" do
-      all_schemes = described_class.all
+      all_schemes = described_class.all.order(confirmed: :asc, service_name: :asc)
       expect(all_schemes.count).to eq(7)
       expect(all_schemes[0].status).to eq(:incomplete)
       expect(all_schemes[1].status).to eq(:incomplete)