Merge branch 'teams-dropdown-improvements'

Original Pull Request: #941 Co-authored-by: Simran Singhal <[email protected]> Co-authored-by: Arushi Singhal <[email protected]>
rails-girls-summer-of-code · Jun 3, 2018 · 06ef0be · 06ef0be
2 parents 9890b71 + 97dab44
commit 06ef0be
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 4 deletions.
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
@@ -28,7 +28,7 @@ def set_activities
   end
 
   def teams
-    Team.in_current_season.accepted.order(:name)
+    @teams ||= Team.accepted.in_nearest_season.order(:name)
   end
   helper_method :teams
 

diff --git a/app/models/team.rb b/app/models/team.rb
@@ -49,7 +49,9 @@ class Team < ApplicationRecord
   scope :accepted, -> { full_time.or(part_time) }
   scope :visible, -> { where.not(invisible: true).or(accepted) }
   scope :in_current_season, -> { where(season: Season.current) }
+  scope :in_previous_season, -> { by_season(Date.today.year - 1) }
   scope :by_season, ->(year) { joins(:season).where(seasons: { name: year }) }
+  scope :in_nearest_season, -> { in_current_season.presence || in_previous_season }
 
   class << self
     def ordered(sort = {})

diff --git a/app/views/activities/index.html.slim b/app/views/activities/index.html.slim
@@ -12,8 +12,7 @@ div.row
             = radio_button_tag :kind, kind == 'all' ? '' : kind, params[:kind] == kind
             = " " + kind == 'feed_entry' ? 'Blog Post' : kind.titleize
         label.team_filter
-          ' Team:
-          = select_tag :team_id, options_for_select(teams.map { |t| [t.display_name, t.id] }, params[:team_id]), include_blank: true, class: 'form-control'
+          = select_tag :team_id, options_for_select(teams.map { |t| [t.display_name, t.id] }, params[:team_id]), include_blank: 'Teams', class: 'form-control'
 
     p.pagination-info
       = page_entries_info @activities

diff --git a/db/migrate/20180602225032_index_teams_on_kind.rb b/db/migrate/20180602225032_index_teams_on_kind.rb
@@ -0,0 +1,5 @@
+class IndexTeamsOnKind < ActiveRecord::Migration[5.1]
+  def change
+    add_index :teams, :kind
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180524190818) do
+ActiveRecord::Schema.define(version: 20180602225032) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -271,6 +271,7 @@
     t.string "project_name"
     t.bigint "project_id"
     t.index ["applications_count"], name: "index_teams_on_applications_count"
+    t.index ["kind"], name: "index_teams_on_kind"
     t.index ["project_id"], name: "index_teams_on_project_id"
     t.index ["season_id"], name: "index_teams_on_season_id"
   end

diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
@@ -349,6 +349,29 @@
       end
     end
 
+    describe '.in_nearest_season' do
+      let(:current_season) { create(:season, name: Date.today.year) }
+      let!(:current_teams) { create_list(:team, 2, season: current_season) }
+      let(:prev_season) { create(:season, name: Date.today.year - 1) }
+      let!(:prev_teams) { create_list(:team, 2, season: prev_season) }
+
+      subject(:returned_teams) { described_class.in_nearest_season }
+
+      context 'when current season has teams' do
+        it 'returns those teams' do
+          expect(returned_teams).to match_array(current_teams)
+        end
+      end
+
+      context 'when current season has no teams' do
+        before { current_teams.each(&:destroy) }
+
+        it 'returns last season\'s teams' do
+          expect(returned_teams).to match_array(prev_teams)
+        end
+      end
+    end
+
     describe '.without_recent_log_update' do
       let(:team_without) { create :team }