refactor format_number into Numbers module

Author: goncalotomas

lib/galaxies_web/components/layouts/app.html.heex

@@ -1,7 +1,7 @@
 <ul class="relative z-10 flex items-center gap-4 px-4 sm:px-6 lg:px-8 justify-end">
   <%= if @current_player do %>
     <li class="text-[0.8125rem] leading-6 text-white">
-      Player: <strong>{ @current_player.username }</strong>
+      Player: <strong>{@current_player.username}</strong>
     </li>
     <li>
       <.link
@@ -202,7 +202,7 @@
           <main class="px-4 py-10 sm:px-6 lg:px-8 text-white">
             <div class="mx-auto max-w-6xl">
               <.flash_group flash={@flash} />
-              { @inner_content }
+              {@inner_content}
             </div>
           </main>
         </div>

lib/galaxies_web/live/facilities_live.ex

@@ -1,4 +1,5 @@
 defmodule GalaxiesWeb.FacilitiesLive do
+  alias GalaxiesWeb.Numbers
   alias GalaxiesWeb.CommonComponents
   use GalaxiesWeb, :live_view
 
@@ -122,29 +123,17 @@ defmodule GalaxiesWeb.FacilitiesLive do
     ~H"""
     Requirements:
     <%= if @metal > 0 do %>
-      Metal: <strong>{format_number(@metal)}</strong>
+      Metal: <strong>{Numbers.format_number(@metal)}</strong>
     <% end %>
     <%= if @crystal > 0 do %>
-      Crystal: <strong>{format_number(@crystal)}</strong>
+      Crystal: <strong>{Numbers.format_number(@crystal)}</strong>
     <% end %>
     <%= if @deuterium > 0 do %>
-      Deuterium: <strong>{format_number(@deuterium)}</strong>
+      Deuterium: <strong>{Numbers.format_number(@deuterium)}</strong>
     <% end %>
     <%= if @energy > 0 do %>
-      Energy: <strong>{format_number(@energy)}</strong>
+      Energy: <strong>{Numbers.format_number(@energy)}</strong>
     <% end %>
     """
   end
-
-  defp format_number(number) when number < 1000, do: "#{number}"
-
-  defp format_number(number) do
-    number
-    |> Kernel.to_string()
-    |> String.reverse()
-    |> String.split("", trim: true)
-    |> Enum.chunk_every(3)
-    |> Enum.join(".")
-    |> String.reverse()
-  end
 end

lib/galaxies_web/live/research_live.ex

@@ -1,4 +1,5 @@
 defmodule GalaxiesWeb.ResearchLive do
+  alias GalaxiesWeb.Numbers
   use GalaxiesWeb, :live_view
 
   alias Galaxies.Accounts
@@ -126,29 +127,17 @@ defmodule GalaxiesWeb.ResearchLive do
     ~H"""
     Requirements:
     <%= if @metal > 0 do %>
-      Metal: <strong>{format_number(@metal)}</strong>
+      Metal: <strong>{Numbers.format_number(@metal)}</strong>
     <% end %>
     <%= if @crystal > 0 do %>
-      Crystal: <strong>{format_number(@crystal)}</strong>
+      Crystal: <strong>{Numbers.format_number(@crystal)}</strong>
     <% end %>
     <%= if @deuterium > 0 do %>
-      Deuterium: <strong>{format_number(@deuterium)}</strong>
+      Deuterium: <strong>{Numbers.format_number(@deuterium)}</strong>
     <% end %>
     <%= if @energy > 0 do %>
-      Energy: <strong>{format_number(@energy)}</strong>
+      Energy: <strong>{Numbers.format_number(@energy)}</strong>
     <% end %>
     """
   end
-
-  defp format_number(number) when number < 1000, do: "#{number}"
-
-  defp format_number(number) do
-    number
-    |> Kernel.to_string()
-    |> String.reverse()
-    |> String.split("", trim: true)
-    |> Enum.chunk_every(3)
-    |> Enum.join(".")
-    |> String.reverse()
-  end
 end

lib/galaxies_web/live/resources_live.ex

@@ -1,4 +1,5 @@
 defmodule GalaxiesWeb.ResourcesLive do
+  alias GalaxiesWeb.Numbers
   alias GalaxiesWeb.CommonComponents
   use GalaxiesWeb, :live_view
 
@@ -122,29 +123,17 @@ defmodule GalaxiesWeb.ResourcesLive do
     ~H"""
     Requirements:
     <%= if @metal > 0 do %>
-      Metal: <strong>{format_number(@metal)}</strong>
+      Metal: <strong>{Numbers.format_number(@metal)}</strong>
     <% end %>
     <%= if @crystal > 0 do %>
-      Crystal: <strong>{format_number(@crystal)}</strong>
+      Crystal: <strong>{Numbers.format_number(@crystal)}</strong>
     <% end %>
     <%= if @deuterium > 0 do %>
-      Deuterium: <strong>{format_number(@deuterium)}</strong>
+      Deuterium: <strong>{Numbers.format_number(@deuterium)}</strong>
     <% end %>
     <%= if @energy > 0 do %>
-      Energy: <strong>{format_number(@energy)}</strong>
+      Energy: <strong>{Numbers.format_number(@energy)}</strong>
     <% end %>
     """
   end
-
-  defp format_number(number) when number < 1000, do: "#{number}"
-
-  defp format_number(number) do
-    number
-    |> Kernel.to_string()
-    |> String.reverse()
-    |> String.split("", trim: true)
-    |> Enum.chunk_every(3)
-    |> Enum.join(".")
-    |> String.reverse()
-  end
 end

lib/galaxies_web/numbers.ex

@@ -31,4 +31,19 @@ defmodule GalaxiesWeb.Numbers do
         "#{seconds}s"
     end
   end
+
+  @doc """
+  Formats a number by separating thousands with a dot.
+  """
+  def format_number(number) when number < 1000, do: to_string(number)
+
+  def format_number(number) do
+    number
+    |> Kernel.to_string()
+    |> String.reverse()
+    |> String.split("", trim: true)
+    |> Enum.chunk_every(3)
+    |> Enum.join(".")
+    |> String.reverse()
+  end
 end

test/galaxies_web/numbers_test.exs

@@ -31,4 +31,17 @@ defmodule GalaxiesWeb.NumbersTest do
       assert GalaxiesWeb.Numbers.format_countdown(172_799) == "1d 23h 59m 59s"
     end
   end
+
+  describe "format_number/1" do
+    test "when number is less than 1000" do
+      assert GalaxiesWeb.Numbers.format_number(0) == "0"
+      assert GalaxiesWeb.Numbers.format_number(999) == "999"
+    end
+
+    test "when number is greater than 1000" do
+      assert GalaxiesWeb.Numbers.format_number(1_000) == "1.000"
+      assert GalaxiesWeb.Numbers.format_number(1_000_000) == "1.000.000"
+      assert GalaxiesWeb.Numbers.format_number(1_000_000_000) == "1.000.000.000"
+    end
+  end
 end