Skip to content

Commit 8442830

Browse files
vtm9vtm9
committed
Fix tests
1 parent 8bc68b7 commit 8442830

File tree

18 files changed

+64
-64
lines changed

18 files changed

+64
-64
lines changed

‎services/app/apps/codebattle/lib/codebattle/repo.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defmodule Codebattle.Repo do
77

88
@default_pagination %{page: 1, page_size: 50, total: false}
99

10-
def count(q), do: Codebattle.Repo.aggregate(q, :count)
10+
def count(q), do: Repo.aggregate(q, :count)
1111

1212
def paginate(query, params) do
1313
params = Map.merge(@default_pagination, params)

‎services/app/apps/codebattle/lib/codebattle/task.ex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ defmodule Codebattle.Task do
120120
def upsert!(params) do
121121
%__MODULE__{}
122122
|> changeset(params)
123-
|> Codebattle.Repo.insert!(
123+
|> Repo.insert!(
124124
on_conflict: [
125125
set: [
126126
arguments_generator: Map.get(params, :arguments_generator, ""),
@@ -176,7 +176,7 @@ defmodule Codebattle.Task do
176176
end
177177

178178
defp filter_visibility(query, user) do
179-
if Codebattle.User.admin?(user) do
179+
if User.admin?(user) do
180180
Function.identity(query)
181181
else
182182
from(t in query,
@@ -329,12 +329,12 @@ defmodule Codebattle.Task do
329329

330330
@spec can_access_task?(Codebattle.Task.t(), User.t()) :: boolean()
331331
def can_access_task?(task, user) do
332-
task.creator_id == user.id || Codebattle.User.admin?(user)
332+
task.creator_id == user.id || User.admin?(user)
333333
end
334334

335335
@spec can_delete_task?(Codebattle.Task.t(), User.t()) :: boolean()
336336
def can_delete_task?(task, user) do
337-
(task.creator_id == user.id || Codebattle.User.admin?(user)) && task.origin == "user"
337+
(task.creator_id == user.id || User.admin?(user)) && task.origin == "user"
338338
end
339339

340340
def change_state(task, state) do

‎services/app/apps/codebattle/lib/codebattle/task_pack.ex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ defmodule Codebattle.TaskPack do
6767
task_pack.creator_id == user.id || User.admin?(user)
6868
end
6969

70-
@spec get_tasks_by_pack_id(pos_integer()) :: [Codebattle.Task.t()]
70+
@spec get_tasks_by_pack_id(pos_integer()) :: [Task.t()]
7171
def get_tasks_by_pack_id(task_pack_id) do
7272
task_pack_id
7373
|> get()
@@ -80,7 +80,7 @@ defmodule Codebattle.TaskPack do
8080
end
8181
end
8282

83-
@spec get_tasks_by_pack_name(String.t()) :: [Codebattle.Task.t()]
83+
@spec get_tasks_by_pack_name(String.t()) :: [Task.t()]
8484
def get_tasks_by_pack_name(name) do
8585
Codebattle.TaskPack
8686
|> Repo.get_by(name: name)
@@ -94,7 +94,7 @@ defmodule Codebattle.TaskPack do
9494
end
9595

9696
defp retrieve_tasks_from_task_pack(task_pack) do
97-
tasks = Codebattle.Task.get_by_ids(task_pack.task_ids)
97+
tasks = Task.get_by_ids(task_pack.task_ids)
9898

9999
Enum.map(task_pack.task_ids, fn task_id ->
100100
Enum.find(tasks, fn task -> task.id == task_id end)

‎services/app/apps/codebattle/lib/codebattle/tournament/helpers.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ defmodule Codebattle.Tournament.Helpers do
368368
"won_tasks" => player.wins_count,
369369
"rank" => player.rank,
370370
"win_prob" => to_string(win_probs[player.id]),
371-
"returned" => if(player.returned, do: 1, else: 0),
371+
# "returned" => if(player.returned, do: 1, else: 0),
372372
"active" => if(player.draw_index == max_draw_index, do: 1, else: 0),
373373
"history" => user_history[player.id] || []
374374
}

‎services/app/apps/codebattle/lib/codebattle/tournament/round.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ defmodule Codebattle.Tournament.Round do
4343

4444
field(:task_pack_id, :integer)
4545

46-
belongs_to(:tournament, Codebattle.Tournament)
46+
belongs_to(:tournament, Tournament)
4747
timestamps()
4848
end
4949

‎services/app/apps/codebattle/lib/codebattle/tournament/tournament.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ defmodule Codebattle.Tournament do
6565

6666
schema "tournaments" do
6767
belongs_to(:creator, Codebattle.User, on_replace: :update)
68-
belongs_to(:event, Codebattle.Event, on_replace: :update)
68+
belongs_to(:event, Event, on_replace: :update)
6969

7070
field(:access_token, :string)
7171
field(:access_type, :string, default: "public")

‎services/app/apps/codebattle/lib/codebattle_web/channels/tournament_channel.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ defmodule CodebattleWeb.TournamentChannel do
181181
tournament = socket.assigns.tournament_info
182182
user = socket.assigns.current_user
183183
ranking = Tournament.Ranking.get_nearest_page_by_player(tournament, user)
184-
clans = Tournament.Helpers.get_clans_by_ranking(tournament, ranking)
184+
clans = Helpers.get_clans_by_ranking(tournament, ranking)
185185

186186
push(socket, "tournament:player:joined", payload)
187187
push(socket, "tournament:ranking_update", %{ranking: ranking, clans: clans})

‎services/app/apps/codebattle/lib/codebattle_web/controllers/event_controller.ex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ defmodule CodebattleWeb.EventController do
1212
end
1313

1414
def new(conn, _params) do
15-
render(conn, "new.html", changeset: Codebattle.Event.changeset(%Codebattle.Event{}), user: conn.assigns.current_user)
15+
render(conn, "new.html", changeset: Event.changeset(%Event{}), user: conn.assigns.current_user)
1616
end
1717

1818
def show(conn, %{"id" => id}) do
@@ -30,7 +30,7 @@ defmodule CodebattleWeb.EventController do
3030
# Handle stages JSON if present
3131
params = process_stages_json(params)
3232

33-
case Codebattle.Event.create(params) do
33+
case Event.create(params) do
3434
{:ok, event} ->
3535
conn
3636
|> put_flash(:info, "Event created successfully.")
@@ -47,7 +47,7 @@ defmodule CodebattleWeb.EventController do
4747
# Handle stages JSON if present
4848
event_params = process_stages_json(event_params)
4949

50-
case Codebattle.Event.update(
50+
case Event.update(
5151
event,
5252
Map.put(event_params, "creator_id", conn.assigns.current_user.id)
5353
) do
@@ -64,7 +64,7 @@ defmodule CodebattleWeb.EventController do
6464
def edit(conn, %{"id" => id}) do
6565
event = Event.get!(id)
6666

67-
changeset = Codebattle.Event.changeset(event)
67+
changeset = Event.changeset(event)
6868
render(conn, "edit.html", event: event, changeset: changeset, user: conn.assigns.current_user)
6969
end
7070

‎services/app/apps/codebattle/lib/codebattle_web/controllers/raw_task_controller.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ defmodule CodebattleWeb.RawTaskController do
6464
task = Task.get!(id)
6565

6666
if Task.can_access_task?(task, conn.assigns.current_user) do
67-
changeset = Codebattle.Task.changeset(task)
67+
changeset = Task.changeset(task)
6868
render(conn, "edit.html", task: task, changeset: changeset)
6969
else
7070
conn

‎services/app/apps/codebattle/lib/codebattle_web/controllers/task_controller.ex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ defmodule CodebattleWeb.TaskController do
108108
task = Task.get!(id)
109109

110110
if Task.can_access_task?(task, conn.assigns.current_user) do
111-
changeset = Codebattle.Task.changeset(task)
111+
changeset = Task.changeset(task)
112112
render(conn, "edit.html", task: task, changeset: changeset)
113113
else
114114
conn
@@ -139,7 +139,7 @@ defmodule CodebattleWeb.TaskController do
139139
task = Task.get!(id)
140140

141141
if Codebattle.User.admin?(conn.assigns.current_user) do
142-
Codebattle.Task.change_state(task, "active")
142+
Task.change_state(task, "active")
143143

144144
conn
145145
|> put_flash(:info, "Task updated successfully.")
@@ -156,7 +156,7 @@ defmodule CodebattleWeb.TaskController do
156156
task = Task.get!(id)
157157

158158
if Codebattle.User.admin?(conn.assigns.current_user) do
159-
Codebattle.Task.change_state(task, "disabled")
159+
Task.change_state(task, "disabled")
160160

161161
conn
162162
|> put_flash(:info, "Task updated successfully.")

0 commit comments

Comments
 (0)