More refactoring

Author: michaelstalker

lib/pointing_party/account.ex

@@ -11,6 +11,7 @@ defmodule PointingParty.Account do
 
   def create(attrs) do
     changeset = changeset(%Account{}, attrs)
+
     if changeset.valid? do
       account = apply_changes(changeset)
       {:ok, account}
@@ -19,7 +20,6 @@ defmodule PointingParty.Account do
     end
   end
 
-  @doc false
   def changeset(account, attrs \\ %{}) do
     account
     |> cast(attrs, [:username])

lib/pointing_party/card.ex

@@ -13,9 +13,6 @@ defmodule PointingParty.Card do
     timestamps()
   end
 
-  def points_range, do: @pointing_scale
-
-  @doc false
   def changeset(card, attrs) do
     card
     |> cast(attrs, [:title, :description, :points])
@@ -28,4 +25,6 @@ defmodule PointingParty.Card do
     |> Application.get_env(:cards)
     |> Enum.map(&struct(__MODULE__, &1))
   end
+
+  def points_range, do: @pointing_scale
 end

lib/pointing_party/vote_calculator.ex

@@ -19,11 +19,7 @@ defmodule PointingParty.VoteCalculator do
   end
 
   defp get_points(score_card, users) do
-    votes =
-      users
-      |> Enum.map(fn {_username, %{metas: [%{points: points}]}} ->
-        points
-      end)
+    votes = Enum.map(users, fn {_username, %{metas: [%{points: points}]}} -> points end)
 
     update_score_card(score_card, :votes, votes)
   end

lib/pointing_party_web/channels/room_channel.ex

@@ -1,6 +1,8 @@
 defmodule PointingPartyWeb.RoomChannel do
   use PointingPartyWeb, :channel
+
   alias PointingParty.Card
+
   def join("room:lobby", _payload, socket) do
     send(self(), :after_join)
 
@@ -9,29 +11,34 @@ defmodule PointingPartyWeb.RoomChannel do
 
   def handle_info(:after_join, socket) do
     # handle Presence listing and tracking here
+
     {:noreply, socket}
   end
 
   def handle_in("user_estimated", %{"points" => points}, socket) do
     # update votes for user presence
     # calculate votes if everyone voted with the help of the VoteCalculator
     # broadcast the 'winner'/'tie' event with a payload of %{points: points}
+
     {:noreply, socket}
   end
 
   def handle_in("finalized_points", %{"points" => points}, socket) do
     # update state by setting the current card to the next card
     # broadcast the "new_card" message with a payload of %{card: new_current_card}
+
     {:reply, :ok, socket}
   end
 
   def handle_in("start_pointing", _params, socket) do
     updated_socket = initialize_state(socket)
     # broadcast the "new_card" message with a payload of %{card: current_card}
+
     {:reply, :ok, updated_socket}
   end
 
   defp initialize_state(%{assigns: %{cards: _cards}} = socket), do: socket
+
   defp initialize_state(socket) do
     [first | cards] = Card.cards()
 

lib/pointing_party_web/controllers/session_controller.ex

@@ -1,7 +1,7 @@
 defmodule PointingPartyWeb.SessionController do
   use PointingPartyWeb, :controller
-  alias PointingParty.Account.Auth
-  alias PointingParty.Account
+
+  alias PointingParty.{Account, Account.Auth}
 
   def new(conn, _params) do
     changeset = Account.changeset(%Account{})
@@ -15,13 +15,16 @@ defmodule PointingPartyWeb.SessionController do
         |> put_session(:username, username)
         |> redirect(to: "/cards")
         |> halt()
+
       {:error, changeset} ->
         render(conn, "new.html", changeset: changeset)
     end
   end
 
   def delete(conn, _params) do
-    clear_session(conn)
-    |> redirect(to: "/login") |> halt()
+    conn
+    |> clear_session()
+    |> redirect(to: "/login")
+    |> halt()
   end
 end

lib/pointing_party_web/plugs/auth.ex

@@ -6,8 +6,13 @@ defmodule PointingPartyWeb.Plugs.Auth do
 
   def call(conn, _default) do
     case authenticate(conn) do
-      nil -> conn |> redirect(to: "/login") |> halt()
-      username -> assign(conn, :username, username)
+      nil ->
+        conn
+        |> redirect(to: "/login")
+        |> halt()
+
+      username ->
+        assign(conn, :username, username)
     end
   end
 

lib/pointing_party_web/templates/card/index.html.eex

@@ -14,8 +14,8 @@
                 <div class="col-2">
                   <label for="story-points">Story Points</label>
                   <select class="form-control story-points" id="story-points">
+                    <option>0</option>
                     <option>1</option>
-                    <option>2</option>
                     <option>3</option>
                     <option>5</option>
                   </select>
@@ -24,12 +24,12 @@
               <a href="#" class="btn btn-primary calculate-points">Vote!</a>
               <div class="winner" style="display: none;">
                 <p class="final-points"></p>
-                <button disabled=true class="btn btn-primary next-card" value="">Next Card</a>
+                <button disabled=true class="btn btn-primary next-card" value="">Next Card</button>
               </div>
               <div class="tie" style="display: none;">
-                <p class="card-text"> TIE! </p>
-                <button disabled=true class="btn btn-primary next-card" value=""></a>
-                <button disabled=true class="btn btn-primary next-card" value=""></a>
+                <p class="card-text">TIE!</p>
+                <button disabled=true class="btn btn-primary next-card" value=""></button>
+                <button disabled=true class="btn btn-primary next-card" value=""></button>
               </div>
             </div>
           </div>