refactor(tag): rm unnecesasary community arg passed down

Author: mydearxym

lib/mastani_server/cms/cms.ex

@@ -92,7 +92,7 @@ defmodule MastaniServer.CMS do
   # defdelegate undo_pin_content(queryable, community_id, thread), to: ArticleOperation
 
   # >> tag: set / unset
-  defdelegate set_tag(community, thread, tag, content_id), to: ArticleOperation
+  defdelegate set_tag(thread, tag, content_id), to: ArticleOperation
   defdelegate unset_tag(thread, tag, content_id), to: ArticleOperation
   defdelegate set_refined_tag(community, thread, topic, content_id), to: ArticleOperation
   defdelegate set_refined_tag(community, thread, content_id), to: ArticleOperation

lib/mastani_server/cms/delegates/article_curd.ex

@@ -107,7 +107,7 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
       end)
       |> Multi.run(:set_tag, fn _, %{add_content_author: content} ->
         case attrs |> Map.has_key?(:tags) do
-          true -> set_tags(community, thread, content.id, attrs.tags)
+          true -> set_tags(thread, content.id, attrs.tags)
           false -> {:ok, :pass}
         end
       end)
@@ -422,10 +422,10 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
     {:error, [message: "log action", code: ecode(:create_fails)]}
   end
 
-  defp set_tags(community, thread, content_id, tags) do
+  defp set_tags(thread, content_id, tags) do
     try do
       Enum.each(tags, fn tag ->
-        {:ok, _} = ArticleOperation.set_tag(community, thread, %Tag{id: tag.id}, content_id)
+        {:ok, _} = ArticleOperation.set_tag(thread, %Tag{id: tag.id}, content_id)
       end)
 
       {:ok, "psss"}

lib/mastani_server/cms/delegates/article_operation.ex

@@ -155,7 +155,7 @@ defmodule MastaniServer.CMS.Delegate.ArticleOperation do
   refined tag can't set by this func, use set_refined_tag instead
   """
   # check community first
-  def set_tag(%Community{id: _communitId}, thread, %Tag{id: tag_id}, content_id) do
+  def set_tag(thread, %Tag{id: tag_id}, content_id) do
     with {:ok, action} <- match_action(thread, :tag),
          {:ok, content} <- ORM.find(action.target, content_id, preload: :tags),
          {:ok, tag} <- ORM.find(action.reactor, tag_id) do

lib/mastani_server/cms/delegates/community_curd.ex

@@ -103,6 +103,16 @@ defmodule MastaniServer.CMS.Delegate.CommunityCURD do
     |> done()
   end
 
+  @doc """
+  get all paged tags
+  """
+  def get_tags(%{page: page, size: size} = filter) do
+    Tag
+    |> QueryBuilder.filter_pack(filter)
+    |> ORM.paginater(~m(page size)a)
+    |> done()
+  end
+
   @doc """
   get tags belongs to a community / thread
   """
@@ -159,16 +169,6 @@ defmodule MastaniServer.CMS.Delegate.CommunityCURD do
     |> done()
   end
 
-  @doc """
-  get all paged tags
-  """
-  def get_tags(%{page: page, size: size} = filter) do
-    Tag
-    |> QueryBuilder.filter_pack(filter)
-    |> ORM.paginater(~m(page size)a)
-    |> done()
-  end
-
   def create_category(attrs, %Accounts.User{id: user_id}) do
     with {:ok, author} <- ensure_author_exists(%Accounts.User{id: user_id}) do
       attrs = attrs |> Map.merge(%{author_id: author.id})

lib/mastani_server_web/resolvers/cms_resolver.ex

@@ -268,8 +268,8 @@ defmodule MastaniServerWeb.Resolvers.CMS do
 
   def update_tag(_root, args, _info), do: CMS.update_tag(args)
 
-  def set_tag(_root, ~m(community_id thread id tag_id)a, _info) do
-    CMS.set_tag(%Community{id: community_id}, thread, %Tag{id: tag_id}, id)
+  def set_tag(_root, ~m(thread id tag_id)a, _info) do
+    CMS.set_tag(thread, %Tag{id: tag_id}, id)
   end
 
   def set_refined_tag(_root, ~m(community_id thread id topic)a, _info) do

lib/mastani_server_web/schema/cms/mutations/operation.ex

@@ -82,6 +82,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Operation do
     field :set_tag, :tag do
       arg(:id, non_null(:id))
       arg(:tag_id, non_null(:id))
+      # community_id only use for passport check
       arg(:community_id, non_null(:id))
       arg(:thread, :cms_thread, default_value: :post)
 

test/mastani_server_web/mutation/cms/job_test.exs

@@ -198,6 +198,7 @@ defmodule MastaniServer.Test.Mutation.Job do
       assert updated["tags"] |> Enum.any?(&(&1["id"] == to_string(tag.id)))
     end
 
+    @tag :wip
     test "update job tags will replace old city-tags", ~m(owner_conn user job)a do
       unique_num = System.unique_integer([:positive, :monotonic])
 
@@ -208,7 +209,7 @@ defmodule MastaniServer.Test.Mutation.Job do
       {:ok, tag2} =
         CMS.create_tag(%CMS.Community{id: community2.id}, :job, mock_attrs(:tag), user)
 
-      {:ok, _} = CMS.set_tag(community2, :job, tag2, job.id)
+      {:ok, _} = CMS.set_tag(:job, tag2, job.id)
 
       variables = %{
         id: job.id,

test/mastani_server_web/mutation/cms/post_test.exs

@@ -257,6 +257,7 @@ defmodule MastaniServer.Test.Mutation.Post do
       }
     }
     """
+    @tag :wip
     test "auth user can set a valid tag to post", ~m(post)a do
       {:ok, community} = db_insert(:community)
       {:ok, tag} = db_insert(:tag, %{thread: "post", community: community})
@@ -275,12 +276,12 @@ defmodule MastaniServer.Test.Mutation.Post do
     @tag :wip
     test "can not set refined tag to post", ~m(post)a do
       {:ok, community} = db_insert(:community)
-      {:ok, _tag} = db_insert(:tag, %{thread: "post", community: community, title: "refined"})
+      {:ok, tag} = db_insert(:tag, %{thread: "post", community: community, title: "refined"})
 
       passport_rules = %{community.title => %{"post.tag.set" => true}}
       rule_conn = simu_conn(:user, cms: passport_rules)
 
-      variables = %{id: post.id, communityId: community.id}
+      variables = %{id: post.id, tagId: tag.id}
 
       assert rule_conn |> mutation_get_error?(@set_tag_query, variables)
     end