refactor(mailbox): mark read test & re-org

Author: mydearxym

lib/groupher_server/accounts/accounts.ex

@@ -64,6 +64,8 @@ defmodule GroupherServer.Accounts do
 
   defdelegate mailbox_status(user), to: Mailbox
   defdelegate update_mailbox_status(user_id), to: Mailbox
+  defdelegate mark_read(type, ids, user_id), to: Mailbox
+  defdelegate mark_read_all(tyoe, user_id), to: Mailbox
 
   # customization
   defdelegate get_customization(user), to: Customization

lib/groupher_server/accounts/delegates/mailbox.ex

@@ -13,6 +13,12 @@ defmodule GroupherServer.Accounts.Delegate.Mailbox do
   def mailbox_status(%User{mailbox: nil}), do: @default_mailbox_status |> done
   def mailbox_status(%User{mailbox: mailbox}), do: mailbox |> done
 
+  def mark_read(type, ids, %User{} = user) do
+    Delivery.mark_read(type, ids, user)
+  end
+
+  def mark_read_all(type, %User{} = user), do: Delivery.mark_read_all(type, user)
+
   @doc "update messages count in mailbox"
   def update_mailbox_status(user_id) do
     with {:ok, user} <- ORM.find(User, user_id),

lib/groupher_server/delivery/delegates/notification.ex

@@ -78,11 +78,11 @@ defmodule GroupherServer.Delivery.Delegate.Notification do
     end
   end
 
-  def paged_notifications(user_id, %{page: page, size: size} = filter) do
+  def paged_notifications(%User{} = user, %{page: page, size: size} = filter) do
     read = Map.get(filter, :read, false)
 
     Notification
-    |> where([n], n.user_id == ^user_id and n.read == ^read)
+    |> where([n], n.user_id == ^user.id and n.read == ^read)
     |> ORM.paginater(~m(page size)a)
     |> done
   end

lib/groupher_server_web/resolvers/accounts_resolver.ex

@@ -220,39 +220,20 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
     Accounts.paged_editable_communities(cur_user, filter)
   end
 
+  # mailbox
   def mailbox_status(_root, _args, %{context: %{cur_user: cur_user}}) do
     Accounts.mailbox_status(cur_user)
   end
 
-  # mentions
-  def fetch_mentions(_root, %{filter: filter}, %{context: %{cur_user: cur_user}}) do
-    Accounts.fetch_mentions(cur_user, filter)
+  def mark_read(_root, ~m(type ids)a, %{context: %{cur_user: cur_user}}) do
+    Accounts.mark_read(type, ids, cur_user)
   end
 
-  def mark_mention_read(_root, %{id: id}, %{context: %{cur_user: cur_user}}) do
-    Accounts.mark_mail_read(%MentionMail{id: id}, cur_user)
+  def mark_read_all(_root, ~m(type)a, %{context: %{cur_user: cur_user}}) do
+    Accounts.mark_read_all(type, cur_user)
   end
 
-  def mark_mention_read_all(_root, _args, %{context: %{cur_user: cur_user}}) do
-    Accounts.mark_mail_read_all(cur_user, :mention)
-  end
-
-  # notification
-  def fetch_notifications(_root, %{filter: filter}, %{context: %{cur_user: cur_user}}) do
-    Accounts.fetch_notifications(cur_user, filter)
-  end
-
-  def mark_notification_read(_root, %{id: id}, %{context: %{cur_user: cur_user}}) do
-    Accounts.mark_mail_read(%NotificationMail{id: id}, cur_user)
-  end
-
-  def mark_notification_read_all(_root, _args, %{context: %{cur_user: cur_user}}) do
-    Accounts.mark_mail_read_all(cur_user, :notification)
-  end
-
-  def mark_sys_notification_read(_root, %{id: id}, %{context: %{cur_user: cur_user}}) do
-    Accounts.mark_mail_read(%SysNotificationMail{id: id}, cur_user)
-  end
+  # mailbox end
 
   # for check other users subscribed_communities
   def subscribed_communities(_root, %{login: login, filter: filter}, _info) do

