fix(reaction): clean up favorite, comment like etc

Author: mydearxym

lib/groupher_server/accounts/accounts.ex

@@ -21,7 +21,7 @@ defmodule GroupherServer.Accounts do
   defdelegate default_subscribed_communities(filter), to: Profile
   defdelegate subscribed_communities(user, filter), to: Profile
 
-  # favorite category
+  # collect folder
   defdelegate list_collect_folders(user_id, filter), to: CollectFolder
   defdelegate list_collect_folders(user_id, filter, owner), to: CollectFolder
   defdelegate list_collect_folder_articles(folder_id, filter, user), to: CollectFolder

lib/groupher_server/accounts/delegates/achievements.ex

@@ -20,7 +20,7 @@ defmodule GroupherServer.Accounts.Delegate.Achievements do
   @follow_weight get_config(:general, :user_achieve_follow_weight)
 
   @doc """
-  inc user's achievement by inc followers_count of favorite_weight
+  inc user's achievement by inc followers_count of collect_weight
   """
   @spec achieve(User.t(), atom, atom) :: SpecType.done()
   def achieve(%User{id: user_id}, :inc, :follow) do
@@ -34,7 +34,7 @@ defmodule GroupherServer.Accounts.Delegate.Achievements do
   end
 
   @doc """
-  dec user's achievement by inc followers_count of favorite_weight
+  dec user's achievement by inc followers_count of collect_weight
   """
   def achieve(%User{id: user_id}, :dec, :follow) do
     with {:ok, achievement} <- ORM.findby_or_insert(Achievement, ~m(user_id)a, ~m(user_id)a) do
@@ -73,7 +73,7 @@ defmodule GroupherServer.Accounts.Delegate.Achievements do
   end
 
   @doc """
-  dec user's achievement by articles_collects_count of favorite_weight
+  dec user's achievement by articles_collects_count of collect_weight
   """
   def achieve(%User{id: user_id} = _user, :inc, :collect) do
     with {:ok, achievement} <- ORM.findby_or_insert(Achievement, ~m(user_id)a, ~m(user_id)a) do
@@ -86,7 +86,7 @@ defmodule GroupherServer.Accounts.Delegate.Achievements do
   end
 
   @doc """
-  inc user's achievement by articles_collects_count of favorite_weight
+  inc user's achievement by articles_collects_count of collect_weight
   """
   def achieve(%User{id: user_id} = _user, :dec, :collect) do
     with {:ok, achievement} <- ORM.findby_or_insert(Achievement, ~m(user_id)a, ~m(user_id)a) do

lib/groupher_server/accounts/delegates/upvoted_articles.ex

@@ -1,6 +1,6 @@
 defmodule GroupherServer.Accounts.Delegate.UpvotedArticles do
   @moduledoc """
-  get contents(posts, jobs ...) that user reacted (star, favorite ..)
+  get contents(posts, jobs ...) that user upvotes
   """
   # import GroupherServer.CMS.Utils.Matcher
   import Ecto.Query, warn: false

lib/groupher_server/cms/cms.ex

@@ -12,7 +12,6 @@ defmodule GroupherServer.CMS do
     ArticleCURD,
     ArticleOperation,
     ArticleReaction,
-    FavoritedContents,
     ArticleComment,
     CommentCURD,
     CommunitySync,
@@ -97,7 +96,6 @@ defmodule GroupherServer.CMS do
   defdelegate set_collect_folder(collect, folder), to: ArticleReaction
   defdelegate undo_set_collect_folder(collect, folder), to: ArticleReaction
 
-  defdelegate favorited_category(thread, content_id, user), to: FavoritedContents
   # ArticleOperation
   # >> set flag on article, like: pin / unpin article
   defdelegate set_community_flags(community_info, queryable, attrs), to: ArticleOperation
@@ -155,11 +153,6 @@ defmodule GroupherServer.CMS do
   # report
   defdelegate create_report(type, content_id, args, user), to: AbuseReport
 
-  # Comment Reaction
-  # >> like / undo like
-  defdelegate like_comment(thread, comment, user), to: CommentReaction
-  defdelegate undo_like_comment(thread, comment, user), to: CommentReaction
-
   # Passport CURD
   defdelegate stamp_passport(rules, user), to: PassportCURD
   defdelegate erase_passport(rules, user), to: PassportCURD

