Add points to user

Author: Vitaly

services/app/apps/codebattle/lib/codebattle/application.ex

@@ -20,6 +20,7 @@ defmodule Codebattle.Application do
         {ChromicPDF, chromic_pdf_opts()},
         {Codebattle.TasksImporter, []},
         {Codebattle.UsersRankUpdateServer, []},
+        {Codebattle.UsersPointsAndRankUpdateServer, []},
         {Codebattle.Bot.GameCreator, []},
         {Codebattle.Tournament.UpcomingRunner, []},
         {Codebattle.ImageCache, []},

services/app/apps/codebattle/lib/codebattle/pub_sub/events.ex

@@ -111,7 +111,10 @@ defmodule Codebattle.PubSub.Events do
       %Message{
         topic: "tournaments",
         event: "tournament:finished",
-        payload: %{id: params.tournament.id}
+        payload: %{
+          id: params.tournament.id,
+          grade: params.tournament.grade
+        }
       },
       %Message{
         topic: "tournament:#{params.tournament.id}:common",

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

@@ -139,7 +139,7 @@ defmodule Codebattle.Tournament.Context do
   @spec get_upcoming_tournaments(%{
           from: DateTime.t(),
           to: DateTime.t(),
-          user_id: non_neg_integer() | nil
+          user: User.t() | nil
         }) :: list(Tournament.t())
   def get_upcoming_tournaments(filter) do
     %{from: datetime_from, to: datetime_to} = filter
@@ -156,26 +156,53 @@ defmodule Codebattle.Tournament.Context do
     )
   end
 
+  @spec get_one_upcoming_tournament_for_each_grade() :: list(Tournament.t())
+  def get_one_upcoming_tournament_for_each_grade do
+    cte_query =
+      from(t in Tournament,
+        where: t.state == "upcoming" and t.grade != "open",
+        group_by: t.grade,
+        select: %{grade: t.grade, min_id: min(t.id)}
+      )
+
+    Repo.all(
+      from(t in Tournament,
+        join: cte in subquery(cte_query),
+        on: t.grade == cte.grade and t.id == cte.min_id,
+        where: t.state == "upcoming" and t.grade != "open",
+        order_by: [t.grade, t.starts_at]
+      )
+    )
+  end
+
   @spec get_user_tournaments(%{
           from: DateTime.t(),
           to: DateTime.t(),
-          user_id: non_neg_integer() | nil
+          user: User.t() | nil
         }) :: list(Tournament.t())
-  def get_user_tournaments(%{user_id: nil}), do: []
+  def get_user_tournaments(%{user: %{is_guest: true}}), do: []
 
   def get_user_tournaments(filter) do
