refactor(viewer-solution): wip

Author: mydearxym

lib/groupher_server/cms/cms.ex

@@ -72,6 +72,10 @@ defmodule GroupherServer.CMS do
   # ArticleCURD
   defdelegate read_article(thread, id), to: ArticleCURD
   defdelegate read_article(thread, id, user), to: ArticleCURD
+
+  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

lib/groupher_server/cms/delegates/article_curd.ex

@@ -48,6 +48,47 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
     end
   end
 
+  def paged_articles(thread, filter) do
+    with {:ok, info} <- match(thread) do
+      info.model
+      |> domain_filter_query(filter)
+      |> community_with_flag_query(filter)
+      |> ORM.find_all(filter)
+      |> add_pin_contents_ifneed(info.model, filter)
+    end
+  end
+
+  def paged_articles(thread, filter, %User{} = user) do
+    with {:ok, info} <- match(thread) do
+      info.model
+      |> domain_filter_query(filter)
+      |> community_with_flag_query(filter)
+      |> ORM.find_all(filter)
+      |> add_pin_contents_ifneed(info.model, filter)
+      |> mark_viewer_has_states(user)
+    end
+  end
+
+  defp mark_viewer_has_states({:ok, %{entries: []} = contents}, _), do: {:ok, contents}
+
+  defp mark_viewer_has_states({:ok, %{entries: entries} = contents}, user) do
+    entries = Enum.map(entries, &Map.merge(&1, do_mark_viewer_has_states(&1.meta, user)))
+    {:ok, Map.merge(contents, %{entries: entries})}
+  end
+
+  defp mark_viewer_has_states({:error, reason}, _), do: {:error, reason}
+
+  defp do_mark_viewer_has_states(meta, %User{id: user_id}) do
+    # TODO: 根据是否付费进一步判断
+    # user_is_member = true
+    %{
+      viewer_has_collected: Enum.member?(meta.collected_user_ids, user_id),
+      viewer_has_upvoted: Enum.member?(meta.upvoted_user_ids, user_id),
+      viewer_has_viewed: Enum.member?(meta.viewed_user_ids, user_id),
+      viewer_has_reported: Enum.member?(meta.reported_user_ids, user_id)
+    }
+  end
+
   @doc """
   get paged post / job ...
   """

lib/groupher_server/cms/post.ex

@@ -40,6 +40,7 @@ defmodule GroupherServer.CMS.Post do
     field(:length, :integer)
     field(:views, :integer, default: 0)
 
+    belongs_to(:author, Author)
     embeds_one(:meta, Embeds.ArticleMeta, on_replace: :update)
 
     has_many(:community_flags, {"posts_communities_flags", PostCommunityFlag})
@@ -49,7 +50,10 @@ defmodule GroupherServer.CMS.Post do
     field(:is_pinned, :boolean, default: false, virtual: true)
     field(:trash, :boolean, default_value: false, virtual: true)
 
-    belongs_to(:author, Author)
+    field(:viewer_has_viewed, :boolean, default: false, virtual: true)
+    field(:viewer_has_upvoted, :boolean, default: false, virtual: true)
+    field(:viewer_has_collected, :boolean, default: false, virtual: true)
+    field(:viewer_has_reported, :boolean, default: false, virtual: true)
 
     # TODO
     # 相关文章

lib/groupher_server_web/resolvers/cms_resolver.ex

@@ -8,7 +8,7 @@ defmodule GroupherServerWeb.Resolvers.CMS do
   alias GroupherServer.{Accounts, CMS}
 
   alias Accounts.User
-  alias CMS.{Post, Repo, Job, Community, Category, Tag, Thread}
+  alias CMS.{Community, Category, Tag, Thread}
 
   alias Helper.ORM
 
@@ -54,26 +54,16 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.read_article(thread, id)
   end
 
-  def wiki(_root, ~m(community)a, _info), do: CMS.get_wiki(%Community{raw: community})
-  def cheatsheet(_root, ~m(community)a, _info), do: CMS.get_cheatsheet(%Community{raw: community})
-
-  def paged_posts(_root, ~m(filter)a, %{context: %{cur_user: user}}) do
-    Post |> CMS.paged_contents(filter, user)
+  def paged_articles(_root, ~m(thread filter)a, %{context: %{cur_user: user}}) do
+    CMS.paged_articles(thread, filter, user)
   end
 
-  def paged_posts(_root, ~m(filter)a, _info), do: Post |> CMS.paged_contents(filter)
-
-  def paged_repos(_root, ~m(filter)a, %{context: %{cur_user: user}}) do
-    Repo |> CMS.paged_contents(filter, user)
+  def paged_articles(_root, ~m(thread filter)a, _info) do
+    CMS.paged_articles(thread, filter)
   end
 
-  def paged_repos(_root, ~m(filter)a, _info), do: Repo |> CMS.paged_contents(filter)
-
-  def paged_jobs(_root, ~m(filter)a, %{context: %{cur_user: user}}) do
-    Job |> CMS.paged_contents(filter, user)
-  end
-
-  def paged_jobs(_root, ~m(filter)a, _info), do: Job |> CMS.paged_contents(filter)
+  def wiki(_root, ~m(community)a, _info), do: CMS.get_wiki(%Community{raw: community})
+  def cheatsheet(_root, ~m(community)a, _info), do: CMS.get_cheatsheet(%Community{raw: community})
 
   def create_content(_root, ~m(community_id thread)a = args, %{context: %{cur_user: user}}) do
     CMS.create_content(%Community{id: community_id}, thread, args, user)

lib/groupher_server_web/schema/cms/cms_misc.ex

@@ -138,12 +138,6 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
     value(:least_words)
   end
 
