Merge pull request #412 from colto/issue/376

[Issue #376] Filter Expired Scholarships

app/controllers/api/v1/scholarships_controller.rb

@@ -2,7 +2,7 @@ module Api
   module V1
     class ScholarshipsController < ApiController
       def index
-        render json: Scholarship.all
+        render json: Scholarship.unexpired
       end
 
       def show

app/models/scholarship.rb

@@ -1,3 +1,5 @@
 class Scholarship < ApplicationRecord
   has_many :scholarship_applications
+
+  scope :unexpired, -> { where('close_time > ? OR close_time IS NULL', Time.current) }
 end

test/models/scholarship_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class ScholarshipTest < ActiveSupport::TestCase
+  test 'unexpired returns unexpired scholarships' do
+    nil_date = create :scholarship, close_time: nil
+    active_date = create :scholarship, close_time: 3.days.from_now
+
+    assert_equal Scholarship.unexpired, [nil_date, active_date]
+  end
+
+  test 'unexpired doesn\'t return expired scholarships' do
+    expired_date = create :scholarship, close_time: 3.days.ago
+
+    assert_not_includes Scholarship.unexpired, expired_date
+  end
+end