lib/groupher_server_web/schema/account/account_mutations.ex

@@ -23,15 +23,15 @@ defmodule GroupherServerWeb.Schema.Account.Mutations do
       resolve(&R.Accounts.github_signin/3)
     end
 
-    @doc "follow a user"
+    @desc "follow a user"
     field :follow, :user do
       arg(:login, non_null(:string))
 
       middleware(M.Authorize, :login)
       resolve(&R.Accounts.follow/3)
     end
 
-    @doc "undo follow to a user"
+    @desc "unfollow a user"
     field :undo_follow, :user do
       arg(:login, non_null(:string))
 
@@ -97,40 +97,13 @@ defmodule GroupherServerWeb.Schema.Account.Mutations do
       resolve(&R.Accounts.set_customization/3)
     end
 
-    @desc "mark a mention as read"
-    field :mark_mention_read, :status do
-      arg(:id, non_null(:id))
-
-      middleware(M.Authorize, :login)
-      resolve(&R.Accounts.mark_mention_read/3)
-    end
-
-    @desc "mark a all unread mention as read"
-    field :mark_mention_read_all, :status do
-      middleware(M.Authorize, :login)
-      resolve(&R.Accounts.mark_mention_read_all/3)
-    end
-
-    @desc "mark a notification as read"
-    field :mark_notification_read, :status do
-      arg(:id, non_null(:id))
-
-      middleware(M.Authorize, :login)
-      resolve(&R.Accounts.mark_notification_read/3)
-    end
-
-    @desc "mark a all unread notifications as read"
-    field :mark_notification_read_all, :status do
-      middleware(M.Authorize, :login)
-      resolve(&R.Accounts.mark_notification_read_all/3)
-    end
-
-    @desc "mark a system notification as read"
-    field :mark_sys_notification_read, :status do
-      arg(:id, non_null(:id))
+    @desc "mark a message as read"
+    field :mark_read, :done do
+      arg(:ids, list_of(:id))
+      arg(:type, :mailbox_type, default_value: :mention)
 
       middleware(M.Authorize, :login)
-      resolve(&R.Accounts.mark_sys_notification_read/3)
+      resolve(&R.Accounts.mark_read/3)
     end
   end
 end

lib/groupher_server_web/schema/account/account_types.ex

@@ -199,4 +199,9 @@ defmodule GroupherServerWeb.Schema.Account.Types do
     field(:entries, list_of(:user))
     pagination_fields()
   end
+
+  enum :mailbox_type do
+    value(:mention)
+    value(:notification)
+  end
 end

lib/helper/utils/utils.ex

