Contest leaderboard hiding (#826)

* Add contest leaderboard hiding * fix open leaderboard wrong condition
source-academy · Sep 24, 2021 · c447552 · c447552
1 parent 02557b7
commit c447552
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/lib/cadet/assessments/assessments.ex b/lib/cadet/assessments/assessments.ex
@@ -953,8 +953,8 @@ defmodule Cadet.Assessments do
 
   defp leaderboard_open?(assessment, voting_question) do
     Timex.before?(
-      Timex.now(),
-      Timex.shift(assessment.close_at, hours: voting_question.question["reveal_hours"])
+      Timex.shift(assessment.close_at, hours: voting_question.question["reveal_hours"]),
+      Timex.now()
     )
   end
 

diff --git a/test/cadet_web/controllers/assessments_controller_test.exs b/test/cadet_web/controllers/assessments_controller_test.exs
@@ -480,6 +480,15 @@ defmodule CadetWeb.AssessmentsControllerTest do
       role_crs: role_crs,
       assessments: assessments
     } do
+      voting_assessment = assessments["practical"].assessment
+
+      voting_assessment
+      |> Assessment.changeset(%{
+        open_at: Timex.shift(Timex.now(), days: -30),
+        close_at: Timex.shift(Timex.now(), days: -20)
+      })
+      |> Repo.update()
+
       voting_question = assessments["practical"].voting_questions |> List.first()
       contest_assessment_number = voting_question.question.contest_number
 
@@ -548,8 +557,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
 
       voting_assessment
       |> Assessment.changeset(%{
-        open_at: Timex.shift(Timex.now(), days: -30),
-        close_at: Timex.shift(Timex.now(), days: -20)
+        close_at: Timex.shift(Timex.now(), days: 20)
       })
       |> Repo.update()
 
@@ -621,8 +629,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
 
       voting_assessment
       |> Assessment.changeset(%{
-        open_at: Timex.shift(Timex.now(), days: -30),
-        close_at: Timex.shift(Timex.now(), days: -20)
+        close_at: Timex.shift(Timex.now(), days: 20)
       })
       |> Repo.update()