refactor(viewer-solution): read-content -> read-article

Author: mydearxym

lib/groupher_server/cms/cms.ex

@@ -70,7 +70,8 @@ defmodule GroupherServer.CMS do
   defdelegate subscribe_default_community_ifnot(user), to: CommunityOperation
 
   # ArticleCURD
-  defdelegate read_content(thread, id, user), to: ArticleCURD
+  defdelegate read_article(thread, id), to: ArticleCURD
+  defdelegate read_article(thread, id, 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

@@ -5,33 +5,46 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
   import Ecto.Query, warn: false
 
   import GroupherServer.CMS.Utils.Matcher2
+  import GroupherServer.CMS.Utils.Matcher, only: [match_action: 2]
 
-  import GroupherServer.CMS.Utils.Matcher, only: [match_action: 2, dynamic_where: 2]
   import Helper.Utils, only: [done: 1, pick_by: 2, integerfy: 1]
   import Helper.ErrorCode
-  import ShortMaps
 
+  alias Helper.{Later, ORM}
   alias GroupherServer.{Accounts, CMS, Delivery, Email, Repo, Statistics}
 
   alias Accounts.User
   alias CMS.{Author, Community, PinnedArticle, Embeds, Delegate, Tag}
 
   alias Delegate.ArticleOperation
-  alias Helper.{Later, ORM, QueryBuilder}
 
   alias Ecto.Multi
 
   @default_article_meta Embeds.ArticleMeta.default_meta()
 
   @doc """
-  login user read cms content by add views count and viewer record
+  read articles for un-logined user
   """
-  def read_content(thread, id, %User{id: user_id}) do
-    condition = %{user_id: user_id} |> Map.merge(content_id(thread, id))
+  def read_article(thread, id) do
+    with {:ok, info} <- match(thread) do
+      ORM.read(info.model, id, inc: :views)
+    end
+  end
 
-    with {:ok, action} <- match_action(thread, :self),
-         {:ok, _viewer} <- action.viewer |> ORM.findby_or_insert(condition, condition) do
-      action.target |> ORM.read(id, inc: :views)
+  @doc """
+  read articles for logined user
+  """
+  def read_article(thread, id, %User{id: user_id}) do
+    with {:ok, info} <- match(thread) do
+      Multi.new()
+      |> Multi.run(:inc_views, fn _, _ ->
+        ORM.read(info.model, id, inc: :views)
+      end)
+      |> Multi.run(:add_viewed_user, fn _, %{inc_views: article} ->
+        update_viewed_user_list(article, user_id)
+      end)
+      |> Repo.transaction()
+      |> read_result()
     end
   end
 
@@ -417,4 +430,32 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
   end
 
   defp exec_update_tags(_content, _), do: {:ok, :pass}
+
+  defp update_viewed_user_list(%{meta: nil} = article, user_id) do
+    new_ids = Enum.uniq([user_id] ++ @default_article_meta.viewed_user_ids)
+    updated_meta = @default_article_meta |> Map.merge(%{viewed_user_ids: new_ids})
+
+    article
+    |> Ecto.Changeset.change()
+    |> Ecto.Changeset.put_embed(:meta, updated_meta)
+    |> Repo.update()
+  end
+
+  defp update_viewed_user_list(%{meta: meta} = article, user_id) do
+    new_ids = Enum.uniq([user_id] ++ meta.viewed_user_ids)
+
+    updated_meta =
+      meta |> Map.merge(%{viewed_user_ids: new_ids}) |> Map.from_struct() |> Map.delete(:id)
+
+    article
+    |> Ecto.Changeset.change()
+    |> Ecto.Changeset.put_embed(:meta, updated_meta)
+    |> Repo.update()
+  end
+
+  defp read_result({:ok, %{inc_views: result}}), do: result |> done()
+
+  defp read_result({:error, _, result, _steps}) do
+    {:error, result}
+  end
 end

lib/groupher_server_web/resolvers/cms_resolver.ex

@@ -46,25 +46,14 @@ defmodule GroupherServerWeb.Resolvers.CMS do
   # #######################
   # community thread (post, job), login user should be logged
   # #######################
-  def post(_root, %{id: id}, %{context: %{cur_user: user}}) do
-    CMS.read_content(:post, id, user)
+  def read_article(_root, %{thread: thread, id: id}, %{context: %{cur_user: user}}) do
+    CMS.read_article(thread, id, user)
   end
 
-  def post(_root, %{id: id}, _info),
-    do: Post |> ORM.read(id, inc: :views)
-
-  def job(_root, %{id: id}, %{context: %{cur_user: user}}) do
-    CMS.read_content(:job, id, user)
+  def read_article(_root, %{thread: thread, id: id}, _info) do
+    CMS.read_article(thread, id)
   end
 
-  def job(_root, %{id: id}, _info), do: Job |> ORM.read(id, inc: :views)
-
-  def repo(_root, %{id: id}, %{context: %{cur_user: user}}) do
-    CMS.read_content(:repo, id, user)
-  end
-
-  def repo(_root, %{id: id}, _info), do: Repo |> ORM.read(id, inc: :views)
-
   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})
 

