refactor(wip): wip

Author: mydearxym

config/config.exs

@@ -20,8 +20,7 @@ config :logger, :console,
   format: "$time $metadata[$level] $message\n",
   metadata: [:request_id]
 
-config :phoenix, :format_encoders, json: Jason
-config :ecto, json_library: Jason
+config :phoenix, :json_library, Jason
 
 # TODO move this config to secret later
 config :mastani_server, Helper.Guardian,

lib/mastani_server/cms/delegates/seeds.ex

@@ -47,8 +47,8 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
          {:ok, bot} <- seed_bot(),
          {:ok, categories} <- seed_categories(bot, :default),
          {:ok, communities} <- seed_for_communities(bot, :pl) do
-      threadify_communities(communities, threads)
-      tagfy_threads(communities, threads, bot)
+      threadify_communities(communities, threads.entries)
+      tagfy_threads(communities, threads.entries, bot)
       categorify_communities(communities, categories, :pl)
     end
   end
@@ -59,10 +59,10 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
   def seed_communities(:framework) do
     with {:ok, threads} <- seed_threads(:default),
          {:ok, bot} <- seed_bot(),
-         {:ok, categories} <- seed_categories(bot, :default),
+         {:ok, _categories} <- seed_categories(bot, :default),
          {:ok, communities} <- seed_for_communities(bot, :framework) do
-      threadify_communities(communities, threads)
-      tagfy_threads(communities, threads, bot)
+      threadify_communities(communities, threads.entries)
+      tagfy_threads(communities, threads.entries, bot)
 
       # categorify_communities(communities, categories, :other)
     end
@@ -76,8 +76,8 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
          {:ok, bot} <- seed_bot(),
          {:ok, categories} <- seed_categories(bot, :default),
          {:ok, communities} <- seed_for_communities(bot, :editor) do
-      threadify_communities(communities, threads)
-      tagfy_threads(communities, threads, bot)
+      threadify_communities(communities, threads.entries)
+      tagfy_threads(communities, threads.entries, bot)
 
       categorify_communities(communities, categories, :other)
     end
@@ -89,10 +89,10 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
   def seed_communities(:database) do
     with {:ok, threads} <- seed_threads(:default),
          {:ok, bot} <- seed_bot(),
-         {:ok, categories} <- seed_categories(bot, :default),
+         {:ok, _categories} <- seed_categories(bot, :default),
          {:ok, communities} <- seed_for_communities(bot, :database) do
-      threadify_communities(communities, threads)
-      tagfy_threads(communities, threads, bot)
+      threadify_communities(communities, threads.entries)
+      tagfy_threads(communities, threads.entries, bot)
 
       # categorify_communities(communities, categories, :other)
     end
@@ -106,8 +106,8 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
          {:ok, bot} <- seed_bot(),
          {:ok, categories} <- seed_categories(bot, :default),
          {:ok, communities} <- seed_for_communities(bot, :devops) do
-      threadify_communities(communities, threads)
-      tagfy_threads(communities, threads, bot)
+      threadify_communities(communities, threads.entries)
+      tagfy_threads(communities, threads.entries, bot)
 
       categorify_communities(communities, categories, :other)
     end
@@ -119,10 +119,10 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
   def seed_communities(:blockchain) do
     with {:ok, threads} <- seed_threads(:default),
          {:ok, bot} <- seed_bot(),
-         {:ok, categories} <- seed_categories(bot, :default),
+         {:ok, _categories} <- seed_categories(bot, :default),
          {:ok, communities} <- seed_for_communities(bot, :blockchain) do
-      threadify_communities(communities, threads)
-      tagfy_threads(communities, threads, bot)
+      threadify_communities(communities, threads.entries)
+      tagfy_threads(communities, threads.entries, bot)
 
       # categorify_communities(communities, categories, :other)
     end
@@ -134,10 +134,10 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
   def seed_communities(:design) do
     with {:ok, threads} <- seed_threads(:default),
          {:ok, bot} <- seed_bot(),
-         {:ok, categories} <- seed_categories(bot, :default),
+         {:ok, _categories} <- seed_categories(bot, :default),
          {:ok, communities} <- seed_for_communities(bot, :design) do
