Skip to content
Draft
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion app/models/challenge.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,20 @@ def challenge_open?
state.eql? 'open'
end

def before_close?
return Time.now.utc < close_challenge_at unless close_challenge_at.nil?

true
end

def after_open?
return Time.now.utc > open_challenge_at unless open_challenge_at.nil?

true
end

def open?
challenge_open? && game.open?
challenge_open? && before_close? && after_open? && game.open?
end

def display_point_value(_ = nil)
Expand Down
5 changes: 5 additions & 0 deletions db/migrate/20200624162213_add_challenge_end_time.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddChallengeEndTime < ActiveRecord::Migration[6.0]
def change
add_column :challenges, :challenge_end, :datetime
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class AddOpenChallengeAtAndCloseChallengeAt < ActiveRecord::Migration[6.0]
def change
add_column :challenges, :open_challenge_at, :datetime
add_column :challenges, :close_challenge_at, :datetime
end
end
5 changes: 5 additions & 0 deletions db/migrate/20200626140517_remove_challenge_end.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class RemoveChallengeEnd < ActiveRecord::Migration[6.0]
def change
remove_column :challenges, :challenge_end
end
end
10 changes: 6 additions & 4 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2020_06_23_173255) do
ActiveRecord::Schema.define(version: 2020_06_26_140517) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
Expand Down Expand Up @@ -49,9 +49,11 @@
t.boolean "design_phase", default: false
t.bigint "game_id"
t.boolean "sponsored", default: false, null: false
t.text "sponsor", default: ''
t.text "sponsor_logo", default: '', null: false
t.text "sponsor_description", default: '', null: false
t.text "sponsor", default: ""
t.text "sponsor_logo", default: "", null: false
t.text "sponsor_description", default: "", null: false
t.datetime "open_challenge_at"
t.datetime "close_challenge_at"
t.index ["game_id"], name: "index_challenges_on_game_id"
end

Expand Down
7 changes: 7 additions & 0 deletions test/models/challenge_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,11 @@ class ChallengeTest < ActiveSupport::TestCase
assert_equal chal2, chal1.next_challenge
assert_nil chal3.next_challenge
end

test 'challenge is closed when its passed closing time' do
game = create(:active_game)
challenge = create(:standard_challenge, close_challenge_at: Time.current - 1.days)

assert_not challenge.before_close?
end
end