feat(blog-thread): remove matcher old debug

Author: mydearxym

lib/groupher_server/cms/helper/matcher_old.ex

@@ -30,6 +30,9 @@ defmodule GroupherServer.CMS.Helper.MatcherOld do
   def match_action(:post, :community),
     do: {:ok, %{target: Post, reactor: Community}}
 
+  def match_action(:post, :comment),
+    do: {:ok, %{target: Post, reactor: PostComment, preload: :author}}
+
   #########################################
   ## jobs ...
   #########################################

lib/groupher_server_web/middleware/passport_loader.ex

@@ -67,14 +67,10 @@ defmodule GroupherServerWeb.Middleware.PassportLoader do
     end
   end
 
-  def call(resolution, _) do
-    # TODO communiy in args
-    resolution
-  end
+  def call(resolution, _), do: resolution
 
-  def load_source(resolution, content) do
-    arguments = resolution.arguments |> Map.merge(%{passport_source: content})
-    %{resolution | arguments: arguments}
+  def load_source(%{arguments: arguments} = resolution, content) do
+    %{resolution | arguments: Map.put(arguments, :passport_source, content)}
   end
 
   # 取得 content 里面的 conmunities 字段
@@ -92,34 +88,22 @@ defmodule GroupherServerWeb.Middleware.PassportLoader do
     {:ok, _, react} = parse_source(args)
 
     case react == :comment do
-      true ->
-        {:ok, action.preload}
-
-      false ->
-        {:ok, [action.preload, parse_base(args)]}
+      true -> {:ok, action.preload}
+      false -> {:ok, [action.preload, parse_base(args)]}
     end
   end
 
   def load_owner_info(%{context: %{cur_user: cur_user}} = resolution, react, content) do
     content_author_id =
       cond do
-        react == :article_comment ->
-          content.author.id
-
-        react == :comment ->
-          content.author.id
-
-        true ->
-          content.author.user_id
+        react == :article_comment -> content.author.id
+        react == :comment -> content.author.id
+        true -> content.author.user_id
       end
 
     case content_author_id == cur_user.id do
-      true ->
-        arguments = resolution.arguments |> Map.merge(%{passport_is_owner: true})
-        %{resolution | arguments: arguments}
-
-      _ ->
-        resolution
+      true -> %{resolution | arguments: Map.put(resolution.arguments, :passport_is_owner, true)}
+      _ -> resolution
     end
   end
 
@@ -128,9 +112,7 @@ defmodule GroupherServerWeb.Middleware.PassportLoader do
     parse_source(source: [thread, react])
   end
 
-  defp parse_source(args, _resolution) do
-    parse_source(args)
-  end
+  defp parse_source(args, _resolution), do: parse_source(args)
 
   defp parse_source(args) do
     case Keyword.has_key?(args, :source) do
@@ -142,7 +124,5 @@ defmodule GroupherServerWeb.Middleware.PassportLoader do
   defp match_source([thread, react]), do: {:ok, thread, react}
   defp match_source(thread), do: {:ok, thread, :self}
 
-  defp parse_base(args) do
-    Keyword.get(args, :base) || :communities
-  end
+  defp parse_base(args), do: Keyword.get(args, :base) || :communities
 end

test/groupher_server_web/mutation/cms/articles/blog_test.exs

@@ -48,7 +48,6 @@ defmodule GroupherServer.Test.Mutation.Articles.Blog do
       }
     }
     """
-    @tag :wip
     test "create blog with valid attrs and make sure author exsit" do
       {:ok, user} = db_insert(:user)
       user_conn = simu_conn(:user, user)

test/groupher_server_web/mutation/cms/old_post_comment_test.exs

@@ -107,7 +107,7 @@ defmodule GroupherServer.Test.Mutation.OldPostComment do
       }
     }
     """
-
+    @tag :wip
     test "comment owner can delete comment", ~m(user community post)a do
       variables = %{community: community.raw, id: post.id, body: "this a comment"}
 

test/groupher_server_web/query/cms/old_post_comment_test.exs

@@ -219,7 +219,6 @@ defmodule GroupherServer.Test.Query.OldPostComment do
       }
     }
     """
-    @tag :wip
     test "guest user can get replies info", ~m(guest_conn post user community)a do
       body = "test comment"