Skip to content

Commit 17e195d

Browse files
committed
Fix tests
1 parent d3ba65b commit 17e195d

5 files changed

Lines changed: 12 additions & 14 deletions

File tree

apps/codebattle/lib/codebattle/tournament/context.ex

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ defmodule Codebattle.Tournament.Context do
292292

293293
@spec update(Tournament.t(), map()) :: {:ok, Tournament.t()} | {:error, Ecto.Changeset.t()}
294294
def update(tournament, params) do
295+
params = Map.put_new(params, "creator_id", tournament.creator_id)
296+
295297
tournament
296298
|> Tournament.changeset(prepare_tournament_params(params))
297299
|> Repo.update()
@@ -451,7 +453,13 @@ defmodule Codebattle.Tournament.Context do
451453
end
452454

453455
defp normalize_moderator_ids(%{moderator_ids: moderator_ids} = params) do
454-
creator_id = get_in(params, [:creator, :id])
456+
creator_id =
457+
params
458+
|> Map.get(:creator)
459+
|> case do
460+
nil -> Map.get(params, :creator_id)
461+
creator -> Map.get(creator, :id) || Map.get(params, :creator_id)
462+
end
455463

456464
normalized_moderator_ids =
457465
moderator_ids

apps/codebattle/lib/codebattle_web/controllers/admin/group_tournament_controller.ex

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,6 @@ defmodule CodebattleWeb.Admin.GroupTournamentController do
173173
|> put_flash(:error, "Group tournament checker failed.")
174174
|> redirect(to: Routes.admin_group_tournament_path(conn, :show, group_tournament))
175175

176-
{:run_error, result} ->
177-
conn
178-
|> put_flash(:error, "Group tournament checker failed: #{format_run_error(result)}")
179-
|> redirect(to: Routes.admin_group_tournament_path(conn, :show, group_tournament))
180-
181176
{:error, %Ecto.Changeset{} = changeset} ->
182177
conn
183178
|> put_flash(:error, "Group tournament checker failed: #{inspect(changeset.errors)}")
@@ -246,11 +241,6 @@ defmodule CodebattleWeb.Admin.GroupTournamentController do
246241
GroupTaskContext.list_latest_solutions(group_tournament.group_task_id, player_ids)
247242
end
248243

249-
defp format_run_error(%{"body" => %{"error" => error}}) when is_binary(error), do: error
250-
defp format_run_error(%{"error" => error}) when is_binary(error), do: error
251-
defp format_run_error(%{errors: errors}), do: inspect(errors)
252-
defp format_run_error(result), do: inspect(result)
253-
254244
defp parse_user_id(user_id) when is_integer(user_id) and user_id > 0, do: {:ok, user_id}
255245

256246
defp parse_user_id(user_id) when is_binary(user_id) do

apps/codebattle/lib/codebattle_web/controllers/api/v1/group_task_solution_controller.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defmodule CodebattleWeb.Api.V1.GroupTaskSolutionController do
22
use CodebattleWeb, :controller
33

4-
alias Codebattle.GroupTournament.Context
4+
alias Codebattle.GroupTask.Context
55

66
def create(conn, params) do
77
if FunWithFlags.enabled?(:group_tasks_api) do

apps/codebattle/test/codebattle/user/user_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule Codebattle.UserTest do
1+
defmodule Codebattle.User.ModelTest do
22
use CodebattleWeb.ConnCase, async: false
33

44
alias Codebattle.User

apps/codebattle/test/codebattle_web/controllers/api/v1/tournament_controller_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
defmodule CodebattleWeb.Api.V1.TournamentControllerTest do
2-
use CodebattleWeb.ConnCase, async: true
2+
use CodebattleWeb.ConnCase, async: false
33

44
alias Codebattle.Tournament.Context
55

0 commit comments

Comments
 (0)