refactor(drop-topic): wip

Author: mydearxym

lib/groupher_server/cms/delegates/seeds_config.ex

@@ -294,7 +294,7 @@ defmodule GroupherServer.CMS.Delegate.SeedsConfig do
         color: :grey
       }
     ]
-    |> Enum.map(fn attr -> Map.merge(%{thread: :post, topic: "posts"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :post}, attr) end)
   end
 
   def tags(:job) do
@@ -305,7 +305,7 @@ defmodule GroupherServer.CMS.Delegate.SeedsConfig do
         color: :cadetblue
       }
     ])
-    |> Enum.map(fn attr -> Map.merge(%{thread: :job, topic: "jobs"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :job}, attr) end)
   end
 
   def tags(:repo) do
@@ -343,7 +343,7 @@ defmodule GroupherServer.CMS.Delegate.SeedsConfig do
         color: :grey
       }
     ]
-    |> Enum.map(fn attr -> Map.merge(%{thread: :repo, topic: "repos"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :repo}, attr) end)
   end
 
   def tags(_), do: []
@@ -383,7 +383,7 @@ defmodule GroupherServer.CMS.Delegate.SeedsConfig do
         color: :grey
       }
     ]
-    |> Enum.map(fn attr -> Map.merge(%{thread: :post, topic: "posts"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :post}, attr) end)
   end
 
   # home posts
@@ -422,7 +422,7 @@ defmodule GroupherServer.CMS.Delegate.SeedsConfig do
         color: :grey
       }
     ]
-    |> Enum.map(fn attr -> Map.merge(%{thread: :post, topic: "posts"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :post}, attr) end)
   end
 
   def tags(:home, :tech) do
@@ -460,7 +460,7 @@ defmodule GroupherServer.CMS.Delegate.SeedsConfig do
         color: :grey
       }
     ]
-    |> Enum.map(fn attr -> Map.merge(%{thread: :tech, topic: "tech"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :tech}, attr) end)
   end
 
   def tags(:home, :share) do
@@ -498,7 +498,7 @@ defmodule GroupherServer.CMS.Delegate.SeedsConfig do
         color: :grey
       }
     ]
-    |> Enum.map(fn attr -> Map.merge(%{thread: :share, topic: "share"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :share}, attr) end)
   end
 
   def tags(:home, :radar) do
@@ -537,12 +537,12 @@ defmodule GroupherServer.CMS.Delegate.SeedsConfig do
         color: :grey
       }
     ]
-    |> Enum.map(fn attr -> Map.merge(%{thread: :radar, topic: "radar"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :radar}, attr) end)
   end
 
   def tags(:home, :city) do
     city_tags()
-    |> Enum.map(fn attr -> Map.merge(%{thread: :city, topic: "city"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :city}, attr) end)
   end
 
   def tags(:home, :job) do
@@ -553,7 +553,7 @@ defmodule GroupherServer.CMS.Delegate.SeedsConfig do
         color: :cadetblue
       }
     ])
-    |> Enum.map(fn attr -> Map.merge(%{thread: :job, topic: "jobs"}, attr) end)
+    |> Enum.map(fn attr -> Map.merge(%{thread: :job}, attr) end)
   end
 
   def tags(:home, _), do: []

lib/groupher_server_web/middleware/add_source_icon.ex

@@ -99,16 +99,16 @@ defmodule GroupherServerWeb.Resolvers.CMS do
   # #######################
   # content flag ..
   # #######################
-  def pin_content(_root, ~m(id community_id topic)a, _info) do
-    CMS.pin_content(%CMS.Post{id: id}, %Community{id: community_id}, topic)
+  def pin_content(_root, ~m(id community_id)a, _info) do
+    CMS.pin_content(%CMS.Post{id: id}, %Community{id: community_id})
   end
 
   def pin_content(_root, ~m(id community_id thread)a, _info) do
     do_pin_content(id, community_id, thread)
   end
 
-  def undo_pin_content(_root, ~m(id community_id topic)a, _info) do
-    CMS.undo_pin_content(%CMS.Post{id: id}, %Community{id: community_id}, topic)
+  def undo_pin_content(_root, ~m(id community_id)a, _info) do
+    CMS.undo_pin_content(%CMS.Post{id: id}, %Community{id: community_id})
   end
 
   def undo_pin_content(_root, ~m(id community_id thread)a, _info) do
@@ -251,10 +251,6 @@ defmodule GroupherServerWeb.Resolvers.CMS 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
-    CMS.set_refined_tag(%Community{id: community_id}, thread, topic, id)
-  end
-
   def set_refined_tag(_root, ~m(community_id thread id)a, _info) do
     CMS.set_refined_tag(%Community{id: community_id}, thread, id)
   end
@@ -263,10 +259,6 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.unset_tag(thread, %Tag{id: tag_id}, id)
   end
 
-  def unset_refined_tag(_root, ~m(community_id thread id topic)a, _info) do
-    CMS.unset_refined_tag(%Community{id: community_id}, thread, topic, id)
-  end
-
   def unset_refined_tag(_root, ~m(community_id thread id)a, _info) do
     CMS.unset_refined_tag(%Community{id: community_id}, thread, id)
   end
@@ -279,14 +271,6 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.get_tags(%Community{raw: community})
   end
 
