Put real data into linepoint plot

Author: phonnz

.elixir-tools/next-ls.log

@@ -5,8 +5,9 @@ defmodule Fullstack.Customers do
 
   import Ecto.Query, warn: false
   alias Fullstack.Repo
-
   alias Fullstack.Customers.Customer
+  alias Fullstack.Utils.Charts.ChartsDates
+
   def customers_count, do: Repo.aggregate(Customer, :count, :id)
 
   @doc """
@@ -25,20 +26,14 @@ defmodule Fullstack.Customers do
     |> Repo.all()
   end
 
-  defp default_date_range() do
-    until = DateTime.utc_now()
-    from = Timex.shift(until, years: -1)
-    %{"from" => from, "until" => until}
-  end
-
   defp maybe_select_fields(query, %{"only" => only_fields} = _params) when is_list(only_fields) do
     select(query, ^only_fields)
   end
 
   defp maybe_select_fields(query, _params), do: query
 
   defp maybe_from_created_range(query, params) do
-    date_range = Map.merge(default_date_range(), params)
+    date_range = Map.merge(ChartsDates.default_date_range(), params)
 
     where(
       query,

fullstack/lib/fullstack/customers.ex

@@ -5,6 +5,7 @@ defmodule Fullstack.Financial do
   alias Fullstack.Financial.{Transaction, Transactions}
   alias Fullstack.Customers
   alias Fullstack.Customers.Customer
+  alias Fullstack.Utils.Charts.ChartsDates
 
   defdelegate count_transactions, to: Transactions
   defdelegate count_transactions(transactions), to: Transactions
@@ -22,13 +23,13 @@ defmodule Fullstack.Financial do
     |> set_top_transactions()
     |> set_top_customers()
     |> set_transactions_per_month()
-    |> set_transactions_per_day()
+    # |> set_transactions_per_day()
     |> Map.drop([:transactions, :monthly_transactions, :daily_transactions])
   end
 
   def build_customers_analytics(params \\ %{}) do
     Customers.list_customers(%{"only" => [:id, :inserted_at]})
-    |> parse_chart_data
+    |> ChartsDates.parse_chart_data()
   end
 
   def to_transaction(transaction) do
@@ -71,90 +72,25 @@ defmodule Fullstack.Financial do
   end
 
   def set_transactions_per_month(%{transactions: transactions} = data) do
-    [current_year, _m, _d] = Date.utc_today() |> parse_date()
-
-    grouped_transactions =
-      transactions
-      |> Enum.filter(&year_filter(&1.inserted_at, current_year))
-      |> Enum.group_by(&month_year_transactions_grouper/1)
+    grouped_transactions = ChartsDates.parse_chart_data(transactions)
 
     data
     |> Map.put(:monthly_transactions, grouped_transactions)
-    |> Map.put(:monthly_data, parse_chart_data(grouped_transactions))
-  end
-
-  defp parse_chart_data([%Customer{} | _] = customers) do
-    customers
-    |> Enum.reduce(%{}, fn c, acc ->
-      acc
-      |> Map.update(
-        c.inserted_at
-        |> NaiveDateTime.to_date()
-        |> to_string()
-        |> String.split("-")
-        |> Enum.take(2),
-        1,
-        &(&1 + 1)
-      )
-    end)
-    |> Enum.map(fn {[_, m], value} ->
-      [Timex.month_name(String.to_integer(m)), value]
-    end)
-  end
-
-  defp parse_chart_data(transactions) do
-    transactions
-    |> Enum.map(fn {k, v} ->
-      {count, amount} =
-        Enum.reduce(v, {0, 0}, fn trx, {count, amount} ->
-          {count + 1, trx.amount + amount}
-        end)
-
-      [" #{elem(k, 1)}", count, amount / 100_000]
-    end)
-  end
-
-  defp year_filter(transaction_date, current_year) do
-    [y, _m, _d] = parse_date(transaction_date)
-    y == current_year
+    |> Map.put(:monthly_data, grouped_transactions)
   end
 
-  defp month_year_transactions_grouper(transaction) do
-    [trx_year, trx_month, _d] =
-      transaction
-      |> Map.fetch!(:inserted_at)
-      |> parse_date()
-
-    {trx_year, trx_month}
-  end
-
-  defp set_transactions_per_day(%{monthly_transactions: transactions} = data) do
-    [current_year, current_month, _d] = Date.utc_today() |> parse_date()
-
-    grouped_transactions =
-      transactions
-      |> Map.get({current_year, current_month})
-      |> Enum.group_by(&day_month_transactions_grouper/1)
-
-    data
-    |> Map.put(:daily_transactions, grouped_transactions)
-    |> Map.put(:daily_data, parse_chart_data(grouped_transactions))
-  end
-
-  defp day_month_transactions_grouper(transaction) do
-    [_y, trx_month, trx_day] =
-      transaction
-      |> Map.fetch!(:inserted_at)
-      |> parse_date()
-
-    {trx_month, trx_day}
-  end
-
-  defp parse_date(date) do
-    date
-    |> Date.to_string()
-    |> String.split("-")
-  end
+  ##  defp set_transactions_per_day(%{monthly_transactions: transactions} = data) do
+  ##    [current_year, current_month, _d] = Date.utc_today() |> parse_date()
+  ##
+  ##    grouped_transactions =
+  ##      transactions
+  ##      |> Map.get({current_year, current_month})
+  ##      |> Enum.group_by(&day_month_transactions_grouper/1)
+  ##
+  ##    data
+  ##    |> Map.put(:daily_transactions, grouped_transactions)
+  ##    |> Map.put(:daily_data, ChartsDates.parse_chart_data(grouped_transactions))
+  ##  end
 
   def set_transactions_total_amount(transactions) do
     Enum.reduce(transactions, 0, fn trx, acc -> trx.amount + acc end)

fullstack/lib/fullstack/financial.ex

@@ -16,7 +16,7 @@ defmodule Fullstack.Financial.Transactions do
 
   import Ecto.Query, warn: false
   alias Fullstack.Repo
-
+  alias Fullstack.Utils.Charts.Dates
   alias Fullstack.Financial.Transaction
 
   def count_transactions(transactions) do
@@ -45,8 +45,14 @@ defmodule Fullstack.Financial.Transactions do
     |> Repo.all()
   end
 
-  defp with_date_range(query, %{"dates" => %{"from" => from, "upto" => upto}}) do
-    query
+  defp with_date_range(query, %{"dates" => %{"from" => from, "iuntil" => until}} = params) do
+    date_range = Map.merge(Dates.default_date_range(), params)
+
+    where(
+      query,
+      [t],
+      t.inserted_at >= ^date_range["from"] and t.inserted_at <= ^date_range["until"]
+    )
   end
 
   defp with_date_range(query, _params), do: query
@@ -75,6 +81,22 @@ defmodule Fullstack.Financial.Transactions do
 
   defp from_pos(query, _params), do: query
 
+  defp maybe_select_fields(query, %{"only" => only_fields} = _params) when is_list(only_fields) do
+    select(query, ^only_fields)
+  end
+
+  defp maybe_select_fields(query, _params), do: query
+
+  defp maybe_from_created_range(query, params) do
+    date_range = Map.merge(Dates.default_date_range(), params)
+
+    where(
+      query,
+      [c],
+      c.inserted_at >= ^date_range["from"] and c.inserted_at <= ^date_range["until"]
+    )
+  end
+
   @doc """
   Returns the list of transactions.
 

