Merge branch 'enhance-create' into dev

Author: mydearxym

lib/helper/error_code.ex

@@ -23,6 +23,7 @@ defmodule Helper.ErrorCode do
   def ecode(:already_exsit), do: @default_base + 7
   def ecode(:update_fails), do: @default_base + 8
   def ecode(:delete_fails), do: @default_base + 9
+  def ecode(:create_fails), do: @default_base + 10
   # throttle
   def ecode(:throttle_inverval), do: @throttle_base + 1
   def ecode(:throttle_hour), do: @throttle_base + 2

lib/mastani_server/cms/delegates/article_curd.ex

@@ -1,15 +1,21 @@
 defmodule MastaniServer.CMS.Delegate.ArticleCURD do
+  @moduledoc """
+  CURD operation on post/job/video ...
+  """
   import Ecto.Query, warn: false
   import MastaniServer.CMS.Utils.Matcher
   import Helper.Utils, only: [done: 1]
+  import Helper.ErrorCode
   import ShortMaps
 
   alias MastaniServer.Accounts.User
-  alias MastaniServer.{Repo, CMS, Statistics}
-  alias MastaniServer.CMS.Delegate.ArticleOperation
+  alias MastaniServer.{CMS, Repo, Statistics}
+
+  alias CMS.Delegate.ArticleOperation
   alias Helper.{ORM, QueryBuilder}
 
