Merge branch 'phoenix-1.4' into dev

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/helper/orm.ex

@@ -87,12 +87,11 @@ defmodule Helper.ORM do
   defp inc_views_count(content, queryable) do
     {1, [result]} =
       Repo.update_all(
-        from(p in queryable, where: p.id == ^content.id),
-        [inc: [views: 1]],
-        returning: [:views]
+        from(p in queryable, where: p.id == ^content.id, select: p.views),
+        inc: [views: 1]
       )
 
-    put_in(content.views, result.views)
+    put_in(content.views, result)
   end
 
   @doc """

lib/helper/radar_search.ex

@@ -48,7 +48,7 @@ defmodule Helper.RadarSearch do
   end
 
   # not valid io, just ignore it
-  def locate_city(_ip), do: {:error, "invalid ip"}
+  # def locate_city(_ip), do: {:error, "invalid ip"}
 
   defp handle_result({:ok, result}) do
     case result do

lib/mastani_server/accounts/delegates/achievements.ex

@@ -121,16 +121,16 @@ defmodule MastaniServer.Accounts.Delegate.Achievements do
     end
   end
 
-  @spec safe_minus(non_neg_integer(), non_neg_integer()) :: non_neg_integer()
-  defp safe_minus(count, unit) when is_integer(count) and is_integer(unit) and unit > 0 do
-    case count <= 0 do
-      true ->
-        0
-
-      false ->
-        count - unit
-    end
-  end
+  # @spec safe_minus(non_neg_integer(), non_neg_integer()) :: non_neg_integer()
+  # defp safe_minus(count, unit) when is_integer(count) and is_integer(unit) and unit > 0 do
+  # case count <= 0 do
+  # true ->
+  # 0
+
+  # false ->
+  # count - unit
+  # end
+  # end
 
   @doc """
   list communities which the user is editor in it

lib/mastani_server/accounts/delegates/fans.ex

@@ -31,7 +31,7 @@ defmodule MastaniServer.Accounts.Delegate.Fans do
         :create_following,
         UserFollowing.changeset(%UserFollowing{}, %{user_id: user_id, following_id: follower_id})
       )