lib/groupher_server_web/schema/cms/cms_queries.ex

@@ -68,7 +68,9 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
     @desc "get post by id"
     field :post, non_null(:post) do
       arg(:id, non_null(:id))
-      resolve(&R.CMS.post/3)
+      arg(:thread, :post_thread, default_value: :post)
+
+      resolve(&R.CMS.read_article/3)
     end
 
     @desc "get paged posts"
@@ -82,7 +84,9 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
     @desc "get repo by id"
     field :repo, non_null(:repo) do
       arg(:id, non_null(:id))
-      resolve(&R.CMS.repo/3)
+      arg(:thread, :repo_thread, default_value: :repo)
+
+      resolve(&R.CMS.read_article/3)
     end
 
     @desc "get paged repos"
@@ -93,22 +97,12 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
       resolve(&R.CMS.paged_repos/3)
     end
 
-    @desc "get wiki by community raw name"
-    field :wiki, non_null(:wiki) do
-      arg(:community, :string)
-      resolve(&R.CMS.wiki/3)
-    end
-
-    @desc "get cheatsheet by community raw name"
-    field :cheatsheet, non_null(:cheatsheet) do
-      arg(:community, :string)
-      resolve(&R.CMS.cheatsheet/3)
-    end
-
     @desc "get job by id"
     field :job, non_null(:job) do
       arg(:id, non_null(:id))
-      resolve(&R.CMS.job/3)
+      arg(:thread, :job_thread, default_value: :job)
+
+      resolve(&R.CMS.read_article/3)
     end
 
     @desc "get paged jobs"
@@ -119,6 +113,18 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
       resolve(&R.CMS.paged_jobs/3)
     end
 
+    @desc "get wiki by community raw name"
+    field :wiki, non_null(:wiki) do
+      arg(:community, :string)
+      resolve(&R.CMS.wiki/3)
+    end
+
+    @desc "get cheatsheet by community raw name"
+    field :cheatsheet, non_null(:cheatsheet) do
+      arg(:community, :string)
+      resolve(&R.CMS.cheatsheet/3)
+    end
+
     @desc "get paged upvoted users of an article"
     field :upvoted_users, :paged_users do
       arg(:id, non_null(:id))
@@ -139,17 +145,6 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
       resolve(&R.CMS.collected_users/3)
     end
 
-    @desc "get paged users of a reaction related to cms content"
-    field :reaction_users, :paged_users do
-      arg(:id, non_null(:id))
-      arg(:thread, :react_thread, default_value: :post)
-      arg(:action, non_null(:react_action))
-      arg(:filter, non_null(:paged_filter))
-
-      middleware(M.PageSizeProof)
-      resolve(&R.CMS.reaction_users/3)
-    end
-
     # get all tags
     @desc "get paged tags"
     field :paged_tags, :paged_tags do

test/groupher_server/cms/article_collect_test.exs

@@ -64,7 +64,6 @@ defmodule GroupherServer.Test.ArticleCollect do
       assert user_exist_in?(user2, users.entries)
     end
 
