refactor(viewer-solution): wip

Author: mydearxym

lib/groupher_server/cms/cms.ex

@@ -76,8 +76,6 @@ defmodule GroupherServer.CMS do
   defdelegate paged_articles(queryable, filter), to: ArticleCURD
   defdelegate paged_articles(queryable, filter, user), to: ArticleCURD
 
-  defdelegate paged_contents(queryable, filter, user), to: ArticleCURD
-  defdelegate paged_contents(queryable, filter), to: ArticleCURD
   defdelegate create_content(community, thread, attrs, user), to: ArticleCURD
   defdelegate update_content(content, attrs), to: ArticleCURD
 

lib/groupher_server/cms/delegates/article_curd.ex

@@ -89,27 +89,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
     }
   end
 
-  @doc """
-  get paged post / job ...
-  """
-  def paged_contents(queryable, filter, user) do
-    queryable
-    |> domain_filter_query(filter)
-    |> community_with_flag_query(filter)
-    |> read_state_query(filter, user)
-    |> ORM.find_all(filter)
-    |> add_pin_contents_ifneed(queryable, filter)
-  end
-
-  def paged_contents(queryable, filter) do
-    queryable
-    |> domain_filter_query(filter)
-    |> community_with_flag_query(filter)
-    |> ORM.find_all(filter)
-    # TODO: if filter has when/sort/length/job... then don't
-    |> add_pin_contents_ifneed(queryable, filter)
-  end
-
   @doc """
   Creates a content(post/job ...), and set community.
 

lib/groupher_server/cms/job.ex

@@ -14,7 +14,6 @@ defmodule GroupherServer.CMS.Job do
     Embeds,
     ArticleComment,
     Community,
-    JobViewer,
     JobCommunityFlag,
     Tag,
     ArticleUpvote,
@@ -69,8 +68,6 @@ defmodule GroupherServer.CMS.Job do
     field(:article_comments_count, :integer, default: 0)
     field(:article_comments_participators_count, :integer, default: 0)
 
-    has_many(:viewers, {"jobs_viewers", JobViewer})
-
     many_to_many(
       :tags,
       Tag,

lib/groupher_server/cms/job_viewer.ex

@@ -17,7 +17,6 @@ defmodule GroupherServer.CMS.Post do
     Community,
     PostComment,
     PostCommunityFlag,
-    PostViewer,
     Tag,
     ArticleUpvote,
     ArticleCollect
@@ -73,7 +72,6 @@ defmodule GroupherServer.CMS.Post do
     # 评论参与者，只保留最近 5 个
     embeds_many(:article_comments_participators, Accounts.User, on_replace: :delete)
 
-    has_many(:viewers, {"posts_viewers", PostViewer})
     # The keys are inflected from the schema names!
     # see https://hexdocs.pm/ecto/Ecto.Schema.html
     many_to_many(

lib/groupher_server/cms/post.ex

@@ -14,7 +14,6 @@ defmodule GroupherServer.CMS.Repo do
     Embeds,
     Community,
     RepoContributor,
-    RepoViewer,
     RepoLang,
     RepoCommunityFlag,
     Tag,
@@ -70,8 +69,6 @@ defmodule GroupherServer.CMS.Repo do
 
     field(:last_sync, :utc_datetime)
 
-    has_many(:viewers, {"repos_viewers", RepoViewer})
-
     many_to_many(
       :tags,
       Tag,

lib/groupher_server/cms/post_viewer.ex

@@ -15,16 +15,13 @@ defmodule GroupherServer.CMS.Utils.Loader do
     CommunityThread,
     # POST
     Post,
-    PostViewer,
     PostComment,
     PostCommentLike,
     PostCommentReply,
     # JOB
-    Job,
-    JobViewer,
+    Job
     # JobStar,
     # Repo,
-    RepoViewer
   }
 
   alias Helper.QueryBuilder
@@ -92,18 +89,6 @@ defmodule GroupherServer.CMS.Utils.Loader do
     )
   end
 
-  def query({"posts_viewers", PostViewer}, %{cur_user: cur_user}) do
-    PostViewer |> where([pv], pv.user_id == ^cur_user.id)
-  end
-
-  def query({"jobs_viewers", JobViewer}, %{cur_user: cur_user}) do
-    JobViewer |> where([pv], pv.user_id == ^cur_user.id)
-  end
-
-  def query({"repos_viewers", RepoViewer}, %{cur_user: cur_user}) do
-    RepoViewer |> where([pv], pv.user_id == ^cur_user.id)
-  end
-
   def query({"communities_subscribers", CommunitySubscriber}, args) do
     CommunitySubscriber |> QueryBuilder.members_pack(args)
   end

lib/groupher_server/cms/repo.ex

@@ -11,9 +11,6 @@ defmodule GroupherServer.CMS.Utils.Matcher do
     Repo,
     Job,
     # viewer
-    PostViewer,
-    JobViewer,
-    RepoViewer,
     # reactions
     # comments
     PostComment,
@@ -32,7 +29,7 @@ defmodule GroupherServer.CMS.Utils.Matcher do
   ##  posts ...
   #########################################
   def match_action(:post, :self),
-    do: {:ok, %{target: Post, reactor: Post, preload: :author, viewer: PostViewer}}
+    do: {:ok, %{target: Post, reactor: Post, preload: :author}}
 
   def match_action(:post, :tag), do: {:ok, %{target: Post, reactor: Tag}}
   # NOTE: the tech, radar, share, city thread also use common tag
@@ -54,7 +51,7 @@ defmodule GroupherServer.CMS.Utils.Matcher do
   ## jobs ...
   #########################################
   def match_action(:job, :self),
-    do: {:ok, %{target: Job, reactor: Job, preload: :author, viewer: JobViewer}}
+    do: {:ok, %{target: Job, reactor: Job, preload: :author}}
 
   def match_action(:job, :community),
     do: {:ok, %{target: Job, reactor: Community, flag: JobCommunityFlag}}
@@ -65,7 +62,7 @@ defmodule GroupherServer.CMS.Utils.Matcher do
   ## repos ...
   #########################################
   def match_action(:repo, :self),
-    do: {:ok, %{target: Repo, reactor: Repo, preload: :author, viewer: RepoViewer}}
+    do: {:ok, %{target: Repo, reactor: Repo, preload: :author}}
 
   def match_action(:repo, :community),
     do: {:ok, %{target: Repo, reactor: Community, flag: RepoCommunityFlag}}