refactor: more tests on pin/trash system

Author: mydearxym

lib/helper/certification.ex

@@ -87,12 +87,27 @@ defmodule Helper.Certification do
         "post.tag.delete",
         "post.tag.set",
         "post.tag.unset",
+        # post flag
+        "post.pin",
+        "post.undo_pin",
+        "post.trash",
+        "post.undo_trash",
         # job tag
         "job.tag.create",
         "job.tag.update",
         "job.tag.delete",
         "job.tag.set",
-        "job.tag.unset"
+        "job.tag.unset",
+        # job flag
+        "job.pin",
+        "job.undo_pin",
+        "job.trash",
+        "job.undo_trash",
+        # video flag
+        "video.pin",
+        "video.undo_pin",
+        "video.trash",
+        "video.undo_trash"
       ]
     }
   end

lib/mastani_server/cms/delegates/article_operation.ex

@@ -12,7 +12,6 @@ defmodule MastaniServer.CMS.Delegate.ArticleOperation do
 
   alias MastaniServer.CMS.{
     Community,
-    PinState,
     Post,
     PostCommunityFlag,
     Job,
@@ -99,7 +98,7 @@ defmodule MastaniServer.CMS.Delegate.ArticleOperation do
   set tag for post / tuts / videos ...
   """
   # check community first
-  def set_tag(%Community{id: communitId}, thread, %Tag{id: tag_id}, content_id) do
+  def set_tag(%Community{id: _communitId}, 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/repo.ex

@@ -7,7 +7,7 @@ defmodule MastaniServer.CMS.Repo do
   alias MastaniServer.CMS.{Author, Community, RepoBuilder, RepoCommunityFlag, Tag}
 
   @required_fields ~w(repo_name desc readme language producer producer_link repo_link repo_star_count repo_fork_count repo_watch_count)a
-  @optional_fields ~w(views pin trash last_fetch_time)
+  @optional_fields ~w(views last_fetch_time)
 
   @type t :: %Repo{}
   schema "cms_repos" do

lib/mastani_server/cms/utils/matcher.ex

@@ -62,10 +62,14 @@ defmodule MastaniServer.CMS.Utils.Matcher do
     do: {:ok, %{target: PostComment, reactor: PostCommentDislike}}
 
   # videos ...
+  def match_action(:video, :self), do: {:ok, %{target: Video, reactor: Video, preload: :author}}
+
   def match_action(:video, :community),
     do: {:ok, %{target: Video, reactor: Community, flag: VideoCommunityFlag}}
 
   # repos ...
+  def match_action(:repo, :self), do: {:ok, %{target: Repo, reactor: Repo, preload: :author}}
+
   def match_action(:repo, :community),
     do: {:ok, %{target: Repo, reactor: Community, flag: RepoCommunityFlag}}
 

lib/mastani_server/cms/video.ex

@@ -7,7 +7,7 @@ defmodule MastaniServer.CMS.Video do
   alias MastaniServer.CMS.{Author, Community, VideoCommunityFlag, Tag}
 
   @required_fields ~w(title poster desc duration duration_sec source)a
-  @optional_fields ~w(link original_author original_author_link publish_at pin trash)
+  @optional_fields ~w(link original_author original_author_link publish_at)
 
   @type t :: %Video{}
   schema "cms_videos" do

lib/mastani_server_web/schema/cms/cms_types.ex

@@ -235,6 +235,8 @@ defmodule MastaniServerWeb.Schema.CMS.Types do
     field(:original_author_link, :string)
     field(:views, :integer)
 
+    field(:pin, :boolean)
+    field(:trash, :boolean)
     # TODO: remove
     # field(:pin, :boolean)
     # field(:trash, :boolean)
@@ -263,6 +265,8 @@ defmodule MastaniServerWeb.Schema.CMS.Types do
     field(:repo_watch_count, :integer)
     field(:views, :integer)
 
+    field(:pin, :boolean)
+    field(:trash, :boolean)
     # TODO: remove
     # field(:pin, :boolean)
     # field(:trash, :boolean)
@@ -287,6 +291,9 @@ defmodule MastaniServerWeb.Schema.CMS.Types do
     field(:body, :string)
     field(:views, :integer)
 
+    field(:pin, :boolean)
+    field(:trash, :boolean)
+
     field(:author, :user, resolve: dataloader(CMS, :author))
     field(:tags, list_of(:tag), resolve: dataloader(CMS, :tags))
     field(:communities, list_of(:community), resolve: dataloader(CMS, :communities))

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

@@ -25,6 +25,56 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Job do
       resolve(&R.CMS.create_content/3)
     end
 
+    @desc "pin a job"
+    field :pin_job, :job do
+      arg(:id, non_null(:id))
+      arg(:type, :job_type, default_value: :job)
+      arg(:community_id, non_null(:id))
+
+      middleware(M.Authorize, :login)
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->job.pin")
+      resolve(&R.CMS.pin_content/3)
+    end
+
+    @desc "unpin a job"
+    field :undo_pin_job, :job do
+      arg(:id, non_null(:id))
+      arg(:type, :job_type, default_value: :job)
+      arg(:community_id, non_null(:id))
+
+      middleware(M.Authorize, :login)
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->job.undo_pin")
+      resolve(&R.CMS.undo_pin_content/3)
+    end
+
+    @desc "trash a job, not delete"
+    field :trash_job, :job do
+      arg(:id, non_null(:id))
+      arg(:type, :job_type, default_value: :job)
+      arg(:community_id, non_null(:id))
+
+      middleware(M.Authorize, :login)
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->job.trash")
+
+      resolve(&R.CMS.trash_content/3)
+    end
+
+    @desc "trash a job, not delete"
+    field :undo_trash_job, :job do
+      arg(:id, non_null(:id))
+      arg(:type, :job_type, default_value: :job)
+      arg(:community_id, non_null(:id))
+
+      middleware(M.Authorize, :login)
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->job.undo_trash")
+
+      resolve(&R.CMS.undo_trash_content/3)
+    end
+
     @desc "delete a job"
     field :delete_job, :job do
       arg(:id, non_null(:id))

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

@@ -29,7 +29,8 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Post do
       arg(:community_id, non_null(:id))
 
       middleware(M.Authorize, :login)
-      middleware(M.Passport, claim: "cms->post.pin")
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->post.pin")
       resolve(&R.CMS.pin_content/3)
     end
 
@@ -40,7 +41,8 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Post do
       arg(:community_id, non_null(:id))
 
       middleware(M.Authorize, :login)
-      middleware(M.Passport, claim: "cms->post.undo_pin")
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->post.undo_pin")
       resolve(&R.CMS.undo_pin_content/3)
     end
 
@@ -51,7 +53,8 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Post do
       arg(:community_id, non_null(:id))
 
       middleware(M.Authorize, :login)
-      middleware(M.Passport, claim: "cms->post.trash")
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->post.trash")
 
       resolve(&R.CMS.trash_content/3)
     end
@@ -63,7 +66,8 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Post do
       arg(:community_id, non_null(:id))
 
       middleware(M.Authorize, :login)
-      middleware(M.Passport, claim: "cms->post.undo_trash")
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->post.undo_trash")
 
       resolve(&R.CMS.undo_trash_content/3)
     end

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

@@ -26,29 +26,35 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Video do
     field :pin_video, :video do
       arg(:id, non_null(:id))
       arg(:type, :video_type, default_value: :video)
+      arg(:community_id, non_null(:id))
 
       middleware(M.Authorize, :login)
-      middleware(M.Passport, claim: "cms->video.pin")
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->video.pin")
       resolve(&R.CMS.pin_content/3)
     end
 
     @desc "unpin a video"
     field :undo_pin_video, :video do
       arg(:id, non_null(:id))
       arg(:type, :video_type, default_value: :video)
+      arg(:community_id, non_null(:id))
 
       middleware(M.Authorize, :login)
-      middleware(M.Passport, claim: "cms->video.undo_pin")
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->video.undo_pin")
       resolve(&R.CMS.undo_pin_content/3)
     end
 
     @desc "trash a video, not delete"
     field :trash_video, :video do
       arg(:id, non_null(:id))
       arg(:type, :video_type, default_value: :video)
+      arg(:community_id, non_null(:id))
 
       middleware(M.Authorize, :login)
-      middleware(M.Passport, claim: "cms->video.trash")
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->video.trash")
 
       resolve(&R.CMS.trash_content/3)
     end
@@ -57,9 +63,11 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Video do
     field :undo_trash_video, :video do
       arg(:id, non_null(:id))
       arg(:type, :video_type, default_value: :video)
+      arg(:community_id, non_null(:id))
 
       middleware(M.Authorize, :login)
-      middleware(M.Passport, claim: "cms->video.undo_trash")
+      middleware(M.PassportLoader, source: :community)
+      middleware(M.Passport, claim: "cms->c?->video.undo_trash")
 
       resolve(&R.CMS.undo_trash_content/3)
     end

test/mastani_server/cms/content_flag_test.exs

@@ -3,52 +3,109 @@ defmodule MastaniServer.Test.ContentFlags do
 
   alias MastaniServer.CMS
 
-  # alias CMS.{Post, PostCommunityFlag, Repo, Video}
-  alias CMS.{Post, PostCommunityFlag}
+  alias CMS.{
+    Post,
+    PostCommunityFlag,
+    Repo,
+    RepoCommunityFlag,
+    Job,
+    JobCommunityFlag,
+    Video,
+    VideoCommunityFlag
+  }
+
   alias Helper.ORM
 
   setup do
     {:ok, user} = db_insert(:user)
-    {:ok, post} = db_insert(:post)
-    {:ok, video} = db_insert(:video)
-    {:ok, repo} = db_insert(:repo)
+    {:ok, community} = db_insert(:community)
+
+    {:ok, post} = CMS.create_content(community, :post, mock_attrs(:post), user)
+    {:ok, job} = CMS.create_content(community, :job, mock_attrs(:job), user)
+    {:ok, video} = CMS.create_content(community, :video, mock_attrs(:video), user)
+    {:ok, repo} = CMS.create_content(community, :repo, mock_attrs(:repo), user)
 
-    {:ok, ~m(user post video repo)a}
+    {:ok, ~m(user community post job video repo)a}
   end
 
   describe "[cms post flag]" do
-    test "user can set pin flag on post based on community", ~m(post)a do
-      community1_id = post.communities |> List.first() |> Map.get(:id)
-      CMS.set_community_flags(%Post{id: post.id}, community1_id, %{pin: true})
+    test "user can set pin/trash flag on post based on community", ~m(community post)a do
+      community_id = community.id
+      post_id = post.id
+      {:ok, found} = PostCommunityFlag |> ORM.find_by(~m(post_id community_id)a)
+      assert found.pin == false
+      assert found.trash == false
 
-      {:ok, found} =
-        ORM.find_by(PostCommunityFlag, %{post_id: post.id, community_id: community1_id})
+      CMS.set_community_flags(%Post{id: post.id}, community.id, %{pin: true, trash: true})
+
+      {:ok, found} = PostCommunityFlag |> ORM.find_by(~m(post_id community_id)a)
 
       assert found.pin == true
+      assert found.trash == true
       assert found.post_id == post.id
-      assert found.community_id == community1_id
+      assert found.community_id == community.id
     end
 
     # TODO: set twice .. staff
   end
 
-  # describe "[cms video flag]" do
-  # test "user can set pin flag on a video", ~m(user video)a do
-  # true
-  # end
-
-  # test "user can set trash flag on a video", ~m(user video)a do
-  # true
-  # end
-  # end
-
-  # describe "[cms repo flag]" do
-  # test "user can set pin flag on a repo", ~m(user repo)a do
-  # true
-  # end
-
-  # test "user can set trash flag on a repo", ~m(user repo)a do
-  # true
-  # end
-  # end
+  describe "[cms job flag]" do
+    test "user can set pin/trash flag on job", ~m(community job)a do
+      community_id = community.id
+      job_id = job.id
+
+      {:ok, found} = JobCommunityFlag |> ORM.find_by(~m(job_id community_id)a)
+      assert found.pin == false
+      assert found.trash == false
+
+      CMS.set_community_flags(%Job{id: job.id}, community.id, %{pin: true, trash: true})
+
+      {:ok, found} = JobCommunityFlag |> ORM.find_by(~m(job_id community_id)a)
+
+      assert found.pin == true
+      assert found.trash == true
+      assert found.job_id == job.id
+      assert found.community_id == community.id
+    end
+  end
+
+  describe "[cms video flag]" do
+    test "user can set pin/trash flag on a video", ~m(community video)a do
+      community_id = community.id
+      video_id = video.id
+
+      {:ok, found} = VideoCommunityFlag |> ORM.find_by(~m(video_id community_id)a)
+      assert found.pin == false
+      assert found.trash == false
+
+      CMS.set_community_flags(%Video{id: video.id}, community.id, %{pin: true, trash: true})
+
+      {:ok, found} = VideoCommunityFlag |> ORM.find_by(~m(video_id community_id)a)
+
+      assert found.pin == true
+      assert found.trash == true
+      assert found.video_id == video.id
+      assert found.community_id == community.id
+    end
+  end
+
+  describe "[cms repo flag]" do
+    test "user can set pin/trash flag on repo", ~m(community repo)a do
+      community_id = community.id
+      repo_id = repo.id
+
+      {:ok, found} = RepoCommunityFlag |> ORM.find_by(~m(repo_id community_id)a)
+      assert found.pin == false
+      assert found.trash == false
+
+      CMS.set_community_flags(%Repo{id: repo.id}, community.id, %{pin: true, trash: true})
+
+      {:ok, found} = RepoCommunityFlag |> ORM.find_by(~m(repo_id community_id)a)
+
+      assert found.pin == true
+      assert found.trash == true
+      assert found.repo_id == repo.id
+      assert found.community_id == community.id
+    end
+  end
 end