-  enum :read_enum do
-    value(:all)
-    # value(false)
-    value(true)
-  end
-
   enum :rainbow_color_enum do
     value(:red)
     value(:orange)
@@ -203,7 +197,6 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
     field(:when, :when_enum)
     field(:sort, :sort_enum)
     field(:length, :length_enum)
-    field(:read, :read_enum, default_value: :all)
     # @desc "Matching a tag"
     # @desc "Added to the menu after this date"
     # field(:added_after, :datetime)

lib/groupher_server_web/schema/cms/cms_queries.ex

@@ -75,42 +75,45 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
 
     @desc "get paged posts"
     field :paged_posts, :paged_posts do
+      arg(:thread, :post_thread, default_value: :post)
       arg(:filter, non_null(:paged_posts_filter))
 
       middleware(M.PageSizeProof)
-      resolve(&R.CMS.paged_posts/3)
+      resolve(&R.CMS.paged_articles/3)
     end
 
-    @desc "get repo by id"
-    field :repo, non_null(:repo) do
+    @desc "get job by id"
+    field :job, non_null(:job) do
       arg(:id, non_null(:id))
-      arg(:thread, :repo_thread, default_value: :repo)
+      arg(:thread, :job_thread, default_value: :job)
 
       resolve(&R.CMS.read_article/3)
     end
 
-    @desc "get paged repos"
-    field :paged_repos, :paged_repos do
-      arg(:filter, non_null(:paged_repos_filter))
+    @desc "get paged jobs"
+    field :paged_jobs, :paged_jobs do
+      arg(:thread, :job_thread, default_value: :job)
+      arg(:filter, non_null(:paged_jobs_filter))
 
       middleware(M.PageSizeProof)
-      resolve(&R.CMS.paged_repos/3)
+      resolve(&R.CMS.paged_articles/3)
     end
 
-    @desc "get job by id"
-    field :job, non_null(:job) do
+    @desc "get repo by id"
+    field :repo, non_null(:repo) do
       arg(:id, non_null(:id))
-      arg(:thread, :job_thread, default_value: :job)
+      arg(:thread, :repo_thread, default_value: :repo)
 
       resolve(&R.CMS.read_article/3)
     end
 
-    @desc "get paged jobs"
-    field :paged_jobs, :paged_jobs do
-      arg(:filter, non_null(:paged_jobs_filter))
+    @desc "get paged repos"
+    field :paged_repos, :paged_repos do
+      arg(:thread, :repo_thread, default_value: :repo)
+      arg(:filter, non_null(:paged_repos_filter))
 
       middleware(M.PageSizeProof)
-      resolve(&R.CMS.paged_jobs/3)
+      resolve(&R.CMS.paged_articles/3)
     end
 
     @desc "get wiki by community raw name"

lib/groupher_server_web/schema/cms/cms_types.ex

@@ -69,9 +69,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
       end)
     end
 
-    has_viewed_field()
-    # viewer_has_upvoted
-    # viewer_has_collected
+    viewer_has_state_fields()
     # upvoted_count
     # collected_count
 
@@ -112,7 +110,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     # comments_participators
     comments_counter_fields(:job)
 
-    has_viewed_field()
+    viewer_has_state_fields()
     timestamp_fields()
   end
 
@@ -153,7 +151,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:origial_community, :community, resolve: dataloader(CMS, :origial_community))
     field(:communities, list_of(:community), resolve: dataloader(CMS, :communities))
 
-    has_viewed_field()
+    viewer_has_state_fields()
     # comments_count
     # comments_participators
     comments_counter_fields(:repo)

lib/groupher_server_web/schema/utils/helper.ex

@@ -39,7 +39,6 @@ defmodule GroupherServerWeb.Schema.Utils.Helper do
     quote do
       field(:when, :when_enum)
       field(:length, :length_enum)
-      field(:read, :read_enum, default_value: :all)
       field(:tag, :string, default_value: :all)
       field(:community, :string)
     end
@@ -89,16 +88,12 @@ defmodule GroupherServerWeb.Schema.Utils.Helper do
     end
   end
 
-  defmacro has_viewed_field do
+  defmacro viewer_has_state_fields do
     quote do
-      # @desc "if user has viewed this content"
-      field :viewer_has_viewed, :boolean do
-        middleware(M.Authorize, :login)
-        middleware(M.PutCurrentUser)
-
-        resolve(dataloader(CMS, :viewers))
-        middleware(M.ViewerDidConvert)
-      end
+      field(:viewer_has_collected, :boolean)
+      field(:viewer_has_upvoted, :boolean)
+      field(:viewer_has_viewed, :boolean)
+      field(:viewer_has_reported, :boolean)
     end
   end
 

test/groupher_server/cms/post_test.exs

@@ -26,7 +26,7 @@ defmodule GroupherServer.Test.CMS.Post do
       assert post.title == post_attrs.title
     end
 
-    @tag :wip2
+    @tag :wip3
     test "read post should update views and meta viewed_user_list",
          ~m(post_attrs community user user2)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)

test/groupher_server_web/query/cms/job_test.exs

@@ -19,7 +19,7 @@ defmodule GroupherServer.Test.Query.Job do
     }
   }
   """
-  @tag :wip2
+  @tag :wip3
   test "basic graphql query on job with logined user", ~m(user_conn job)a do
     variables = %{id: job.id}
     results = user_conn |> query_result(@query, variables, "job")
@@ -30,7 +30,7 @@ defmodule GroupherServer.Test.Query.Job do
     assert length(Map.keys(results)) == 3
   end
 
-  @tag :wip2
+  @tag :wip3
   test "basic graphql query on job with stranger(unloged user)", ~m(guest_conn job)a do
     variables = %{id: job.id}
     results = guest_conn |> query_result(@query, variables, "job")