Merge pull request #39 from leoamigood/top_guess

Adding top guess sorting

lib/alternis/engines/dictionary_engine_impl.ex

@@ -32,7 +32,7 @@ defmodule Alternis.Engines.DictionaryEngine.Impl do
         where: ^condition,
         where: d.language == ^language,
         select_merge: %{language: d.language},
-        order_by: w.frequency,
+        order_by: fragment("RANDOM()"),
         limit: 1
     )
   end

lib/alternis/guess.ex

@@ -31,6 +31,10 @@ defmodule Alternis.Guess do
     |> validate_required([:word, :bulls, :cows, :exact?])
   end
 
+  def priority(guess) do
+    length(guess.bulls) * 10 + length(guess.cows)
+  end
+
   def validate_word(attrs \\ %{}) do
     %Guess{}
     |> cast(attrs, [:word])

lib/alternis_web/live/game_live/game_component.ex

@@ -2,14 +2,15 @@ defmodule AlternisWeb.GameLive.GameComponent do
   use Phoenix.Component
 
   attr :guesses, :list, required: true
+  attr :update, :string, default: "append"
   slot :header
   slot :footer
 
   def timeline(assigns) do
     ~H"""
     <div>
       <%= render_slot(@header) %>
-      <ul id="game-guesses" phx-update="append">
+      <ul id="game-guesses" phx-update={@update}>
         <%= for guess <- @guesses do %>
           <li id={guess.id} style={if guess.exact?, do: "color:green"}>
             <%= guess.user.username %>: <%= guess.word %> - bulls: <%= length(guess.bulls) %>, cows: <%= length(

lib/alternis_web/live/game_live/index.html.heex

@@ -24,4 +24,4 @@
     </:header>
 </.board>
 
-<span><%= live_redirect "New Game", to: ~p"/games/new" %></span>
+<span><.link navigate={~p"/games/new"}>New Game</.link></span>

lib/alternis_web/live/game_live/show.ex

@@ -5,6 +5,7 @@ defmodule AlternisWeb.GameLive.Show do
 
   alias Alternis.Landing
   alias Alternis.Game.GameState.{Expired, Finished}
+  alias Alternis.Guess
 
   @game_ended_event "game_ended"
   @guess_placed_event "guess_placed"
@@ -25,6 +26,7 @@ defmodule AlternisWeb.GameLive.Show do
         {:ok,
          socket
          |> assign(:game, game)
+         |> assign(:update, "append")
          |> assign(:current_user, user)
          |> assign(:players, online_players(game.id))
          |> assign(:guesses, game.guesses), temporary_assigns: [guesses: []]}
@@ -33,7 +35,10 @@ defmodule AlternisWeb.GameLive.Show do
 
   @impl true
   def handle_info(%{event: @guess_placed_event, payload: %{guess: guess}}, socket) do
-    {:noreply, assign(socket, :guesses, [guess])}
+    {:noreply,
+     socket
+     |> assign(:update, "append")
+     |> assign(:guesses, [guess])}
   end
 
   def handle_info(%{event: @game_ended_event}, socket) do
@@ -44,6 +49,22 @@ defmodule AlternisWeb.GameLive.Show do
     {:noreply, socket |> assign(:players, online_players(game_id))}
   end
 
+  @impl true
+  def handle_event("order_top", %{"game_id" => game_id}, socket) do
+    case Landing.get_game!(game_id) do
+      nil ->
+        raise AlternisWeb.GameLive.GameNotFoundError
+
+      game ->
+        sorted = Enum.sort(game.guesses, &(Guess.priority(&1) > Guess.priority(&2)))
+
+        {:noreply,
+         socket
+         |> assign(:update, "replace")
+         |> assign(:guesses, sorted)}
+    end
+  end
+
   @impl true
   def handle_params(_params, _session, socket = %{assigns: %{game: game}}) do
     case game.state do

lib/alternis_web/live/game_live/show.html.heex

@@ -22,13 +22,15 @@
 <% end %>
 
 <ul>
-  <.timeline guesses={@guesses}>
+  <.timeline guesses={@guesses} update={@update}>
     <:header>
         <strong>Language:</strong>
         <%= Recase.to_pascal(@game.language.value) %>
         <br/>
         <strong>Secret:</strong>
         <%= String.pad_leading("", String.length(@game.secret), "*") %>
+        <br/>
+        <button phx-click="order_top" phx-value-game_id={@game.id}>Top</button>
     </:header>
     <:footer>
       <%= if @game.in_progress? do %>