From 3fae29225ae57b6c609ca11b60bffd6b69374da4 Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 25 Nov 2022 09:40:14 +0000 Subject: [PATCH] Move ordering back to the controller --- app/controllers/schemes_controller.rb | 2 +- app/models/scheme.rb | 1 - spec/models/scheme_spec.rb | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb index 30e378279..f84866e15 100644 --- a/app/controllers/schemes_controller.rb +++ b/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 diff --git a/app/models/scheme.rb b/app/models/scheme.rb index 5b92f201a..fce696bb6 100644 --- a/app/models/scheme.rb +++ b/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, diff --git a/spec/models/scheme_spec.rb b/spec/models/scheme_spec.rb index 2d41e7ffe..43a4112d4 100644 --- a/spec/models/scheme_spec.rb +++ b/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 - all_schemes = described_class.all + it "can sort the schemes by status" do + 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)