Browse Source

Pull out confirmed set to null because they're also not marked as confirmed

pull/1039/head
Kat 4 years ago
parent
commit
856d87f53b
  1. 2
      app/controllers/organisations_controller.rb
  2. 2
      app/controllers/schemes_controller.rb
  3. 7
      spec/models/scheme_spec.rb

2
app/controllers/organisations_controller.rb

@ -19,7 +19,7 @@ class OrganisationsController < ApplicationController
end end
def schemes 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)) @pagy, @schemes = pagy(filtered_collection(all_schemes, search_term))
@searched = search_term.presence @searched = search_term.presence

2
app/controllers/schemes_controller.rb

@ -9,7 +9,7 @@ class SchemesController < ApplicationController
def index def index
redirect_to schemes_organisation_path(current_user.organisation) unless current_user.support? 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)) @pagy, @schemes = pagy(filtered_collection(all_schemes, search_term))
@searched = search_term.presence @searched = search_term.presence

7
spec/models/scheme_spec.rb

@ -180,14 +180,17 @@ RSpec.describe Scheme, type: :model do
before do before do
FactoryBot.create_list(:scheme, 4) FactoryBot.create_list(:scheme, 4)
FactoryBot.create_list(:scheme, 3, confirmed: false) FactoryBot.create_list(:scheme, 3, confirmed: false)
FactoryBot.create_list(:scheme, 2, confirmed: nil)
end end
it "can sort the schemes by status" do it "can sort the schemes by status" do
all_schemes = described_class.all.order(confirmed: :asc, service_name: :asc) all_schemes = described_class.all.order("confirmed ASC NULLS FIRST", service_name: :asc)
expect(all_schemes.count).to eq(7) expect(all_schemes.count).to eq(9)
expect(all_schemes[0].status).to eq(:incomplete) expect(all_schemes[0].status).to eq(:incomplete)
expect(all_schemes[1].status).to eq(:incomplete) expect(all_schemes[1].status).to eq(:incomplete)
expect(all_schemes[2].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
end end

Loading…
Cancel
Save