lib/groupher_server/cms/community.ex

@@ -99,7 +99,6 @@ defmodule GroupherServer.CMS.Community do
     |> unique_constraint(:aka, name: :communities_aka_index)
 
     # |> foreign_key_constraint(:communities_author_fkey)
-    # |> unique_constraint(:user_id, name: :posts_favorites_user_id_post_id_index)
   end
 
   @doc false
@@ -114,6 +113,5 @@ defmodule GroupherServer.CMS.Community do
     |> unique_constraint(:aka, name: :communities_aka_index)
 
     # |> foreign_key_constraint(:communities_author_fkey)
-    # |> unique_constraint(:user_id, name: :posts_favorites_user_id_post_id_index)
   end
 end

lib/groupher_server/cms/delegates/article_curd.ex

@@ -140,26 +140,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
     |> update_content_result()
   end
 
-  @doc """
-  get CMS contents
-  post's favorites/stars/comments ...
-  ...
-  jobs's favorites/stars/comments ...
-
-  with or without page info
-  """
-  def reaction_users(thread, react, id, %{page: page, size: size} = filters) do
-    with {:ok, action} <- match_action(thread, react),
-         {:ok, where} <- dynamic_where(thread, id) do
-      # common_filter(action.reactor)
-      action.reactor
-      |> where(^where)
-      |> QueryBuilder.load_inner_users(filters)
-      |> ORM.paginater(~m(page size)a)
-      |> done()
-    end
-  end
-
   @spec ensure_author_exists(User.t()) :: {:ok, User.t()}
   def ensure_author_exists(%User{} = user) do
     # unique_constraint: avoid race conditions, make sure user_id unique

lib/groupher_server/cms/delegates/article_reaction.ex

@@ -1,6 +1,6 @@
 defmodule GroupherServer.CMS.Delegate.ArticleReaction do
   @moduledoc """
-  reaction[favorite, star, watch ...] on article [post, job...]
+  reaction[upvote, collect, watch ...] on article [post, job...]
   """
   import Helper.Utils, only: [done: 1, done: 2]
 
@@ -208,109 +208,4 @@ defmodule GroupherServer.CMS.Delegate.ArticleReaction do
   defp reaction_result({:error, _, result, _steps}) do
     {:error, result}
   end
