refactor(pinned-article): add/alter is_pinned field

Author: mydearxym

lib/groupher_server/cms/article_comment.ex

@@ -20,7 +20,7 @@ defmodule GroupherServer.CMS.ArticleComment do
 
   @required_fields ~w(body_html author_id)a
   @optional_fields ~w(post_id job_id reply_to_id replies_count is_folded is_reported is_deleted floor is_article_author)a
-  @updatable_fields ~w(is_folded is_reported is_deleted floor upvotes_count is_pined)a
+  @updatable_fields ~w(is_folded is_reported is_deleted floor upvotes_count is_pinned)a
 
   @max_participator_count 5
   @max_parent_replies_count 3
@@ -66,7 +66,7 @@ defmodule GroupherServer.CMS.ArticleComment do
     field(:upvotes_count, :integer, default: 0)
 
     # 是否置顶
-    field(:is_pined, :boolean, default: false)
+    field(:is_pinned, :boolean, default: false)
 
     belongs_to(:author, Accounts.User, foreign_key: :author_id)
     belongs_to(:post, Post, foreign_key: :post_id)

lib/groupher_server/cms/delegates/article_comment.ex

@@ -46,7 +46,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
   def list_article_comments(thread, article_id, filters, mode, user \\ nil)
 
   def list_article_comments(thread, article_id, filters, :timeline, user) do
-    where_query = dynamic([c], not c.is_folded and not c.is_reported and not c.is_pined)
+    where_query = dynamic([c], not c.is_folded and not c.is_reported and not c.is_pinned)
     do_list_article_comment(thread, article_id, filters, where_query, user)
   end
 
@@ -57,19 +57,19 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     where_query =
       dynamic(
         [c],
-        is_nil(c.reply_to_id) and not c.is_folded and not c.is_reported and not c.is_pined
+        is_nil(c.reply_to_id) and not c.is_folded and not c.is_reported and not c.is_pinned
       )
 
     do_list_article_comment(thread, article_id, filters, where_query, user)
   end
 
   def list_folded_article_comments(thread, article_id, filters) do
-    where_query = dynamic([c], c.is_folded and not c.is_reported and not c.is_pined)
+    where_query = dynamic([c], c.is_folded and not c.is_reported and not c.is_pinned)
     do_list_article_comment(thread, article_id, filters, where_query, nil)
   end
 
   def list_folded_article_comments(thread, article_id, filters, user) do
-    where_query = dynamic([c], c.is_folded and not c.is_reported and not c.is_pined)
+    where_query = dynamic([c], c.is_folded and not c.is_reported and not c.is_pinned)
     do_list_article_comment(thread, article_id, filters, where_query, user)
   end
 
@@ -129,7 +129,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
         end
       end)
       |> Multi.run(:update_comment_flag, fn _, _ ->
-        ORM.update(comment, %{is_pined: true})
+        ORM.update(comment, %{is_pinned: true})
       end)
       |> Multi.run(:add_pined_comment, fn _, _ ->
         ArticlePinedComment
@@ -147,7 +147,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     with {:ok, comment} <- ORM.find(ArticleComment, comment_id) do
       Multi.new()
       |> Multi.run(:update_comment_flag, fn _, _ ->
-        ORM.update(comment, %{is_pined: false})
+        ORM.update(comment, %{is_pinned: false})
       end)
       |> Multi.run(:remove_pined_comment, fn _, _ ->
         ORM.findby_delete(ArticlePinedComment, %{article_comment_id: comment.id})

lib/groupher_server/cms/delegates/article_operation.ex

@@ -41,7 +41,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleOperation do
          {:ok, _} <- check_pinned_article_count(community_id, thread) do
       Multi.new()
       |> Multi.run(:update_article_pinned_flag, fn _, _ ->
-        # ORM.update(comment, %{is_pined: true})
+        # ORM.update(comment, %{is_pinned: true})
         {:ok, :pass}
       end)
       |> Multi.run(:create_pinned_article, fn _, _ ->

lib/groupher_server_web/schema/cms/cms_types.ex

@@ -362,7 +362,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:id, :id)
     field(:body_html, :string)
     field(:author, :user, resolve: dataloader(CMS, :author))
-    field(:is_pined, :boolean)
+    field(:is_pinned, :boolean)
     field(:floor, :integer)
     field(:upvotes_count, :integer)
     field(:emotions, :article_comment_emotions)

priv/repo/migrations/20210429065645_adjust_pin_field_on_articles.exs

@@ -0,0 +1,19 @@
+defmodule GroupherServer.Repo.Migrations.AdjustPinFieldOnArticles do
+  use Ecto.Migration
+
+  def change do
+    alter table(:cms_posts) do
+      add(:is_pinned, :boolean, default: false)
+    end
+
+    alter table(:cms_jobs) do
+      add(:is_pinned, :boolean, default: false)
+    end
+
+    alter table(:cms_repos) do
+      add(:is_pinned, :boolean, default: false)
+    end
+
+    rename(table(:articles_comments), :is_pined, to: :is_pinned)
+  end
+end

test/groupher_server/cms/article_comment_test.exs

@@ -223,12 +223,12 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
       {:ok, comment} = CMS.create_article_comment(:post, post.id, "commment", user)
       {:ok, comment} = ORM.find(ArticleComment, comment.id)
 
-      assert not comment.is_pined
+      assert not comment.is_pinned
 
       {:ok, comment} = CMS.pin_article_comment(comment.id)
       {:ok, comment} = ORM.find(ArticleComment, comment.id)
 
-      assert comment.is_pined
+      assert comment.is_pinned
 
       {:ok, pined_record} = ArticlePinedComment |> ORM.find_by(%{post_id: post.id})
       assert pined_record.post_id == post.id
@@ -240,7 +240,7 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
       {:ok, _comment} = CMS.pin_article_comment(comment.id)
       {:ok, comment} = CMS.undo_pin_article_comment(comment.id)
 
-      assert not comment.is_pined
+      assert not comment.is_pinned
       assert {:error, _} = ArticlePinedComment |> ORM.find_by(%{article_comment_id: comment.id})
     end
 

test/groupher_server_web/query/cms/article_comment_test.exs

@@ -68,7 +68,7 @@ defmodule GroupherServer.Test.Query.ArticleComment do
               id
               nickname
             }
-            isPined
+            isPinned
             floor
             upvotesCount