refactor(pinned-article): undo pin article

Author: mydearxym

lib/groupher_server/cms/cms.ex

@@ -87,6 +87,7 @@ defmodule GroupherServer.CMS do
   # >> set flag on article, like: pin / unpin article
   defdelegate set_community_flags(community_info, queryable, attrs), to: ArticleOperation
   defdelegate pin_article(thread, id, community_id), to: ArticleOperation
+  defdelegate undo_pin_article(thread, id, community_id), to: ArticleOperation
   defdelegate pin_content(queryable, community_id), to: ArticleOperation
   defdelegate undo_pin_content(queryable, community_id), to: ArticleOperation
 

lib/groupher_server/cms/delegates/article_operation.ex

@@ -30,34 +30,39 @@ defmodule GroupherServer.CMS.Delegate.ArticleOperation do
   alias GroupherServer.CMS.Repo, as: CMSRepo
   alias GroupherServer.Repo
 
-  alias Ecto.Multi
-
   @max_pinned_article_count_per_thread Community.max_pinned_article_count_per_thread()
 
   @spec pin_article(T.article_thread(), Integer.t(), Integer.t()) :: {:ok, PinnedArticle.t()}
   def pin_article(thread, article_id, community_id) do
     with {:ok, info} <- match(thread),
          {:ok, community} <- ORM.find(Community, community_id),
-         {:ok, _} <- check_pinned_article_count(community_id, thread) do
-      Multi.new()
-      |> Multi.run(:update_article_pinned_flag, fn _, _ ->
-        # ORM.update(comment, %{is_pinned: true})
-        {:ok, :pass}
-      end)
-      |> Multi.run(:create_pinned_article, fn _, _ ->
-        thread_upcase = thread |> to_string |> String.upcase()
-
-        args =
-          Map.put(
-            %{community_id: community.id, thread: thread_upcase},
-            info.foreign_key,
-            article_id
-          )
-
-        PinnedArticle |> ORM.create(args)
-      end)
-      |> Repo.transaction()
-      |> create_pinned_article_result()
+         {:ok, _} <- check_pinned_article_count(community.id, thread) do
+      thread_upcase = thread |> to_string |> String.upcase()
+
+      args =
+        Map.put(
+          %{community_id: community.id, thread: thread_upcase},
+          info.foreign_key,
+          article_id
+        )
+
+      PinnedArticle |> ORM.create(args)
+    end
+  end
+
+  @spec undo_pin_article(T.article_thread(), Integer.t(), Integer.t()) :: {:ok, PinnedArticle.t()}
+  def undo_pin_article(thread, article_id, community_id) do
+    with {:ok, info} <- match(thread) do
+      thread_upcase = thread |> to_string |> String.upcase()
+
+      args =
+        Map.put(
+          %{community_id: community_id, thread: thread_upcase},
+          info.foreign_key,
+          article_id
+        )
+
+      ORM.findby_delete(PinnedArticle, args)
     end
   end
 
@@ -306,10 +311,4 @@ defmodule GroupherServer.CMS.Delegate.ArticleOperation do
       _ -> {:ok, :pass}
     end
   end
-
-  defp create_pinned_article_result({:ok, %{create_pinned_article: result}}), do: {:ok, result}
-
-  defp create_pinned_article_result({:error, _, result, _steps}) do
-    {:error, result}
-  end
 end

test/groupher_server/cms/article_pin_test.exs

@@ -1,4 +1,6 @@
 defmodule GroupherServer.Test.CMS.ArticlePin do
+  @moduledoc false
+
   use GroupherServer.TestTools
 
   alias Helper.ORM
@@ -52,13 +54,15 @@ defmodule GroupherServer.Test.CMS.ArticlePin do
       assert {:error, _} = CMS.pin_article(:post, 8848, community.id)
     end
 
-    # test "can undo pin to a post", ~m(community post)a do
-    #   {:ok, pined_post} = CMS.pin_content(post, community)
-    #   assert pined_post.id == post.id
+    @tag :wip2
+    test "can undo pin to a post", ~m(community post)a do
+      {:ok, _} = CMS.pin_article(:post, post.id, community.id)
 
-    #   assert {:ok, unpined} = CMS.undo_pin_content(post, community)
-    #   assert unpined.id == post.id
-    # end
+      assert {:ok, unpinned} = CMS.undo_pin_article(:post, post.id, community.id)
+      assert unpinned.post_id == post.id
+
+      assert {:error, _} = ORM.find_by(PinnedArticle, %{post_id: post.id})
+    end
   end
 
   # describe "[cms job pin]" do