-    @tag :wip2
     test "post meta history should be updated", ~m(user user2 community post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
       {:ok, _} = CMS.collect_article(:post, post.id, user)
@@ -79,7 +78,6 @@ defmodule GroupherServer.Test.ArticleCollect do
       assert user2.id in article.meta.collected_user_ids
     end
 
-    @tag :wip2
     test "post meta history should be updated after undo collect",
          ~m(user user2 community post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
@@ -148,7 +146,6 @@ defmodule GroupherServer.Test.ArticleCollect do
       assert user_exist_in?(user2, users.entries)
     end
 
-    @tag :wip2
     test "job meta history should be updated", ~m(user user2 community job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
       {:ok, _} = CMS.collect_article(:job, job.id, user)
@@ -162,7 +159,6 @@ defmodule GroupherServer.Test.ArticleCollect do
       assert user2.id in article.meta.collected_user_ids
     end
 
-    @tag :wip2
     test "job meta history should be updated after undo collect",
          ~m(user user2 community job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)

test/groupher_server/cms/article_upvote_test.exs

@@ -56,7 +56,6 @@ defmodule GroupherServer.Test.ArticleUpvote do
       assert user_exist_in?(user2, users.entries)
     end
 
-    @tag :wip2
     test "post meta history should be updated after upvote",
          ~m(user user2 community post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
@@ -68,7 +67,6 @@ defmodule GroupherServer.Test.ArticleUpvote do
       assert user2.id in article.meta.upvoted_user_ids
     end
 
-    @tag :wip2
     test "post meta history should be updated after undo upvote",
          ~m(user user2 community post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
@@ -128,7 +126,6 @@ defmodule GroupherServer.Test.ArticleUpvote do
       assert user_exist_in?(user2, users.entries)
     end
 
-    @tag :wip2
     test "job meta history should be updated", ~m(user user2 community job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
       {:ok, article} = CMS.upvote_article(:job, job.id, user)
@@ -139,7 +136,6 @@ defmodule GroupherServer.Test.ArticleUpvote do
       assert user2.id in article.meta.upvoted_user_ids
     end
 
-    @tag :wip2
     test "job meta history should be updated after undo upvote",
          ~m(user user2 community job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)

test/groupher_server/cms/post_test.exs

@@ -6,12 +6,13 @@ defmodule GroupherServer.Test.CMS.Post do
 
   setup do
     {:ok, user} = db_insert(:user)
-    # {:ok, post} = db_insert(:post)
+    {:ok, user2} = db_insert(:user)
+    {:ok, post} = db_insert(:post)
     {:ok, community} = db_insert(:community)
 
     post_attrs = mock_attrs(:post, %{community_id: community.id})
 
-    {:ok, ~m(user community post_attrs)a}
+    {:ok, ~m(user user2 community post post_attrs)a}
   end
 
   describe "[cms post curd]" do
@@ -25,6 +26,28 @@ defmodule GroupherServer.Test.CMS.Post do
       assert post.title == post_attrs.title
     end
 
+    @tag :wip2
+    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)
+      {:ok, _} = CMS.read_article(:post, post.id, user)
+      {:ok, _created} = ORM.find(CMS.Post, post.id)
+
+      # same user duplicate case
+      {:ok, _} = CMS.read_article(:post, post.id, user)
+      {:ok, created} = ORM.find(CMS.Post, post.id)
+
+      assert created.meta.viewed_user_ids |> length == 1
+      assert user.id in created.meta.viewed_user_ids
+
+      {:ok, _} = CMS.read_article(:post, post.id, user2)
+      {:ok, created} = ORM.find(CMS.Post, post.id)
+
+      assert created.meta.viewed_user_ids |> length == 2
+      assert user.id in created.meta.viewed_user_ids
+      assert user2.id in created.meta.viewed_user_ids
+    end
+
     test "created post has origial community info", ~m(user community post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
       {:ok, found} = ORM.find(CMS.Post, post.id, preload: :origial_community)

test/groupher_server_web/query/cms/job_test.exs

@@ -19,6 +19,7 @@ defmodule GroupherServer.Test.Query.Job do
     }
   }
   """
+  @tag :wip2
   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")
@@ -29,6 +30,7 @@ defmodule GroupherServer.Test.Query.Job do
     assert length(Map.keys(results)) == 3
   end
 
+  @tag :wip2
   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")

test/groupher_server_web/query/cms/post_test.exs

@@ -28,6 +28,7 @@ defmodule GroupherServer.Test.Query.Post do
     }
   }
   """
+  @tag :wip2
   test "basic graphql query on post with logined user",
        ~m(user_conn community user post_attrs)a do
     {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
@@ -42,6 +43,7 @@ defmodule GroupherServer.Test.Query.Post do
     assert length(Map.keys(results)) == 4
   end
 
+  @tag :wip2
   test "basic graphql query on post with stranger(unloged user)", ~m(guest_conn post)a do
     variables = %{id: post.id}
     results = guest_conn |> query_result(@query, variables, "post")

test/groupher_server_web/query/cms/repo_test.exs

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