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.

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

Fix error on empty balance #609

Merged
Merged
Show file tree
Hide file tree
Changes from all 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
10 changes: 9 additions & 1 deletion lib/teiserver_web/controllers/api/spads_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ defmodule TeiserverWeb.API.SpadsController do
opts
})

if balance_result do
if is_non_empty_balance_result?(balance_result) do
# Get some counts for later
team_count =
balance_result.team_sizes
Expand Down Expand Up @@ -215,6 +215,14 @@ defmodule TeiserverWeb.API.SpadsController do
end
end

def is_non_empty_balance_result?(balance_result) do
cond do
balance_result == nil -> false
balance_result.team_sizes == %{} -> false
true -> true
end
end

@spec get_member_lobby(non_neg_integer()) :: T.lobby() | nil
defp get_member_lobby(userid) do
case Account.get_client_by_id(userid) do
Expand Down
21 changes: 21 additions & 0 deletions test/teiserver_web/controllers/api/spads_controller_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ defmodule TeiserverWeb.API.SpadsControllerTest do
alias Teiserver.Coordinator
alias Teiserver.Account.ClientLib
alias Teiserver.Client
alias TeiserverWeb.API.SpadsController

import Teiserver.TeiserverTestLib,
only: [
Expand Down Expand Up @@ -104,5 +105,25 @@ defmodule TeiserverWeb.API.SpadsControllerTest do

assert data == %{}
end

test "can detect empty balance result" do
# This is the default balance result when no players
# Defined inside balance_lib.ex
balance_result = %{
logs: [],
time_taken: 0,
captains: %{},
deviation: 0,
ratings: %{},
team_groups: %{},
team_players: %{},
team_sizes: %{},
means: %{},
stdevs: %{},
has_parties?: false
}

assert SpadsController.is_non_empty_balance_result?(balance_result) == false
end
end
end
Loading