Add ending time to challenges

app/lib/flag_challenge_share_module.rb

@@ -24,7 +24,7 @@ def solved?(times = 1)
   end
 
   def first_solve_time
-    first_solve&.created_at || Game.instance.defense_end
+    first_solve&.created_at || challenge&.close_challenge_at || Game.instance.defense_end
   end
 
   # Calculates how many points each team should get for solving a specific teams flag
@@ -82,11 +82,11 @@ def convert_shares_to_points_for(num_shares, total_shares, challenge_point_value
   private
 
   def calc_points_for_first_solve
-    first_capture_point_bonus + calc_point_value(start_calculation_at, Game.instance.defense_end)
+    first_capture_point_bonus + calc_point_value(start_calculation_at, stop_calculation_at)
   end
 
   def calc_points_for_solve
-    potential_shares = calc_shares(first_solve_time, Game.instance.defense_end)
+    potential_shares = calc_shares(first_solve_time, stop_calculation_at)
     convert_shares_to_points_for(
       potential_shares,
       calc_offensive_shares_for_solved_challenges.values.sum + potential_shares,

app/models/challenge.rb

@@ -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)

app/models/defense_flag.rb

@@ -36,7 +36,11 @@ def challenge_open?
   end
 
   def start_calculation_at
-    super || Game.instance.start
+    super || challenge&.open_challenge_at || Game.instance.start
+  end
+
+  def stop_calculation_at
+    challenge&.close_challenge_at || Game.instance.stop
   end
 
   def open?

app/models/share_challenge.rb

@@ -7,7 +7,11 @@ class ShareChallenge < StandardChallenge
   validates :unsolved_increment_period, numericality: { greater_than: 0 }
 
   def start_calculation_at
-    game&.start
+    open_challenge_at || game&.start
+  end
+
+  def stop_calculation_at
+    close_challenge_at || game&.stop
   end
 
   # Share Challenges do not have a concept of teams, however the FlagChallengeShareModule

db/migrate/20200626135801_add_open_challenge_at_and_close_challenge_at.rb

@@ -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

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: 2020_06_23_173255) do
+ActiveRecord::Schema.define(version: 2020_06_26_135801) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -52,6 +52,8 @@
     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
 

test/models/challenge_test.rb

@@ -11,4 +11,12 @@ 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 or before opening time' do
+    game = create(:active_game)
+    challenge = create(:standard_challenge, close_challenge_at: Time.current - 1.days, open_challenge_at: Time.current + 1.days)
+
+    assert_not challenge.before_close?
+    assert_not challenge.after_open?
+  end
 end

test/models/pentest_flag_test.rb

@@ -29,6 +29,7 @@ def setup
     unsolve_team = create(:team)
     solved_challenge = create(:pentest_solved_challenge, team: solve_team, challenge: @challenge)
     point_value = solved_challenge.flag.display_point_value(unsolve_team)
+    puts solved_challenge.flag.display_point_value(solve_team)
     assert_equal 50, point_value
   end