@@ -57,6 +57,7 @@ defmodule Helper.Utils do
   """
   def done(false), do: {:error, false}
   def done(true), do: {:ok, true}
+  def done(nil), do: {:error, "record not found."}
   def done(nil, :boolean), do: {:ok, false}
   def done(_, :boolean), do: {:ok, true}
   def done(nil, err_msg), do: {:error, err_msg}
@@ -69,11 +70,12 @@ defmodule Helper.Utils do
   def done(nil, queryable, id), do: {:error, not_found_formater(queryable, id)}
   def done(result, _, _), do: {:ok, result}
 
-  def done(nil), do: {:error, "record not found."}
-
   # for delete_all, update_all
   # see: https://groups.google.com/forum/#!topic/elixir-ecto/1g5Pp6ceqFE
+  # def done({0, nil}), do: {:error, %{done: false}}
   def done({n, nil}) when is_integer(n), do: {:ok, %{done: true}}
+  # def done({n, nil}, extra: extra) when is_integer(n), do: {:ok, %{done: true}}
+
   def done(result), do: {:ok, result}
 
   def done_and_cache(result, pool, scope, expire_sec: expire_sec) do

test/groupher_server/accounts/hooks/notify_test.exs

@@ -18,7 +18,7 @@ defmodule GroupherServer.Test.Accounts.Hooks.Notify do
       {:ok, _} = Accounts.follow(user, user2)
       Hooks.Notify.handle(:follow, user, user2)
 
-      {:ok, notifications} = Delivery.fetch(:notification, user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, user, %{page: 1, size: 20})
       assert notifications.total_count == 1
 
       notify = notifications.entries |> List.first()
@@ -32,7 +32,7 @@ defmodule GroupherServer.Test.Accounts.Hooks.Notify do
       Hooks.Notify.handle(:follow, user, user2)
       Hooks.Notify.handle(:undo, :follow, user, user2)
 
-      {:ok, notifications} = Delivery.fetch(:notification, user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, user, %{page: 1, size: 20})
       assert notifications.total_count == 0
     end
   end

test/groupher_server/cms/hooks/notify_blog_test.exs

@@ -27,8 +27,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       {:ok, article} = CMS.upvote_article(:blog, blog.id, user2)
       Hooks.Notify.handle(:upvote, article, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, blog.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, blog.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 1
 
@@ -46,8 +45,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
 
       Hooks.Notify.handle(:upvote, comment, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, comment.author.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, comment.author, %{page: 1, size: 20})
 
       assert notifications.total_count == 1
 
@@ -69,8 +67,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       {:ok, article} = CMS.undo_upvote_article(:blog, blog.id, user2)
       Hooks.Notify.handle(:undo, :upvote, article, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, blog.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, blog.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 0
     end
@@ -85,8 +82,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
 
       {:ok, comment} = preload_author(comment)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, comment.author.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, comment.author, %{page: 1, size: 20})
 
       assert notifications.total_count == 0
     end
@@ -99,8 +95,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       {:ok, _} = CMS.collect_article(:blog, blog.id, user2)
       Hooks.Notify.handle(:collect, blog, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, blog.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, blog.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 1
 
@@ -121,8 +116,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       {:ok, _} = CMS.undo_upvote_article(:blog, blog.id, user2)
       Hooks.Notify.handle(:undo, :collect, blog, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, blog.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, blog.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 0
     end
@@ -135,8 +129,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user2)
       Hooks.Notify.handle(:comment, comment, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, blog.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, blog.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 1
 

test/groupher_server/cms/hooks/notify_job_test.exs

@@ -27,8 +27,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       {:ok, article} = CMS.upvote_article(:job, job.id, user2)
       Hooks.Notify.handle(:upvote, article, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, job.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, job.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 1
 
@@ -46,8 +45,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
 
       Hooks.Notify.handle(:upvote, comment, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, comment.author.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, comment.author, %{page: 1, size: 20})
 
       assert notifications.total_count == 1
 
@@ -69,8 +67,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       {:ok, article} = CMS.undo_upvote_article(:job, job.id, user2)
       Hooks.Notify.handle(:undo, :upvote, article, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, job.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, job.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 0
     end
@@ -85,8 +82,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
 
       {:ok, comment} = preload_author(comment)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, comment.author.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, comment.author, %{page: 1, size: 20})
 
       assert notifications.total_count == 0
     end
@@ -99,8 +95,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       {:ok, _} = CMS.collect_article(:job, job.id, user2)
       Hooks.Notify.handle(:collect, job, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, job.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, job.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 1
 
@@ -121,8 +116,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       {:ok, _} = CMS.undo_upvote_article(:job, job.id, user2)
       Hooks.Notify.handle(:undo, :collect, job, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, job.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, job.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 0
     end
@@ -135,8 +129,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user2)
       Hooks.Notify.handle(:comment, comment, user2)
 
-      {:ok, notifications} =
-        Delivery.fetch(:notification, job.author.user.id, %{page: 1, size: 20})
+      {:ok, notifications} = Delivery.fetch(:notification, job.author.user, %{page: 1, size: 20})
 
       assert notifications.total_count == 1