-    %{from: datetime_from, to: datetime_to, user_id: user_id} = filter
-
-    Repo.all(
-      from(t in Tournament,
-        order_by: t.id,
-        where:
-          t.starts_at >= ^datetime_from and
-            t.starts_at <= ^datetime_to and
-            t.grade == "open" and
-            (t.creator_id == ^user_id or fragment("? = ANY(?)", ^user_id, t.winner_ids))
+    %{from: datetime_from, to: datetime_to, user: %{id: user_id} = user} = filter
+
+    if User.admin?(user) do
+      Repo.all(
+        from(t in Tournament,
+          order_by: t.id,
+          where: t.starts_at >= ^datetime_from and t.starts_at <= ^datetime_to
+        )
       )
-    )
+    else
+      Repo.all(
+        from(t in Tournament,
+          order_by: t.id,
+          where:
+            t.starts_at >= ^datetime_from and
+              t.starts_at <= ^datetime_to and
+              (t.creator_id == ^user_id or fragment("? = ANY(?)", ^user_id, t.winner_ids))
+        )
+      )
+    end
   end
 
   @spec get_live_tournaments_for_user(User.t()) :: list(Tournament.t())

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

@@ -65,50 +65,6 @@ defmodule Codebattle.Tournament do
   @task_strategies ~w(random sequential)
   @types ~w(swiss)
 
-  @grade_points %{
-    # Open tournaments
-    # All tasks are existing
-    # Casual/unranked mode, no points awarded
-    # Tasks: free play, any level, not ranked, created by user
-    "open" => [],
-
-    # Rookie — every 1 hours
-    # All tasks are existing
-    # Tasks: 5 existing easy tasks
-    # Designed for frequent play and grinding
-    "rookie" => [8, 4, 2],
-
-    # Challenger — daily
-    # All tasks are existing
-    # Tasks: 3 existing easy tasks + 1 existing medium task
-    # Daily backbone tournaments for steady point growth
-    "challenger" => [64, 32, 16, 8, 4, 2],
-
-    # Pro — weekly
-    # All tasks are existing
-    # Tasks: 4 existing easy tasks + 2 existing medium tasks
-    # Mid-level weekly tournaments with more challenges
-    "pro" => [128, 64, 32, 16, 8, 4, 2],
-
-    # Elite — every two weeks
-    # All tasks are existing
-    # Tasks: 5 existing easy tasks + 3 existing medium tasks
-    # Advanced difficulty and higher prestige
-    "elite" => [256, 128, 64, 32, 16, 8, 4, 2],
-
-    # Masters — once per month on the 21st (evening, two per day)
-    # All tasks are new
-    # Tasks: 5 easy tasks + 2 medium tasks
-    # Monthly major tournaments with fresh content
-    "masters" => [1024, 512, 256, 128, 64, 32, 16, 8, 4, 2],
-
-    # Grand Slam — four times per year (21 Mar, 21 Jun, 21 Sep, 21 Dec)
-    # All tasks are new
-    # Tasks: 5 easy tasks + 3 medium tasks + 1 hard task
-    # Seasonal finals, always ends the season
-    "grand_slam" => [2048, 1024, 512, 256, 128, 64, 32, 16, 8, 4, 2]
-  }
-
   @default_match_timeout Application.compile_env(:codebattle, :tournament_match_timeout)
 
   schema "tournaments" do
@@ -257,5 +213,4 @@ defmodule Codebattle.Tournament do
   def task_providers, do: @task_providers
   def task_strategies, do: @task_strategies
   def types, do: @types
-  def grade_points, do: @grade_points
 end

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

@@ -0,0 +1,87 @@
+defmodule Codebattle.Tournament do
+  @moduledoc """
+  THis is description of tourmanets based on that we want to generate tournaments_schedule for the current season.
+
+  I want to generate upcoming graded tournaments for
+  rookie,  challenge, pro, elite, masters, grand_slam
+  We have 4 seasons
+
+    Season 0: Sep 21 - Dec 21
+    Season 1: Dec 21 - Mar 21
+    Season 2: Mar 21 - Jun 21
+    Season 3: Jun 21 - Sep 21
+
+
+  For each tournament i need insert into database
+  It should looks like, for each tournament
+  Prettify description with markdown
+
+  For tournaments that are only once in the day pic 16 UTC
+  and i don't need other tournaments that day.
+  GrandSlam should be the day when we finish season.
+
+  Repo.insert(%{
+
+  starts_at: {UTC generated datetime}
+  grade: "rookie",
+  name: "Rookie, Season:0, #1",
+  description: "
+  Codebattle Season contest
+  Points : {get from @grade_points based on grade}
+
+
+  Play in season tournaments and earn points.
+  Win the season and get achievement!
+
+  4 seasons:application
+
+  "
+
+  })
+
+  """
+
+  @grade_points %{
+    # Open tournaments
+    # All tasks are existing
+    # Casual/unranked mode, no points awarded
+    # Tasks: free play, any level, not ranked, created by user
+    "open" => [],
+
+    # Rookie — every 1 hours
+    # All tasks are existing
+    # Tasks: 5 existing easy tasks
+    # Designed for frequent play and grinding
+    "rookie" => [8, 4, 2],
+
+    # Challenger — daily
+    # All tasks are existing
+    # Tasks: 3 existing easy tasks + 1 existing medium task
+    # Daily backbone tournaments for steady point growth
+    "challenger" => [64, 32, 16, 8, 4, 2],
+
+    # Pro — weekly
+    # All tasks are existing
+    # Tasks: 4 existing easy tasks + 2 existing medium tasks
+    # Mid-level weekly tournaments with more challenges
+    "pro" => [128, 64, 32, 16, 8, 4, 2],
+
+    # Elite — every two weeks
+    # All tasks are existing
+    # Tasks: 5 existing easy tasks + 3 existing medium tasks
+    # Advanced difficulty and higher prestige
+    "elite" => [256, 128, 64, 32, 16, 8, 4, 2],
+
+    # Masters — once per month on the 21st (evening, two per day)
+    # All tasks are new
+    # Tasks: 5 easy tasks + 2 medium tasks
+    # Monthly major tournaments with fresh content
+    "masters" => [1024, 512, 256, 128, 64, 32, 16, 8, 4, 2],
+
+    # Grand Slam — four times per year (21 Mar, 21 Jun, 21 Sep, 21 Dec)
+    # All tasks are new
+    # Tasks: 5 easy tasks + 3 medium tasks + 1 hard task
+    # Seasonal finals, always ends the season
+    "grand_slam" => [2048, 1024, 512, 256, 128, 64, 32, 16, 8, 4, 2]
+  }
+end

services/app/apps/codebattle/lib/codebattle/user.ex

@@ -262,9 +262,11 @@ defmodule Codebattle.User do
   # nil for new token users, clan will be managed by admin
   defp assign_clan(changeset, params, nil), do: assign_clan(changeset, params, 1)
 
-  defp assign_clan(changeset, %{clan: clan_name}, user_id), do: find_or_create_by_clan(changeset, clan_name, user_id)
+  defp assign_clan(changeset, %{clan: clan_name}, user_id),
+    do: find_or_create_by_clan(changeset, clan_name, user_id)
 
-  defp assign_clan(changeset, %{"clan" => clan_name}, user_id), do: find_or_create_by_clan(changeset, clan_name, user_id)
+  defp assign_clan(changeset, %{"clan" => clan_name}, user_id),
+    do: find_or_create_by_clan(changeset, clan_name, user_id)
 
   defp assign_clan(changeset, _params, _user_id), do: changeset