-
-  ##### #########################
-  ##### #########################
-  ##### #########################
-  ##### #########################
-  ##### #########################
-
-  @doc """
-  favorite / star / watch CMS contents like post / tuts ...
-  """
-  def reaction(thread, react, content_id, %User{id: user_id}) do
-    with {:ok, action} <- match_action(thread, react),
-         {:ok, content} <- ORM.find(action.target, content_id, preload: [author: :user]),
-         {:ok, user} <- ORM.find(Accounts.User, user_id) do
-      Multi.new()
-      |> Multi.run(:create_reaction_record, fn _, _ ->
-        create_reaction_record(action, user, thread, content)
-      end)
-      |> Multi.run(:add_achievement, fn _, _ ->
-        achiever_id = content.author.user_id
-        Accounts.achieve(%User{id: achiever_id}, :inc, react)
-      end)
-      |> Repo.transaction()
-      |> old_reaction_result()
-    end
-  end
-
-  defp old_reaction_result({:ok, %{create_reaction_record: result}}), do: result |> done()
-
-  defp old_reaction_result({:error, :create_reaction_record, %Ecto.Changeset{} = result, _steps}) do
-    {:error, result}
-  end
-
-  defp old_reaction_result({:error, :create_reaction_record, _result, _steps}) do
-    {:error, [message: "create reaction fails", code: ecode(:react_fails)]}
-  end
-
-  defp old_reaction_result({:error, :add_achievement, _result, _steps}),
-    do: {:error, [message: "achieve fails", code: ecode(:react_fails)]}
-
-  defp create_reaction_record(action, %User{id: user_id}, thread, content) do
-    attrs = %{} |> Map.put("user_id", user_id) |> Map.put("#{thread}_id", content.id)
-
-    action.reactor
-    |> ORM.create(attrs)
-    |> done(with: content)
-  end
-
-  # ------
-  @doc """
-  unfavorite / unstar / unwatch CMS contents like post / tuts ...
-  """
-  def undo_reaction(thread, react, content_id, %User{id: user_id}) do
-    with {:ok, action} <- match_action(thread, react),
-         {:ok, content} <- ORM.find(action.target, content_id, preload: [author: :user]),
-         {:ok, user} <- ORM.find(Accounts.User, user_id) do
-      Multi.new()
-      |> Multi.run(:delete_reaction_record, fn _, _ ->
-        delete_reaction_record(action, user, thread, content)
-      end)
-      |> Multi.run(:minus_achievement, fn _, _ ->
-        achiever_id = content.author.user_id
-        Accounts.achieve(%User{id: achiever_id}, :dec, react)
-      end)
-      |> Repo.transaction()
-      |> undo_reaction_result()
-    end
-  end
-
-  defp undo_reaction_result({:ok, %{delete_reaction_record: result}}), do: result |> done()
-
-  defp undo_reaction_result({:error, :delete_reaction_record, _result, _steps}) do
-    {:error, [message: "delete reaction fails", code: ecode(:react_fails)]}
-  end
-
-  defp undo_reaction_result({:error, :minus_achievement, _result, _steps}),
-    do: {:error, [message: "achieve fails", code: ecode(:react_fails)]}
-
-  defp delete_reaction_record(action, %User{id: user_id}, thread, content) do
-    user_where = dynamic([u], u.user_id == ^user_id)
-    reaction_where = dynamic_reaction_where(thread, content.id, user_where)
-
-    query = from(f in action.reactor, where: ^reaction_where)
-
-    case Repo.one(query) do
-      nil ->
-        {:error, "record not found"}
-
-      record ->
-        Repo.delete(record)
-        {:ok, content}
-    end
-  end
-
-  defp dynamic_reaction_where(:post, id, user_where) do
-    dynamic([p], p.post_id == ^id and ^user_where)
-  end
-
-  defp dynamic_reaction_where(:job, id, user_where) do
-    dynamic([p], p.job_id == ^id and ^user_where)
-  end
-
-  defp dynamic_reaction_where(:repo, id, user_where) do
-    dynamic([p], p.repo_id == ^id and ^user_where)
-  end
 end

lib/groupher_server/cms/delegates/comment_reaction.ex

@@ -149,22 +149,6 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.collected_users(thread, id, filter)
   end
 
-  def reaction(_root, ~m(id thread action)a, %{context: %{cur_user: user}}) do
-    CMS.reaction(thread, action, id, user)
-  end
-
-  def undo_reaction(_root, ~m(id thread action)a, %{context: %{cur_user: user}}) do
-    CMS.undo_reaction(thread, action, id, user)
-  end
-
-  def reaction_users(_root, ~m(id action thread filter)a, _info) do
-    CMS.reaction_users(thread, action, id, filter)
-  end
-
-  def favorited_category(root, ~m(thread)a, %{context: %{cur_user: user}}) do
-    CMS.favorited_category(thread, root.id, user)
-  end
-
   # #######################
   # category ..
   # #######################
@@ -385,14 +369,6 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.reply_comment(thread, id, args, user)
   end
 
-  def like_comment(_root, ~m(thread id)a, %{context: %{cur_user: user}}) do
-    CMS.like_comment(thread, id, user)
-  end
-
-  def undo_like_comment(_root, ~m(thread id)a, %{context: %{cur_user: user}}) do
-    CMS.undo_like_comment(thread, id, user)
-  end
-
   def stamp_passport(_root, ~m(user_id rules)a, %{context: %{cur_user: _user}}) do
     CMS.stamp_passport(rules, %User{id: user_id})
   end

lib/groupher_server_web/resolvers/cms_resolver.ex

@@ -39,7 +39,7 @@ defmodule GroupherServerWeb.Schema.Account.Mutations do
       resolve(&R.Accounts.undo_follow/3)
     end
 
-    @desc "create a favorites category"
+    @desc "create a collect folder"
     field :create_collect_folder, :collect_folder do
       arg(:title, non_null(:string))
       arg(:private, :boolean)
@@ -49,7 +49,7 @@ defmodule GroupherServerWeb.Schema.Account.Mutations do
       resolve(&R.Accounts.create_collect_folder/3)
     end
 
-    @desc "update a favorites category"
+    @desc "update a collect folder"
     field :update_collect_folder, :collect_folder do
       arg(:id, non_null(:id))
       arg(:title, :string)