-  def get_tags(_root, ~m(community_id thread topic)a, _info) do
-    CMS.get_tags(%Community{id: community_id}, thread, topic)
-  end
-
-  def get_tags(_root, ~m(community thread topic)a, _info) do
-    CMS.get_tags(%Community{raw: community}, thread, topic)
-  end
-
   def get_tags(_root, ~m(community_id thread)a, _info) do
     CMS.get_tags(%Community{id: community_id}, thread)
   end
@@ -295,6 +279,10 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.get_tags(%Community{raw: community}, thread)
   end
 
+  def get_tags(_root, ~m(community_id thread)a, _info) do
+    CMS.get_tags(%Community{id: community_id}, thread)
+  end
+
   def get_tags(_root, %{thread: _thread}, _info) do
     {:error, "community_id or community is needed"}
   end

lib/groupher_server_web/resolvers/cms_resolver.ex

@@ -226,8 +226,6 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
     pagination_args()
     article_filter_fields()
     field(:sort, :sort_enum)
-
-    field(:topic, :string)
   end
 
   @desc "job_filter doc"

lib/groupher_server_web/schema/cms/cms_misc.ex

@@ -154,7 +154,6 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
       arg(:community_id, :id)
       arg(:community, :string)
       arg(:thread, :cms_thread, default_value: :post)
-      arg(:topic, :string)
       arg(:all, :boolean, default_value: false)
 
       resolve(&R.CMS.get_tags/3)

lib/groupher_server_web/schema/cms/cms_queries.ex

@@ -42,7 +42,6 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:author, :user, resolve: dataloader(CMS, :author))
     field(:origial_community, :community, resolve: dataloader(CMS, :origial_community))
     field(:communities, list_of(:community), resolve: dataloader(CMS, :communities))
-    # field(:topic)
 
     field(:meta, :article_meta)
     field(:article_comments_participators, list_of(:user))
@@ -312,20 +311,13 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     timestamp_fields()
   end
 
-  object :topic do
-    field(:id, :id)
-    field(:title, :string)
-    field(:raw, :string)
-  end
-
   object :tag do
     field(:id, :id)
     field(:title, :string)
     field(:color, :string)
     field(:thread, :string)
     field(:author, :user, resolve: dataloader(CMS, :author))
     field(:community, :community, resolve: dataloader(CMS, :community))
-    field(:topic, :topic, resolve: dataloader(CMS, :topic))
 
     timestamp_fields()
   end

lib/groupher_server_web/schema/cms/cms_types.ex

@@ -132,7 +132,6 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Community do
       arg(:color, non_null(:rainbow_color_enum))
       arg(:community_id, non_null(:id))
       arg(:thread, :cms_thread, default_value: :post)
-      arg(:topic, :string, default_value: "posts")
 
       middleware(M.Authorize, :login)
       middleware(M.PassportLoader, source: :community)

lib/groupher_server_web/schema/cms/mutations/community.ex

@@ -98,7 +98,6 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Operation do
       arg(:id, non_null(:id))
       arg(:community_id, non_null(:id))
       arg(:thread, :cms_thread, default_value: :post)
-      arg(:topic, :string)
 
       middleware(M.Authorize, :login)
       middleware(M.PassportLoader, source: :community)
@@ -127,7 +126,6 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Operation do
       arg(:id, non_null(:id))
       arg(:community_id, non_null(:id))
       arg(:thread, :cms_thread, default_value: :post)
-      arg(:topic, :string)
 
       middleware(M.Authorize, :login)
       middleware(M.PassportLoader, source: :community)

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

@@ -15,13 +15,11 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Post do
       arg(:copy_right, :string)
       arg(:community_id, non_null(:id))
       arg(:thread, :cms_thread, default_value: :post)
-      arg(:topic, :string, default_value: "posts")
       arg(:tags, list_of(:ids))
       arg(:mention_users, list_of(:ids))
 
       middleware(M.Authorize, :login)
       # middleware(M.PublishThrottle)
-      middleware(M.AddSourceIcon)
       middleware(M.PublishThrottle, interval: 3, hour_limit: 15, day_limit: 30)
       resolve(&R.CMS.create_content/3)
       middleware(M.Statistics.MakeContribute, for: [:user, :community])
@@ -32,7 +30,6 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Post do
       arg(:id, non_null(:id))
       arg(:community_id, non_null(:id))
       arg(:thread, :post_thread, default_value: :post)
-      arg(:topic, :string, default_value: "posts")
 
       middleware(M.Authorize, :login)
       middleware(M.PassportLoader, source: :community)
@@ -45,7 +42,6 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Post do
       arg(:id, non_null(:id))
       arg(:thread, :post_thread, default_value: :post)
       arg(:community_id, non_null(:id))
-      arg(:topic, :string, default_value: "posts")
 
       middleware(M.Authorize, :login)
       middleware(M.PassportLoader, source: :community)

lib/groupher_server_web/schema/cms/mutations/post.ex

@@ -182,13 +182,6 @@ defmodule Helper.QueryBuilder do
           where: t.title == ^tag_name
         )
 
-      {:topic, topic}, queryable ->
-        from(
-          q in queryable,
-          join: t in assoc(q, :topics),
-          where: t.raw == ^topic
-        )
-
       {:category, catetory_raw}, queryable ->
         from(
           q in queryable,