diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb index 2ea14d0fa..3e403c9fc 100644 --- a/app/controllers/admin/valuators_controller.rb +++ b/app/controllers/admin/valuators_controller.rb @@ -26,7 +26,7 @@ class Admin::ValuatorsController < Admin::BaseController end def summary - @valuators = Valuator.all + @valuators = Valuator.order(spending_proposals_count: :desc) end private diff --git a/app/models/valuation_assignment.rb b/app/models/valuation_assignment.rb index 8f50d9082..a0505a8aa 100644 --- a/app/models/valuation_assignment.rb +++ b/app/models/valuation_assignment.rb @@ -1,4 +1,4 @@ class ValuationAssignment < ActiveRecord::Base - belongs_to :valuator + belongs_to :valuator, counter_cache: :spending_proposals_count belongs_to :spending_proposal, counter_cache: true end diff --git a/db/migrate/20160426211658_add_assignments_counter_cache_to_valuators.rb b/db/migrate/20160426211658_add_assignments_counter_cache_to_valuators.rb new file mode 100644 index 000000000..9b6b6f99d --- /dev/null +++ b/db/migrate/20160426211658_add_assignments_counter_cache_to_valuators.rb @@ -0,0 +1,5 @@ +class AddAssignmentsCounterCacheToValuators < ActiveRecord::Migration + def change + add_column :valuators, :spending_proposals_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 726beac1a..55641228c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160422094733) do +ActiveRecord::Schema.define(version: 20160426211658) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -448,6 +448,7 @@ ActiveRecord::Schema.define(version: 20160422094733) do create_table "valuators", force: :cascade do |t| t.integer "user_id" t.string "description" + t.integer "spending_proposals_count", default: 0 end add_index "valuators", ["user_id"], name: "index_valuators_on_user_id", using: :btree diff --git a/spec/features/valuation/spending_proposals_spec.rb b/spec/features/valuation/spending_proposals_spec.rb index 6c0a1a587..a070afacc 100644 --- a/spec/features/valuation/spending_proposals_spec.rb +++ b/spec/features/valuation/spending_proposals_spec.rb @@ -408,7 +408,6 @@ feature 'Valuation spending proposals' do in_evaluation1 = create(:spending_proposal, feasible: true, valuation_finished: false) in_evaluation2 = create(:spending_proposal, feasible: true, valuation_finished: false) - finished_and_feasible1.valuators << scarlett finished_and_feasible2.valuators << scarlett @@ -443,6 +442,22 @@ feature 'Valuation spending proposals' do end end + scenario "Order by investment project count" do + isabel = create(:valuator) + john = create(:valuator) + scarlett = create(:valuator) + + 3.times { create(:spending_proposal, valuators: [scarlett])} + 1.times { create(:spending_proposal, valuators: [john])} + 2.times { create(:spending_proposal, valuators: [isabel])} + + visit admin_spending_proposals_path + click_link "Valuator summary" + + expect(scarlett.email).to appear_before(isabel.email) + expect(isabel.email).to appear_before(john.email) + end + scenario "Back link" do visit admin_spending_proposals_path