From 856d87f53b0749e63a7db62376179f0128952ecf Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 30 Nov 2022 10:17:13 +0000 Subject: [PATCH] Pull out confirmed set to null because they're also not marked as confirmed --- app/controllers/organisations_controller.rb | 2 +- app/controllers/schemes_controller.rb | 2 +- spec/models/scheme_spec.rb | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb index 700c50345..c1f5075b7 100644 --- a/app/controllers/organisations_controller.rb +++ b/app/controllers/organisations_controller.rb @@ -19,7 +19,7 @@ class OrganisationsController < ApplicationController end def schemes - all_schemes = Scheme.where(owning_organisation: @organisation).order(confirmed: :asc, service_name: :asc) + all_schemes = Scheme.where(owning_organisation: @organisation).order("confirmed ASC NULLS FIRST", service_name: :asc) @pagy, @schemes = pagy(filtered_collection(all_schemes, search_term)) @searched = search_term.presence diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb index 389446b7f..5bc50038a 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.order(confirmed: :asc, service_name: :asc) + all_schemes = Scheme.order("confirmed ASC NULLS FIRST", service_name: :asc) @pagy, @schemes = pagy(filtered_collection(all_schemes, search_term)) @searched = search_term.presence diff --git a/spec/models/scheme_spec.rb b/spec/models/scheme_spec.rb index d6bacb11a..2a71d1047 100644 --- a/spec/models/scheme_spec.rb +++ b/spec/models/scheme_spec.rb @@ -180,14 +180,17 @@ RSpec.describe Scheme, type: :model do before do FactoryBot.create_list(:scheme, 4) FactoryBot.create_list(:scheme, 3, confirmed: false) + FactoryBot.create_list(:scheme, 2, confirmed: nil) end 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) + all_schemes = described_class.all.order("confirmed ASC NULLS FIRST", service_name: :asc) + expect(all_schemes.count).to eq(9) expect(all_schemes[0].status).to eq(:incomplete) expect(all_schemes[1].status).to eq(:incomplete) expect(all_schemes[2].status).to eq(:incomplete) + expect(all_schemes[3].status).to eq(:incomplete) + expect(all_schemes[4].status).to eq(:incomplete) end end