feat(blog-thread): remove old post_comment && re-org PassportLoader

Author: mydearxym

lib/groupher_server/cms/cms.ex

@@ -18,7 +18,6 @@ defmodule GroupherServer.CMS do
     ArticleCommentAction,
     ArticleCommentEmotion,
     ArticleTag,
-    CommentCURD,
     CommunitySync,
     CommunityCURD,
     CommunityOperation,
@@ -162,14 +161,6 @@ defmodule GroupherServer.CMS do
   ###################
   ###################
   ###################
-  defdelegate create_comment(thread, content_id, args, user), to: CommentCURD
-  defdelegate update_comment(thread, id, args, user), to: CommentCURD
-  defdelegate delete_comment(thread, content_id), to: CommentCURD
-  defdelegate paged_replies(thread, comment, user), to: CommentCURD
-  defdelegate reply_comment(thread, comment, args, user), to: CommentCURD
-
-  defdelegate paged_comments(thread, content_id, filters), to: CommentCURD
-  defdelegate paged_comments_participators(thread, content_id, filters), to: CommentCURD
 
   # TODO: move report to abuse report module
   defdelegate report_article(thread, article_id, reason, attr, user), to: AbuseReport

lib/groupher_server/cms/delegates/comment_curd.ex

@@ -6,14 +6,7 @@ defmodule GroupherServer.CMS.Helper.Loader do
 
   alias GroupherServer.{CMS, Repo}
 
-  alias CMS.Model.{
-    Author,
-    CommunityThread,
-    PostComment,
-    PostCommentLike,
-    PostCommentReply
-  }
-
+  alias CMS.Model.{Author, CommunityThread}
   alias Helper.QueryBuilder
 
   def data, do: Dataloader.Ecto.new(Repo, query: &query/2)
@@ -31,96 +24,6 @@ defmodule GroupherServer.CMS.Helper.Loader do
     )
   end
 
-  # ------- post comments ------
-  @doc """
-  get unique participators join in comments
-  """
-  # NOTE: this is NOT the right solution
-  # should use WINDOW function
-  # see https://github.com/coderplanets/coderplanets_server/issues/16
-  def query({"posts_comments", PostComment}, %{filter: _filter, unique: true}) do
-    PostComment
-    |> join(:inner, [c], a in assoc(c, :author))
-    # NOTE:  this distinct not working in production env, so the uniq logic is move to
-    # cut_participators.ex middleware, when the data is large, will cause performace issue
-    # |> distinct([c, a], a.id)
-    |> select([c, a], a)
-  end
-
-  def query({"posts_comments", PostComment}, %{count: _, unique: true}) do
-    PostComment
-    |> join(:inner, [c], a in assoc(c, :author))
-    |> distinct([c, a], a.id)
-    |> group_by([c, a], a.id)
-    |> group_by([c, a], c.post_id)
-    |> select([c, a], count(c.id))
-  end
-
-  def query({"posts_comments", PostComment}, %{count: _}) do
-    PostComment
-    |> group_by([c], c.post_id)
-    |> select([c], count(c.id))
-  end
-
-  def query({"posts_comments", PostComment}, %{filter: filter}) do
-    PostComment
-    |> QueryBuilder.filter_pack(filter)
-  end
-
-  def query({"posts_comments_replies", PostCommentReply}, %{count: _}) do
-    PostCommentReply
-    |> group_by([c], c.post_comment_id)
-    |> select([c], count(c.id))
-  end
-
-  def query({"posts_comments_replies", PostCommentReply}, %{filter: filter}) do
-    PostCommentReply
-    |> load_inner_replies(filter)
-  end
-
-  @doc """
-  load replies of the given comment
-  TODO: remove
-  """
-  defp load_inner_replies(queryable, filter) do
-    queryable
-    |> QueryBuilder.filter_pack(filter)
-    |> join(:inner, [c], r in assoc(c, :reply))
-    |> select([c, r], r)
-  end
-
-  def query({"posts_comments_replies", PostCommentReply}, %{reply_to: _}) do
-    PostCommentReply
-    |> join(:inner, [c], r in assoc(c, :post_comment))
-    |> select([c, r], r)
-  end
-
-  def query({"posts_comments_likes", PostCommentLike}, %{count: _}) do
-    PostCommentLike
-    |> group_by([f], f.post_comment_id)
-    |> select([f], count(f.id))
-  end
-
-  def query({"posts_comments_likes", PostCommentLike}, %{viewer_did: _, cur_user: cur_user}) do
-    PostCommentLike |> where([f], f.user_id == ^cur_user.id)
-  end
-
-  def query({"posts_comments_likes", PostCommentLike}, %{filter: _filter} = args) do
-    PostCommentLike |> members_pack(args)
-  end
-
-  # TODO: remove it
-  def members_pack(queryable, %{filter: filter}) do
-    queryable |> QueryBuilder.load_inner_users(filter)
-  end
-
-  # def query({"articles_comments_upvotes", ArticleCommentUpvote}, %{
-  #       viewer_did: _,
-  #       cur_user: cur_user
-  #     }) do
-  #   ArticleCommentUpvote |> where([f], f.user_id == ^cur_user.id)
-  # end
-
   # default loader
   def query(queryable, _args) do
     queryable

lib/groupher_server/cms/helper/loader.ex

@@ -9,7 +9,7 @@ defmodule GroupherServer.CMS.Model.Post do
   import GroupherServer.CMS.Helper.Macros
 
   alias GroupherServer.CMS
-  alias CMS.Model.{Embeds, PostComment}
+  alias CMS.Model.Embeds
 
   alias Helper.HTML
 
@@ -30,9 +30,6 @@ defmodule GroupherServer.CMS.Model.Post do
     field(:is_solved, :boolean, default: false)
     field(:solution_digest, :string)
 
-    # TODO: remove after legacy data migrated
-    has_many(:comments, {"posts_comments", PostComment})
-
     article_tags_field(:post)
     article_communities_field(:post)
     general_article_fields()