-      threadify_communities(communities, threads)
-      tagfy_threads(communities, threads, bot)
+      threadify_communities(communities, threads.entries)
+      tagfy_threads(communities, threads.entries, bot)
 
       # categorify_communities(communities, categories, :other)
     end
@@ -151,8 +151,8 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
          {:ok, bot} <- seed_bot(),
          {:ok, categories} <- seed_categories(bot, :default),
          {:ok, communities} <- seed_for_communities(bot, :city) do
-      threadify_communities(communities, threads)
-      tagfy_threads(communities, threads, bot, :city)
+      threadify_communities(communities, threads.entries)
+      tagfy_threads(communities, threads.entries, bot, :city)
       categorify_communities(communities, categories, :city)
     end
   end
@@ -174,9 +174,9 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
       }
 
       {:ok, community} = Community |> ORM.create(args)
-      threadify_communities(community, threads)
 
-      tagfy_threads(community, threads, bot, :home)
+      threadify_communities(community, threads.entries)
+      tagfy_threads(community, threads.entries, bot, :home)
       categorify_communities(community, categories, :other)
     end
   end
@@ -283,49 +283,49 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
   # seed raw communities, without thread or categories staff
   defp seed_for_communities(bot, :pl) do
     with {:error, _} <- ORM.find_by(Community, %{raw: "javascript"}) do
-      {:ok, communities} = insert_multi_communities(bot, @pl_communities, :pl)
+      {:ok, _communities} = insert_multi_communities(bot, @pl_communities, :pl)
     end
   end
 
   defp seed_for_communities(bot, :framework) do
     with {:error, _} <- ORM.find_by(Community, %{raw: "react"}) do
-      {:ok, communities} = insert_multi_communities(bot, @framework_communities, :framework)
+      {:ok, _communities} = insert_multi_communities(bot, @framework_communities, :framework)
     end
   end
 
   defp seed_for_communities(bot, :editor) do
     with {:error, _} <- ORM.find_by(Community, %{raw: "emacs"}) do
-      {:ok, communities} = insert_multi_communities(bot, @editor_communities, :editor)
+      {:ok, _communities} = insert_multi_communities(bot, @editor_communities, :editor)
     end
   end
 
   defp seed_for_communities(bot, :database) do
     with {:error, _} <- ORM.find_by(Community, %{raw: "mysql"}) do
-      {:ok, communities} = insert_multi_communities(bot, @database_communities, :database)
+      {:ok, _communities} = insert_multi_communities(bot, @database_communities, :database)
     end
   end
 
   defp seed_for_communities(bot, :devops) do
     with {:error, _} <- ORM.find_by(Community, %{raw: "cps-support"}) do
-      {:ok, communities} = insert_multi_communities(bot, @devops_communities, :devops)
+      {:ok, _communities} = insert_multi_communities(bot, @devops_communities, :devops)
     end
   end
 
   defp seed_for_communities(bot, :blockchain) do
     with {:error, _} <- ORM.find_by(Community, %{raw: "bitcoin"}) do
-      {:ok, communities} = insert_multi_communities(bot, @dblockchain_communities, :blockchain)
+      {:ok, _communities} = insert_multi_communities(bot, @dblockchain_communities, :blockchain)
     end
   end
 
   defp seed_for_communities(bot, :design) do
     with {:error, _} <- ORM.find_by(Community, %{raw: "css"}) do
-      {:ok, communities} = insert_multi_communities(bot, @design_communities, :design)
+      {:ok, _communities} = insert_multi_communities(bot, @design_communities, :design)
     end
   end
 
   defp seed_for_communities(bot, :city) do
     with {:error, _} <- ORM.find_by(Community, %{raw: "chengdu"}) do
-      {:ok, communities} = insert_multi_communities(bot, @city_communities, :city)
+      {:ok, _communities} = insert_multi_communities(bot, @city_communities, :city)
     end
   end
 
@@ -399,7 +399,7 @@ defmodule MastaniServer.CMS.Delegate.Seeds do
 
   # tagfy only post job repo and video
 
-  defp tagfy_threads(communities, threads, bot, :city) when is_list(communities) do
+  defp tagfy_threads(communities, _threads, bot, :city) when is_list(communities) do
     Enum.each(communities, fn community ->
       set_tags(community, :post, bot, :city)
     end)

