Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Include hoursBeforeEarlyXpDecay in response #1156

Merged
merged 4 commits into from
Aug 23, 2024
Merged

feat: Include hoursBeforeEarlyXpDecay in response #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
173e5f7
feat: Include hoursBeforeEarlyXpDecay in response
GabrielCWT Aug 19, 2024
c8038f5
Merge branch 'master' into feat/show-bonus-xp-end-date
GabrielCWT Aug 21, 2024
214ba85
fix: Fix tests
GabrielCWT Aug 21, 2024
7330aac
Merge branch 'master' into feat/show-bonus-xp-end-date
RichDom2185 Aug 23, 2024
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
3 changes: 2 additions & 1 deletion lib/cadet_web/views/assessments_view.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ defmodule CadetWeb.AssessmentsView do
maxTeamSize: :max_team_size,
hasVotingFeatures: :has_voting_features,
hasTokenCounter: :has_token_counter,
isVotingPublished: &is_voting_assigned(&1.id)
isVotingPublished: &is_voting_assigned(&1.id),
hoursBeforeEarlyXpDecay: & &1.config.hours_before_early_xp_decay
RichDom2185 marked this conversation as resolved.
Show resolved Hide resolved
})
end

Expand Down
7 changes: 5 additions & 2 deletions test/cadet_web/controllers/assessments_controller_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ defmodule CadetWeb.AssessmentsControllerTest do
"earlySubmissionXp" => &1.config.early_submission_xp,
"hasVotingFeatures" => &1.has_voting_features,
"hasTokenCounter" => &1.has_token_counter,
"isVotingPublished" => Assessments.is_voting_published(&1.id)
"isVotingPublished" => Assessments.is_voting_published(&1.id),
"hoursBeforeEarlyXpDecay" => &1.config.hours_before_early_xp_decay
}
)

Expand Down Expand Up @@ -173,7 +174,8 @@ defmodule CadetWeb.AssessmentsControllerTest do
"earlySubmissionXp" => &1.config.early_submission_xp,
"hasVotingFeatures" => &1.has_voting_features,
"hasTokenCounter" => &1.has_token_counter,
"isVotingPublished" => Assessments.is_voting_published(&1.id)
"isVotingPublished" => Assessments.is_voting_published(&1.id),
"hoursBeforeEarlyXpDecay" => &1.config.hours_before_early_xp_decay
}
)

Expand Down Expand Up @@ -289,6 +291,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
"isVotingPublished" => Assessments.is_voting_published(&1.id),
"earlySubmissionXp" => &1.config.early_submission_xp,
"isGradingPublished" => nil,
"hoursBeforeEarlyXpDecay" => &1.config.hours_before_early_xp_decay,
"isPublished" =>
if &1.config.type == hd(configs).type do
false
Expand Down
Loading