-      |> Multi.run(:add_achievement, fn _ ->
+      |> Multi.run(:add_achievement, fn _, _ ->
         Accounts.achieve(%User{id: follower_id}, :add, :follow)
       end)
       |> Repo.transaction()
@@ -70,13 +70,13 @@ defmodule MastaniServer.Accounts.Delegate.Fans do
     with true <- to_string(user_id) !== to_string(follower_id),
          {:ok, _follow_user} <- ORM.find(User, follower_id) do
       Multi.new()
-      |> Multi.run(:delete_follower, fn _ ->
+      |> Multi.run(:delete_follower, fn _, _ ->
         ORM.findby_delete(UserFollower, %{user_id: follower_id, follower_id: user_id})
       end)
-      |> Multi.run(:delete_following, fn _ ->
+      |> Multi.run(:delete_following, fn _, _ ->
         ORM.findby_delete(UserFollowing, %{user_id: user_id, following_id: follower_id})
       end)
-      |> Multi.run(:minus_achievement, fn _ ->
+      |> Multi.run(:minus_achievement, fn _, _ ->
         Accounts.achieve(%User{id: follower_id}, :minus, :follow)
       end)
       |> Repo.transaction()

lib/mastani_server/accounts/delegates/favorite_category.ex

@@ -40,7 +40,7 @@ defmodule MastaniServer.Accounts.Delegate.FavoriteCategory do
   def delete_favorite_category(%User{id: user_id}, id) do
     with {:ok, category} <- FavoriteCategory |> ORM.find_by(~m(id user_id)a) do
       Multi.new()
-      |> Multi.run(:downgrade_achievement, fn _ ->
+      |> Multi.run(:downgrade_achievement, fn _, _ ->
         # find user favvoried-contents(posts & jobs & videos) 's author,
         # and downgrade their's acieveents
         # NOTE: this is too fucking violent and should be refactor later
@@ -67,7 +67,7 @@ defmodule MastaniServer.Accounts.Delegate.FavoriteCategory do
 
         {:ok, %{done: true}}
       end)
-      |> Multi.run(:delete_category, fn _ ->
+      |> Multi.run(:delete_category, fn _, _ ->
         category |> ORM.delete()
       end)
       |> Repo.transaction()
@@ -138,7 +138,7 @@ defmodule MastaniServer.Accounts.Delegate.FavoriteCategory do
     with {:ok, favorite_category} <-
            FavoriteCategory |> ORM.find_by(%{user_id: user.id, id: category_id}) do
       Multi.new()
-      |> Multi.run(:favorite_content, fn _ ->
+      |> Multi.run(:favorite_content, fn _, _ ->
         with {:ok, content_favorite} <- find_content_favorite(thread, content_id, user.id) do
           check_dup_category(content_favorite, favorite_category)
         else
@@ -149,7 +149,7 @@ defmodule MastaniServer.Accounts.Delegate.FavoriteCategory do
             end
         end
       end)
-      |> Multi.run(:dec_old_category_count, fn %{favorite_content: content_favorite} ->
+      |> Multi.run(:dec_old_category_count, fn _, %{favorite_content: content_favorite} ->
         with false <- is_nil(content_favorite.category_id),
              {:ok, old_category} <- FavoriteCategory |> ORM.find(content_favorite.category_id) do
           old_category
@@ -159,10 +159,10 @@ defmodule MastaniServer.Accounts.Delegate.FavoriteCategory do
           error -> {:error, error}
         end
       end)
-      |> Multi.run(:update_content_category_id, fn %{favorite_content: content_favorite} ->
+      |> Multi.run(:update_content_category_id, fn _, %{favorite_content: content_favorite} ->
         content_favorite |> ORM.update(%{category_id: favorite_category.id})
       end)
-      |> Multi.run(:update_category_info, fn _ ->
+      |> Multi.run(:update_category_info, fn _, _ ->
         last_updated = Timex.today() |> Timex.to_datetime()
 
         favorite_category
@@ -199,10 +199,10 @@ defmodule MastaniServer.Accounts.Delegate.FavoriteCategory do
     with {:ok, favorite_category} <-
            FavoriteCategory |> ORM.find_by(%{user_id: user.id, id: category_id}) do
       Multi.new()
-      |> Multi.run(:undo_favorite_action, fn _ ->
+      |> Multi.run(:undo_favorite_action, fn _, _ ->
         CMS.undo_reaction(thread, :favorite, content_id, user)
       end)
-      |> Multi.run(:update_category_info, fn _ ->
+      |> Multi.run(:update_category_info, fn _, _ ->
         last_updated = Timex.today() |> Timex.to_datetime()
 
         favorite_category

lib/mastani_server/accounts/delegates/mails.ex

@@ -13,7 +13,7 @@ defmodule MastaniServer.Accounts.Delegate.Mails do
   def fetch_mentions(%User{} = user, filter) do
     with {:ok, mentions} <- Delivery.fetch_mentions(user, filter),
          {:ok, washed_mentions} <- wash_data(MentionMail, mentions.entries) do
-      result = MentionMail |> Repo.insert_all(washed_mentions)
+      MentionMail |> Repo.insert_all(washed_mentions)
       MentionMail |> messages_fetcher(washed_mentions, user, filter)
     end
   end
@@ -43,7 +43,7 @@ defmodule MastaniServer.Accounts.Delegate.Mails do
     end
   end
 
-  defp messages_fetcher(queryable, washed_data, %User{id: user_id}, %{
+  defp messages_fetcher(queryable, _washed_data, %User{id: user_id}, %{
          page: page,
          size: size,
          read: read

lib/mastani_server/accounts/delegates/profile.ex

@@ -126,13 +126,13 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
 
   defp register_github_user(github_profile) do
     Multi.new()
-    |> Multi.run(:create_user, fn _ ->
+    |> Multi.run(:create_user, fn _, _ ->
       create_user(github_profile, :github)
     end)
-    |> Multi.run(:create_profile, fn %{create_user: user} ->
+    |> Multi.run(:create_profile, fn _, %{create_user: user} ->
       create_profile(user, github_profile, :github)
     end)
-    |> Multi.run(:init_achievement, fn %{create_user: user} ->
+    |> Multi.run(:init_achievement, fn _, %{create_user: user} ->
       Achievement |> ORM.upsert_by([user_id: user.id], %{user_id: user.id})
     end)
     |> Repo.transaction()

lib/mastani_server/cms/delegates/article_curd.ex

@@ -68,17 +68,17 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
          {:ok, action} <- match_action(thread, :community),
          {:ok, community} <- ORM.find(Community, community_id) do
       Multi.new()
-      |> Multi.run(:add_content_author, fn _ ->
+      |> Multi.run(:add_content_author, fn _, _ ->
         action.target
         |> struct()
         |> action.target.changeset(attrs)
         |> Ecto.Changeset.put_change(:author_id, author.id)
         |> Repo.insert()
       end)
-      |> Multi.run(:set_community, fn %{add_content_author: content} ->
+      |> Multi.run(:set_community, fn _, %{add_content_author: content} ->
         ArticleOperation.set_community(community, thread, content.id)
       end)
-      |> Multi.run(:set_topic, fn %{add_content_author: content} ->
+      |> Multi.run(:set_topic, fn _, %{add_content_author: content} ->
         topic_title =
           case attrs |> Map.has_key?(:topic) do
             true -> attrs.topic
@@ -87,7 +87,7 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
 
         ArticleOperation.set_topic(%Topic{title: topic_title}, thread, content.id)
       end)
-      |> Multi.run(:set_community_flag, fn %{add_content_author: content} ->
+      |> Multi.run(:set_community_flag, fn _, %{add_content_author: content} ->
         # TODO: remove this judge, as content should have a flag
         case action |> Map.has_key?(:flag) do
           true ->
@@ -99,17 +99,17 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
             {:ok, "pass"}
         end
       end)
-      |> Multi.run(:set_tag, fn %{add_content_author: content} ->
+      |> Multi.run(:set_tag, fn _, %{add_content_author: content} ->
         case attrs |> Map.has_key?(:tags) do
           true -> set_tags(community, thread, content.id, attrs.tags)
           false -> {:ok, "pass"}
         end
       end)
-      |> Multi.run(:mention_users, fn %{add_content_author: content} ->
+      |> Multi.run(:mention_users, fn _, %{add_content_author: content} ->
         Delivery.mention_from_content(thread, content, attrs, %User{id: user_id})
         {:ok, "pass"}
       end)
-      |> Multi.run(:log_action, fn _ ->
+      |> Multi.run(:log_action, fn _, _ ->
         Statistics.log_publish_action(%User{id: user_id})
       end)
       |> Repo.transaction()
@@ -132,7 +132,7 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
     {:error, [message: "set community flag", code: ecode(:create_fails)]}
   end
 
-  defp create_content_result({:error, :set_topic, result, _steps}) do
+  defp create_content_result({:error, :set_topic, _result, _steps}) do
     {:error, [message: "set topic", code: ecode(:create_fails)]}
   end
 
@@ -227,7 +227,7 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
         |> join(:inner, [p], content in assoc(p, :post))
         |> where(
           [p, c, t, content],
-          c.raw == ^filter.community and t.raw == ^Map.get(filter, :topic, "posts")
+          c.raw == ^community and t.raw == ^Map.get(filter, :topic, "posts")
         )
         |> select([p, c, t, content], content)
         # 10 pined contents per community/thread, at most
@@ -241,19 +241,21 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
     end
   end
 
-  defp add_pin_contents_ifneed(contents, CMS.Job, %{community: community} = filter) do
+  defp add_pin_contents_ifneed(contents, CMS.Job, %{community: _community} = filter) do
     merge_pin_contents(contents, :job, CMS.PinedJob, filter)
   end
 
-  defp add_pin_contents_ifneed(contents, CMS.Video, %{community: community} = filter) do
+  defp add_pin_contents_ifneed(contents, CMS.Video, %{community: _community} = filter) do
     merge_pin_contents(contents, :video, CMS.PinedVideo, filter)
   end
 
-  defp add_pin_contents_ifneed(contents, CMS.Repo, %{community: community} = filter) do
+  defp add_pin_contents_ifneed(contents, CMS.Repo, %{community: _community} = filter) do
     merge_pin_contents(contents, :repo, CMS.PinedRepo, filter)
   end
 
-  defp merge_pin_contents(contents, thread, pin_schema, %{community: community} = filter) do
+  defp add_pin_contents_ifneed(contents, _querable, _filter), do: contents
+
+  defp merge_pin_contents(contents, thread, pin_schema, %{community: _community} = filter) do
     with {:ok, normal_contents} <- contents,
          true <- Map.has_key?(filter, :community),
          true <- 1 == Map.get(normal_contents, :page_number) do
@@ -274,8 +276,6 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
     end
   end
 
-  defp add_pin_contents_ifneed(contents, _querable, _filter), do: contents
-
   defp concat_contents(pined_content, normal_contents) do
     case pined_content |> Map.get(:total_count) do
       0 ->

lib/mastani_server/cms/delegates/article_operation.ex

@@ -41,14 +41,6 @@ defmodule MastaniServer.CMS.Delegate.ArticleOperation do
     end
   end
 
-  def undo_pin_content(%Post{id: post_id}, %Community{id: community_id}, topic) do
-    with {:ok, %{id: topic_id}} <- ORM.find_by(Topic, %{raw: topic}),
-         {:ok, pined} <- ORM.find_by(PinedPost, ~m(post_id community_id topic_id)a),
-         {:ok, deleted} <- ORM.delete(pined) do
-      Post |> ORM.find(deleted.post_id)
-    end
-  end
-
   def pin_content(%Job{id: job_id}, %Community{id: community_id}) do
     attrs = ~m(job_id community_id)a
 
@@ -57,13 +49,6 @@ defmodule MastaniServer.CMS.Delegate.ArticleOperation do
     end
   end
 
-  def undo_pin_content(%Job{id: job_id}, %Community{id: community_id}) do
-    with {:ok, pined} <- ORM.find_by(PinedJob, ~m(job_id community_id)a),
-         {:ok, deleted} <- ORM.delete(pined) do
-      Job |> ORM.find(deleted.job_id)
-    end
-  end
-
   def pin_content(%Video{id: video_id}, %Community{id: community_id}) do
     attrs = ~m(video_id community_id)a
 
@@ -72,13 +57,6 @@ defmodule MastaniServer.CMS.Delegate.ArticleOperation do
     end
   end
 
-  def undo_pin_content(%Video{id: video_id}, %Community{id: community_id}) do
-    with {:ok, pined} <- ORM.find_by(PinedVideo, ~m(video_id community_id)a),
-         {:ok, deleted} <- ORM.delete(pined) do
-      Video |> ORM.find(deleted.video_id)
-    end
-  end
-
   def pin_content(%CMSRepo{id: repo_id}, %Community{id: community_id}) do
     attrs = ~m(repo_id community_id)a
 
@@ -87,6 +65,28 @@ defmodule MastaniServer.CMS.Delegate.ArticleOperation do
     end
   end
 
+  def undo_pin_content(%Post{id: post_id}, %Community{id: community_id}, topic) do
+    with {:ok, %{id: topic_id}} <- ORM.find_by(Topic, %{raw: topic}),
+         {:ok, pined} <- ORM.find_by(PinedPost, ~m(post_id community_id topic_id)a),
+         {:ok, deleted} <- ORM.delete(pined) do
+      Post |> ORM.find(deleted.post_id)
+    end
+  end
+
+  def undo_pin_content(%Job{id: job_id}, %Community{id: community_id}) do
+    with {:ok, pined} <- ORM.find_by(PinedJob, ~m(job_id community_id)a),
+         {:ok, deleted} <- ORM.delete(pined) do
+      Job |> ORM.find(deleted.job_id)
+    end
+  end
+
+  def undo_pin_content(%Video{id: video_id}, %Community{id: community_id}) do
+    with {:ok, pined} <- ORM.find_by(PinedVideo, ~m(video_id community_id)a),
+         {:ok, deleted} <- ORM.delete(pined) do
+      Video |> ORM.find(deleted.video_id)
+    end
+  end
+
   def undo_pin_content(%CMSRepo{id: repo_id}, %Community{id: community_id}) do
     with {:ok, pined} <- ORM.find_by(PinedRepo, ~m(repo_id community_id)a),
          {:ok, deleted} <- ORM.delete(pined) do
@@ -222,16 +222,16 @@ defmodule MastaniServer.CMS.Delegate.ArticleOperation do
 
   # make sure the reuest tag is in the current community thread
   # example: you can't set a other thread tag to this thread's article
-  defp tag_in_community_thread?(%Community{id: communityId}, thread, tag) do
-    with {:ok, community} <- ORM.find(Community, communityId) do
-      matched_tags =
-        Tag
-        |> where([t], t.community_id == ^community.id)
-        # |> where([t], t.thread == ^(to_string(thread) |> String.upcase()))
-        |> where([t], t.thread == ^to_string(thread))
-        |> Repo.all()
-
-      tag in matched_tags
-    end
-  end
+
+  # defp tag_in_community_thread?(%Community{id: communityId}, thread, tag) do
+  # with {:ok, community} <- ORM.find(Community, communityId) do
+  # matched_tags =
+  # Tag
+  # |> where([t], t.community_id == ^community.id)
+  # |> where([t], t.thread == ^to_string(thread))
+  # |> Repo.all()
+
+  # tag in matched_tags
+  # end
+  # end
 end