lib/mastani_server/cms/job.ex

@@ -70,7 +70,8 @@ defmodule MastaniServer.CMS.Job do
       on_replace: :delete
     )
 
-    timestamps(type: :utc_datetime)
+    # timestamps(type: :utc_datetime)
+    timestamps(type: :utc_datetime_usec)
   end
 
   @doc false

lib/mastani_server/cms/post.ex

@@ -74,7 +74,9 @@ defmodule MastaniServer.CMS.Post do
       on_replace: :delete
     )
 
-    timestamps(type: :utc_datetime)
+    # timestamps(type: :utc_datetime)
+    # for paged test to diff
+    timestamps(type: :utc_datetime_usec)
   end
 
   @doc false

lib/mastani_server/cms/repo.ex

@@ -73,7 +73,8 @@ defmodule MastaniServer.CMS.Repo do
       on_replace: :delete
     )
 
-    timestamps(type: :utc_datetime)
+    # timestamps(type: :utc_datetime)
+    timestamps(type: :utc_datetime_usec)
   end
 
   @doc false

lib/mastani_server/cms/video.ex

@@ -64,7 +64,8 @@ defmodule MastaniServer.CMS.Video do
       on_replace: :delete
     )
 
-    timestamps(type: :utc_datetime)
+    # timestamps(type: :utc_datetime)
+    timestamps(type: :utc_datetime_usec)
   end
 
   @doc false

lib/mastani_server/delivery/delegates/mentions.ex

@@ -31,8 +31,10 @@ defmodule MastaniServer.Delivery.Delegate.Mentions do
           source_preview: info.source_preview,
           # timestamp are not auto-gen, see:
           # https://stackoverflow.com/questions/37537094/insert-all-does-not-create-auto-generated-inserted-at-with-ecto-2-0/46844417
-          inserted_at: Ecto.DateTime.utc(),
-          updated_at: Ecto.DateTime.utc()
+          # Ecto.DateTime.utc(),
+          inserted_at: DateTime.truncate(Timex.now(), :second),
+          # Ecto.DateTime.utc()
+          updated_at: DateTime.truncate(Timex.now(), :second)
         }
 
         acc ++ [attrs]

lib/mastani_server/statistics/community_contribute.ex

@@ -13,7 +13,7 @@ defmodule MastaniServer.Statistics.CommunityContribute do
     # field(:community_id, :id)
     belongs_to(:community, CMS.Community)
 
-    timestamps()
+    timestamps(type: :utc_datetime)
   end
 
   @doc false

lib/mastani_server/statistics/delegates/contribute.ex

@@ -45,7 +45,7 @@ defmodule MastaniServer.Statistics.Delegate.Contribute do
     |> QueryBuilder.recent_inserted(months: @user_contribute_months)
     |> select([c], %{date: c.date, count: c.count})
     |> Repo.all()
-    |> to_contrubutes_map()
+    |> to_contributes_map()
     |> done
   end
 
@@ -73,13 +73,12 @@ defmodule MastaniServer.Statistics.Delegate.Contribute do
     |> to_contribute_records()
   end
 
-  defp to_contrubutes_map(data) do
+  defp to_contributes_map(data) do
     end_date = Timex.today()
     start_date = Timex.shift(Timex.today(), months: -6)
     total_count = Enum.reduce(data, 0, &(&1.count + &2))
 
-    records = to_contribute_records(data)
-
+    records = data
     ~m(start_date end_date total_count records)a
   end
 
@@ -121,8 +120,10 @@ defmodule MastaniServer.Statistics.Delegate.Contribute do
   end
 
   defp convert_date(date) do
-    {:ok, edate} = Date.from_erl(date)
-    edate
+    date
+    # IO.inspect date, label: "convert_date"
+    # {:ok, edate} = Date.to_string(date) #Date.from_erl(date)
+    # edate
   end
 
   defp inc_contribute_count(contribute, :community) do

lib/mastani_server/statistics/user_contribute.ex

@@ -12,7 +12,7 @@ defmodule MastaniServer.Statistics.UserContribute do
     field(:date, :date)
     belongs_to(:user, Accounts.User)
 
-    timestamps()
+    timestamps(type: :utc_datetime)
   end
 
   @doc false