-  alias CMS.{Author, Community}
+  alias CMS.{Author, Community, Tag}
+  alias Ecto.Multi
 
   @doc """
   get paged post / job ...
@@ -66,15 +72,62 @@ defmodule MastaniServer.CMS.Delegate.ArticleCURD do
   def create_content(%Community{id: community_id}, thread, attrs, %User{id: user_id}) do
     with {:ok, author} <- ensure_author_exists(%User{id: user_id}),
          {:ok, action} <- match_action(thread, :community),
-         {:ok, community} <- ORM.find(Community, community_id),
-         {:ok, content} <-
-           action.target
-           |> struct()
-           |> action.target.changeset(attrs)
-           |> Ecto.Changeset.put_change(:author_id, author.id)
-           |> Repo.insert() do
-      Statistics.log_publish_action(%User{id: user_id})
-      ArticleOperation.set_community(community, thread, content.id)
+         {:ok, community} <- ORM.find(Community, community_id) do
+      Multi.new()
+      |> Multi.run(:add_content_author, fn _ ->
+        action.target
+        |> struct()
+        |> action.target.changeset(attrs)
+        |> Ecto.Changeset.put_change(:author_id, author.id)
+        |> Repo.insert()
+      end)
+      |> Multi.run(:set_community, fn %{add_content_author: content} ->
+        ArticleOperation.set_community(community, thread, content.id)
+      end)
+      |> Multi.run(:set_tag, fn %{add_content_author: content} ->
+        case attrs |> Map.has_key?(:tags) do
+          true -> set_tags(community, thread, content.id, attrs.tags)
+          false -> {:ok, "pass"}
+        end
+      end)
+      |> Multi.run(:log_action, fn _ ->
+        Statistics.log_publish_action(%User{id: user_id})
+      end)
+      |> Repo.transaction()
+      |> create_content_result()
+    end
+  end
+
+  defp create_content_result({:ok, %{add_content_author: result}}), do: {:ok, result}
+
+  defp create_content_result({:error, :add_content_author, _result, _steps}) do
+    {:error, [message: "assign author", code: ecode(:create_fails)]}
+  end
+
+  defp create_content_result({:error, :set_community, _result, _steps}) do
+    {:error, [message: "set community", code: ecode(:create_fails)]}
+  end
+
+  defp create_content_result({:error, :set_tag, result, _steps}) do
+    {:error, result}
+  end
+
+  defp create_content_result({:error, :log_action, result, _steps}) do
+    {:error, [message: "log action", code: ecode(:create_fails)]}
+  end
+
+  # if empty just pass
+  defp set_tags(community, thread, content_id, []), do: {:ok, "pass"}
+
+  defp set_tags(community, thread, content_id, tags) do
+    try do
+      Enum.each(tags, fn tag ->
+        {:ok, _} = ArticleOperation.set_tag(community, thread, %Tag{id: tag.id}, content_id)
+      end)
+
+      {:ok, "psss"}
+    rescue
+      _ -> {:error, [message: "set tag", code: ecode(:create_fails)]}
     end
   end
 

lib/mastani_server/cms/delegates/article_operation.ex

@@ -53,16 +53,22 @@ defmodule MastaniServer.CMS.Delegate.ArticleOperation 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
-      case tag_in_community_thread?(%Community{id: communitId}, thread, tag) do
-        true ->
-          content
-          |> Ecto.Changeset.change()
-          |> Ecto.Changeset.put_assoc(:tags, content.tags ++ [tag])
-          |> Repo.update()
+      content
+      |> Ecto.Changeset.change()
+      |> Ecto.Changeset.put_assoc(:tags, content.tags ++ [tag])
+      |> Repo.update()
+
+      # NOTE: this should be control by Middleware
+      # case tag_in_community_thread?(%Community{id: communitId}, thread, tag) do
+      # true ->
+      # content
+      # |> Ecto.Changeset.change()
+      # |> Ecto.Changeset.put_assoc(:tags, content.tags ++ [tag])
+      # |> Repo.update()
 
-        _ ->
-          {:error, message: "Tag,Community,Thread not match", code: ecode(:custom)}
-      end
+      # _ ->
+      # {:error, message: "Tag,Community,Thread not match", code: ecode(:custom)}
+      # end
     end
   end
 

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

@@ -19,6 +19,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Job do
       arg(:link_source, :string)
 
       arg(:thread, :cms_thread, default_value: :job)
+      arg(:tags, list_of(:ids))
 
       middleware(M.Authorize, :login)
       resolve(&R.CMS.create_content/3)

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

@@ -14,6 +14,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Post do
       arg(:link_addr, :string)
       arg(:community_id, non_null(:id))
       arg(:thread, :cms_thread, default_value: :post)
+      arg(:tags, list_of(:ids))
 
       middleware(M.Authorize, :login)
       middleware(M.PublishThrottle)

lib/mastani_server_web/schema/utils/common_types.ex

@@ -1,4 +1,7 @@
 defmodule MastaniServerWeb.Schema.Utils.CommonTypes do
+  @moduledoc """
+  common types might be used in all context
+  """
   import MastaniServerWeb.Schema.Utils.Helper
 
   use Absinthe.Schema.Notation
@@ -13,6 +16,10 @@ defmodule MastaniServerWeb.Schema.Utils.CommonTypes do
     field(:done, :boolean)
   end
 
+  input_object :ids do
+    field(:id, :id)
+  end
+
   input_object :common_paged_filter do
     pagination_args()
   end

test/mastani_server/accounts/accounts_test.exs

@@ -89,7 +89,6 @@ defmodule MastaniServer.Test.Accounts do
   describe "[github login]" do
     alias Accounts.{GithubUser, User}
 
-    @tag :wip
     test "register a valid github user with non-exist in db" do
       assert {:error, _} =
                ORM.find_by(GithubUser, github_id: to_string(@valid_github_profile["id"]))

test/mastani_server/cms/job_test.exs

@@ -24,6 +24,30 @@ defmodule MastaniServer.Test.Job do
       assert found.title == job.title
     end
 
+    test "can create job with exsited tags", ~m(user community job_attrs)a do
+      {:ok, tag1} = db_insert(:tag)
+      {:ok, tag2} = db_insert(:tag)
+
+      job_with_tags = Map.merge(job_attrs, %{tags: [%{id: tag1.id}, %{id: tag2.id}]})
+
+      {:ok, created} = CMS.create_content(community, :job, job_with_tags, user)
+      {:ok, found} = ORM.find(CMS.Job, created.id, preload: :tags)
+
+      assert found.tags |> Enum.any?(&(&1.id == tag1.id))
+      assert found.tags |> Enum.any?(&(&1.id == tag2.id))
+    end
+
+    test "create job with invalid tags fails", ~m(user community job_attrs)a do
+      {:ok, tag1} = db_insert(:tag)
+      {:ok, tag2} = db_insert(:tag)
+
+      job_with_tags =
+        Map.merge(job_attrs, %{tags: [%{id: tag1.id}, %{id: tag2.id}, %{id: non_exsit_id()}]})
+
+      {:error, _} = CMS.create_content(community, :job, job_with_tags, user)
+      {:error, _} = ORM.find_by(CMS.Job, %{title: job_attrs.title})
+    end
+
     test "create job with an exsit community fails", ~m(user)a do
       invalid_attrs = mock_attrs(:job, %{community_id: non_exsit_id()})
       ivalid_community = %Community{id: non_exsit_id()}

test/mastani_server/cms/post_test.exs

@@ -25,6 +25,30 @@ defmodule MastaniServer.Test.Post do
       assert post.title == post_attrs.title
     end
 
+    test "can create post with exsited tags", ~m(user community post_attrs)a do
+      {:ok, tag1} = db_insert(:tag)
+      {:ok, tag2} = db_insert(:tag)
+
+      post_with_tags = Map.merge(post_attrs, %{tags: [%{id: tag1.id}, %{id: tag2.id}]})
+
+      {:ok, created} = CMS.create_content(community, :post, post_with_tags, user)
+      {:ok, found} = ORM.find(CMS.Post, created.id, preload: :tags)
+
+      assert found.tags |> Enum.any?(&(&1.id == tag1.id))
+      assert found.tags |> Enum.any?(&(&1.id == tag2.id))
+    end
+
+    test "create post with invalid tags fails", ~m(user community post_attrs)a do
+      {:ok, tag1} = db_insert(:tag)
+      {:ok, tag2} = db_insert(:tag)
+
+      post_with_tags =
+        Map.merge(post_attrs, %{tags: [%{id: tag1.id}, %{id: tag2.id}, %{id: non_exsit_id()}]})
+
+      {:error, _} = CMS.create_content(community, :post, post_with_tags, user)
+      {:error, _} = ORM.find_by(CMS.Post, %{title: post_attrs.title})
+    end
+
     test "add user to cms authors, if the user is not exsit in cms authors",
          ~m(user community post_attrs)a do
       assert {:error, _} = ORM.find_by(Author, user_id: user.id)

test/mastani_server_web/mutation/cms/job_test.exs

@@ -25,7 +25,8 @@ defmodule MastaniServer.Test.Mutation.Job do
       $communityId: ID!,
       $company: String!,
       $companyLogo: String!
-      $location: String!
+      $location: String!,
+      $tags: [Ids]
       ){
       createJob(
         title: $title,
@@ -35,7 +36,8 @@ defmodule MastaniServer.Test.Mutation.Job do
         communityId: $communityId,
         company: $company,
         companyLogo: $companyLogo,
-        location: $location
+        location: $location,
+        tags: $tags
         ) {
           id
           title
@@ -64,6 +66,29 @@ defmodule MastaniServer.Test.Mutation.Job do
       assert created["id"] == to_string(found.id)
     end
 
+    test "can create job with tags" do
+      {:ok, user} = db_insert(:user)
+      user_conn = simu_conn(:user, user)
+
+      {:ok, community} = db_insert(:community)
+      {:ok, tag1} = db_insert(:tag)
+      {:ok, tag2} = db_insert(:tag)
+
+      job_attr = mock_attrs(:job)
+
+      variables =
+        job_attr
+        |> Map.merge(%{communityId: community.id})
+        |> Map.merge(%{companyLogo: job_attr.company_logo})
+        |> Map.merge(%{tags: [%{id: tag1.id}, %{id: tag2.id}]})
+
+      created = user_conn |> mutation_result(@create_job_query, variables, "createJob")
+      {:ok, job} = ORM.find(CMS.Job, created["id"], preload: :tags)
+
+      assert job.tags |> Enum.any?(&(&1.id == tag1.id))
+      assert job.tags |> Enum.any?(&(&1.id == tag2.id))
+    end
+
     @query """
     mutation($id: ID!, $title: String, $body: String){
       updateJob(id: $id, title: $title, body: $body) {
@@ -183,16 +208,17 @@ defmodule MastaniServer.Test.Mutation.Job do
       # assert tag.id in assoc_tags
     end
 
-    test "auth user set a invalid tag to job fails", ~m(job)a do
-      {:ok, community} = db_insert(:community)
-      {:ok, tag} = db_insert(:tag, %{thread: "job"})
+    # TODO: should fix in auth layer
+    # test "auth user set a other community's tag to job fails", ~m(job)a do
+    # {:ok, community} = db_insert(:community)
+    # {:ok, tag} = db_insert(:tag, %{thread: "job"})
 
-      passport_rules = %{community.title => %{"job.tag.set" => true}}
-      rule_conn = simu_conn(:user, cms: passport_rules)
+    # passport_rules = %{community.title => %{"job.tag.set" => true}}
+    # rule_conn = simu_conn(:user, cms: passport_rules)
 
-      variables = %{thread: "JOB", id: job.id, tagId: tag.id, communityId: community.id}
-      assert rule_conn |> mutation_get_error?(@set_tag_query, variables, ecode(:custom))
-    end
+    # variables = %{thread: "JOB", id: job.id, tagId: tag.id, communityId: community.id}
+    # assert rule_conn |> mutation_get_error?(@set_tag_query, variables, ecode(:custom))
+    # end
 
     test "can set multi tag to a job", ~m(job)a do
       {:ok, community} = db_insert(:community)