fullstack/lib/fullstack/financial/transactions.ex

@@ -0,0 +1,82 @@
+defmodule Fullstack.Utils.Charts.ChartsDates do
+  def parse_chart_data([%Fullstack.Customers.Customer{} | _] = customers) do
+    customers
+    |> Enum.reduce(%{}, fn c, acc ->
+      acc
+      |> Map.update(
+        c.inserted_at
+        |> NaiveDateTime.to_date()
+        |> to_string()
+        |> String.split("-")
+        |> Enum.take(2),
+        1,
+        &(&1 + 1)
+      )
+    end)
+    |> Enum.map(fn {[_, m], value} ->
+      [Timex.month_name(String.to_integer(m)), value]
+    end)
+  end
+
+  def parse_chart_data(transactions) do
+    transactions
+    |> Enum.reduce(%{}, fn trx, acc ->
+      key =
+        trx.inserted_at
+        |> NaiveDateTime.to_date()
+        |> to_string()
+        |> String.split("-")
+        |> Enum.take(2)
+
+      values =
+        acc
+        |> Map.get(key, %{})
+        |> Map.update(:count, 1, &(&1 + 1))
+        |> Map.update(:amount, 0.0, &(&1 + trx.amount))
+
+      Map.put(acc, key, values)
+    end)
+    |> Enum.map(fn {[_, m], %{count: count, amount: amount}} ->
+      [
+        String.to_integer(m),
+        count,
+        Float.ceil(amount / 100_000, 2)
+      ]
+    end)
+  end
+
+  def default_date_range() do
+    until = DateTime.utc_now()
+    from = Timex.shift(until, years: -1)
+    %{"from" => from, "until" => until}
+  end
+
+  def year_filter(transaction_date, current_year) do
+    [y, _m, _d] = parse_date(transaction_date)
+    y == current_year
+  end
+
+  def month_year_transactions_grouper(transaction) do
+    [trx_year, trx_month, _d] =
+      transaction
+      |> Map.fetch!(:inserted_at)
+      |> parse_date()
+
+    {trx_year, trx_month}
+  end
+
+  def day_month_transactions_grouper(transaction) do
+    [_y, trx_month, trx_day] =
+      transaction
+      |> Map.fetch!(:inserted_at)
+      |> parse_date()
+
+    {trx_month, trx_day}
+  end
+
+  def parse_date(date) do
+    date
+    |> Date.to_string()
+    |> String.split("-")
+  end
+end

fullstack/lib/fullstack/utils/charts/dates.ex

@@ -231,14 +231,9 @@ defmodule FullstackWeb.Public.TransactionsLive.PublicTransactions do
         ##        [calc_x(x, i, time_series) | series_data]
       end
 
-    dbg(data)
+    data = socket.assigns.info.monthly_data
 
-    series_cols =
-      for s <- 1..series do
-        "Series #{s}"
-      end
-
-    dbg(series_cols)
+    series_cols = ["Count", "Amount"]
 
     test_data =
       case needs_update do

fullstack/lib/fullstack_web/live/public/public_transactions.ex

@@ -84,7 +84,7 @@
   </div>
   <div class="items-center ">
     <pre class="text-gray-300 bg-gray-800 code p-4 rounded-md whitespace-pre overflow-x-auto">
-<code>   <%= inspect(@info.daily_data, pretty: true) %>
+<code>   <%= inspect(@info.monthly_data, pretty: true) %>
       </code>
   </pre>
   </div>